Changeset: e82d74e635ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e82d74e635ae
Added Files:
sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.sql
sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.err
sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out
sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.sql
sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.err
sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.out
sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.sql
sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.err
sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.out
sql/test/Tests/bincopycollist-prepare.bat
sql/test/Tests/bincopycollist-prepare.sh
sql/test/Tests/bincopycollist-prepare.stable.err
sql/test/Tests/bincopycollist-prepare.stable.out
sql/test/Tests/bincopycollist.reqtests
sql/test/Tests/bincopycollist.sql.in
sql/test/Tests/bincopycollist.stable.err
sql/test/Tests/bincopycollist.stable.out
sql/test/Tests/bincopyint.bin
Removed Files:
clients/php/INSTALL
clients/php/Makefile.ag
clients/php/README
clients/php/TODO
clients/php/doc/generate_doc.sh
clients/php/examples/query.php
clients/php/examples/simple_query.php
clients/php/lib/Makefile.ag
clients/php/lib/php_mapi.inc
clients/php/lib/php_monetdb.php
debian/php5-monetdb-client.install
Modified Files:
MonetDB.spec
clients/Makefile.ag
configure.ag
debian/control
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_batop.c
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_project.c
gdk/gdk_system.h
gdk/gdk_value.c
java/ChangeLog
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
java/tests/Test_PSgeneratedkeys.java
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/optimizer/opt_emptybind.c
monetdb5/scheduler/run_memo.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.bat
sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Tests/All
testing/Mtest.py.in
tools/merovingian/daemon/forkmserver.c
Branch: graph0
Log Message:
Merge from branch `default'
diffs (truncated from 4397 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -356,26 +356,6 @@ fi
%{_libdir}/libMonetODBC.so
%{_libdir}/libMonetODBCs.so
-%package client-php
-Summary: MonetDB php interface
-Group: Applications/Databases
-Requires: php
-BuildArch: noarch
-
-%description client-php
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators. It also has an SQL frontend.
-
-This package contains the files needed to use MonetDB from a PHP
-program.
-
-%files client-php
-%defattr(-,root,root)
-%dir %{_datadir}/php/monetdb
-%{_datadir}/php/monetdb/*
-
%package client-perl
Summary: MonetDB perl interface
Group: Applications/Databases
@@ -409,7 +389,7 @@ Requires: MonetDB5-server%{?_isa} = %{ve
Requires: %{name}-client%{?_isa} = %{version}-%{release}
Requires: %{name}-client-odbc%{?_isa} = %{version}-%{release}
Requires: %{name}-client-perl = %{version}-%{release}
-Requires: %{name}-client-php = %{version}-%{release}
+Requires: %{name}-client-php > 11.24.0
Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
Requires: python-monetdb >= 1.0
diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
@@ -4,6 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-SUBDIRS = HAVE_MAPI?mapilib HAVE_MAPI?mapiclient HAVE_ODBC?odbc HAVE_PERL?perl
php examples NATIVE_WIN32?NT
+SUBDIRS = HAVE_MAPI?mapilib HAVE_MAPI?mapiclient HAVE_ODBC?odbc HAVE_PERL?perl
examples NATIVE_WIN32?NT
EXTRA_DIST_DIR = Tests ruby R
diff --git a/clients/php/INSTALL b/clients/php/INSTALL
deleted file mode 100644
--- a/clients/php/INSTALL
+++ /dev/null
@@ -1,59 +0,0 @@
-= System requirements =
- * PHP5 with sockets support compiled and enabled;
- * MonetDB5 / Merovingian using mapi protocol version >= 8.
-
-= Enable socket support in PHP =
-
-In order to get the native monetdb PHP implementation to work you need
-a PHP5 interpreter with socket support compiled and enabled.
-
-You can verify wether your interpreter has sockets support compiled by running
the command:
-
-$ php-config --configure-options
-
-and check for the presence of the "--enable-sockets" option.
-
-In order to enable sockets support in your php interpreter;
-load the php_sockets.so library from the php.ini configuration file.
-
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-
-extension=php_sockets.so
-
-
-= Set a timezone =
-In order to avoid unexpected behaviours with the library it is advised to set a
-timezone for the PHP interpreter
-
-This can be done by enabling the setting "date.timezone" in the php.ini
configuration file.
-
-[Date]
-; Defines the default timezone used by the date functions
-date.timezone = Europe/Amsterdam
-
-For a list of supported timezone see: http://php.net/manual/en/timezones.php
-
-= Use the library =
-The library is shipped as a series of include files and does not come as a
binary object (.so).
-
-In order to use it in your applications include the "lib/php_monetdb.php" file
-in all pages that want to make use of a database connection. Note that this
file requires php_mapi.inc
-to be present in the same directory.
-
-If you installed MonetDB (either by building from sources or using binary
packages) the native PHP interface
-will be located in "/usr/share/php/monetdb"
-
-On most system you should be able to use the library by including or requiring
"monedtdb/php_monetdb.php".
-
-In case the system is not able to find the library it is possible to specify
the include path in php.ini
-
-; UNIX: "/path1:/path2"
-include_path = ".:/usr/share/php/monetdb"
-
-Please note that the library is not installed by the Windows installer. When
building from source on this platform the includes will be installed under the
given prefix.
-
-
diff --git a/clients/php/Makefile.ag b/clients/php/Makefile.ag
deleted file mode 100644
--- a/clients/php/Makefile.ag
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-
-MTSAFE
-
-SUBDIRS = lib
-
-EXTRA_DIST_DIR = doc examples
diff --git a/clients/php/README b/clients/php/README
deleted file mode 100644
--- a/clients/php/README
+++ /dev/null
@@ -1,20 +0,0 @@
-= Native PHP implementation of the MonetDB interface. =
-
-The php API aims at being compatible with the one provided by the C
implementation.
-
-== Directory structure ==
- - lib/
- php_mapi.inc - mapi protocol implementation
- php_monetdb.php - php api
-
- - examples/simple_query.php - an example of php+monetdb in action
-
- - INSTALL - note about installing and using the native interface
-
- - TODO: list of pending tasks.
-
-== Benchmark ==
-
-A comparison between cimpl and native can be found at:
http://www.ins.cwi.nl/~gm/bench/
-
-php_test.tar.bz2 - contains an utility to measure the performance of the two
php APIS.
diff --git a/clients/php/TODO b/clients/php/TODO
deleted file mode 100644
diff --git a/clients/php/doc/generate_doc.sh b/clients/php/doc/generate_doc.sh
deleted file mode 100755
--- a/clients/php/doc/generate_doc.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-
-#
-#
-# Generates (html) documentation from source code comments.
-#
-# Requires: phpdoc (http://www.phpdoc.org/)
-#
-# Usage: generate_doc.sh <source dir> <doc dir>
-#
-# By default <doc dir> is located within the source tree 'doc/' directory
-#
-
-source_code=$1
-
-current_dir=$(pwd)
-doc_dir=$current_dir/$2
-
-title="MonetDB5 PHP API"
-
-phpdoc -ti $title -o "HTML:frames:phpedit" -f $source_code -t $doc_dir
diff --git a/clients/php/examples/query.php b/clients/php/examples/query.php
deleted file mode 100644
--- a/clients/php/examples/query.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-?>
-
-<?php
-
-/**
-* Connect to a database and perform a query.
-*/
-
-require '../lib/php_monetdb.php';
-
-define("DB", "php_demo");
-
-/* Establish a connection and report errors in case they occour */
-$db = monetdb_connect($lang = "sql", $host = "127.0.0.1", $port = "50000",
$database = DB , $username = "monetdb", $password = "monetdb" ) or
trigger_error(monetdb_last_error());
-
-/* Fire a query */
-
-$query = "SELECT * FROM TABLES, TABLES";
-$res = monetdb_query($db, monetdb_escape_string($query)) or
trigger_error(monetdb_last_error());
-
-/* Print the number of rows in the result set */
-print "Rows: " . monetdb_num_rows($res) . "\n";
-
-/* Iterate over the result set returning rows as objects */
-//while ( $row = monetdb_fetch_object($res) )
-//{
-// print_r($row);
-//}
-
-/* Free the result set */
-monetdb_free_result($res);
-
-/* Disconnect from the database */
-if (monetdb_connected($db)) {
- monetdb_disconnect($db);
-}
-
-?>
diff --git a/clients/php/examples/simple_query.php
b/clients/php/examples/simple_query.php
deleted file mode 100644
--- a/clients/php/examples/simple_query.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-
-<html xmlns="http://www.w3.org/1999/xhtml""; xml:lang="en" lang="en">
-
-<head>
- <title>MonetDB Query</title>
-</head>
-
-<body>
-
-<?php
- require '../lib/php_monetdb.php';
- if ( isset($_POST['query']) )
- {
- $db = monetdb_connect($lang = "sql", $host = "127.0.0.1", $port
= "50000" , $username = "monetdb", $password = "monetdb", $database =
"php_demo" )
- or die(monetdb_last_error());
-
- $sql = monetdb_escape_string($_POST['query']);
- $res = monetdb_query($sql);
- while ( $row = monetdb_fetch_assoc($res) )
- {
- print "<pre>\n";
- print_r($row);
- print "</pre>\n";
- }
-
- monetdb_disconnect();
- }
-
- print "<form method=\"post\" action=\"{$_SERVER['PHP_SELF']}\">\n";
- print "<label for=\"query\">SQL Query:</label>\n";
- print "<input type=\"text\" name=\"query\" id=\"query\"
- value=\"{$_POST['query']}\" />\n";
- print "<input type=\"submit\" value=\"Execute\" />\n";
- print "</form>\n";
-?>
-
-</body>
-
-</html>
diff --git a/clients/php/lib/Makefile.ag b/clients/php/lib/Makefile.ag
deleted file mode 100644
--- a/clients/php/lib/Makefile.ag
+++ /dev/null
@@ -1,13 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
