Changeset: d2a61ad3d62d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2a61ad3d62d
Modified Files:
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/miscellaneous/Tests/groupby_prepare.stable.out
sql/test/orderidx/Tests/simpletable.stable.out
sql/test/orderidx/Tests/smalltable.stable.out
Branch: unlock
Log Message:
merged
diffs (truncated from 5048 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -672,30 +672,9 @@ program that uses MonetDB as an embeddab
%{_includedir}/monetdb/monetdbe.h
%{_libdir}/pkgconfig/monetdbe.pc
-%package testing
-Summary: MonetDB - Monet Database Management System
-Group: Applications/Databases
-
-%description testing
-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 front end.
-
-This package contains the programs and files needed for testing the
-MonetDB packages. You probably don't need this, unless you are a
-developer. If you do want to test, install %{name}-testing-python.
-
-%files testing
-%license COPYING
-%defattr(-,root,root)
-%{_bindir}/Mdiff
-%{_bindir}/Mlog
-
%package testing-python
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
-Requires: %{name}-testing = %{version}-%{release}
Requires: %{name}-client-tests = %{version}-%{release}
Requires: /usr/bin/python3
BuildArch: noarch
diff --git a/clients/Tests/mclient-uri.SQL.sh b/clients/Tests/mclient-uri.SQL.sh
--- a/clients/Tests/mclient-uri.SQL.sh
+++ b/clients/Tests/mclient-uri.SQL.sh
@@ -2,13 +2,11 @@
# test the URI parsing capabilities of the MAPI library
-#Mlog "mclient -d
mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb -f test -t none
-E utf-8 -s select 1"
mclient -d "mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb"
-f csv -t none -E utf-8 -s 'select 1' | grep -v '^1$'
if [ $? -eq 2 ]; then
return 2;
fi
-#Mlog "mclient -d
mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb
-f test -t none -E utf-8 -s select 1"
mclient -d
"mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb"
-f csv -t none -E utf-8 -s 'select 1' | grep -v '^1$'
if [ $? -eq 2 ]; then
return 2;
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -274,23 +274,9 @@ Description: MonetDB development files
This package contains the library and include files to create a
program that uses MonetDB as an embeddable library.
-Package: monetdb-testing
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: MonetDB testing programs
- 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 front end.
- .
- This package contains the programs and files needed for testing the
- MonetDB packages. You probably don't need this, unless you are a
- developer. If you do want to test, install monetdb-testing-python.
-
Package: monetdb-testing-python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- monetdb-testing (= ${source:Version}),
monetdb-client-testing (= ${source:Version})
Description: MonetDB testing Python programs
MonetDB is a database management system that is developed from a
diff --git a/debian/monetdb-testing.install b/debian/monetdb-testing.install
deleted file mode 100644
--- a/debian/monetdb-testing.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/Mdiff usr/bin
-debian/tmp/usr/bin/Mlog usr/bin
diff --git a/sql/backends/monet5/Tests/Mbeddedsql5--help
b/sql/backends/monet5/Tests/Mbeddedsql5--help
--- a/sql/backends/monet5/Tests/Mbeddedsql5--help
+++ b/sql/backends/monet5/Tests/Mbeddedsql5--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x Mbeddedsql5 --help
+Mbeddedsql5 --help
diff --git a/sql/backends/monet5/Tests/shutdown.py
b/sql/backends/monet5/Tests/shutdown.py
--- a/sql/backends/monet5/Tests/shutdown.py
+++ b/sql/backends/monet5/Tests/shutdown.py
@@ -11,6 +11,6 @@ try:
if os.name == 'nt':
os.system('shutdowntest.exe "%s"' % databasedir)
else:
- os.system('Mlog -x shutdowntest "%s"' % databasedir)
+ os.system('shutdowntest "%s"' % databasedir)
finally:
shutil.rmtree(databasedir)
diff --git a/sql/jdbc/tests/Tests/Test.SQL.sh b/sql/jdbc/tests/Tests/Test.SQL.sh
--- a/sql/jdbc/tests/Tests/Test.SQL.sh
+++ b/sql/jdbc/tests/Tests/Test.SQL.sh
@@ -3,4 +3,4 @@
URL="jdbc:monetdb://${HOST}:${MAPIPORT}/${TSTDB}?user=monetdb&password=monetdb${JDBC_EXTRA_ARGS}"
TST=$1
-Mlog -x "java ${TST} \"${URL}\""
+java ${TST} "${URL}"
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
@@ -5,11 +5,11 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
--help"
+java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB --help
-Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-f $TSTSRCBASE/$TSTDIR/Tests/JdbcClient_create_tables.sql"
-Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-f $TSTSRCBASE/$TSTDIR/Tests/JdbcClient_inserts_selects.sql"
-Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-D"
-Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-f $TSTSRCBASE/$TSTDIR/Tests/JdbcClient_drop_tables.sql"
+java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_create_tables.sql
+java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_inserts_selects.sql
+java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -D
+java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_drop_tables.sql
rm -f .monetdb
diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh
--- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh
+++ b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh
@@ -5,6 +5,6 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -e -f $TSTSRCBASE/$TSTDIR/Tests/ValidateSystemCatalogTables.sql"
+java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$TSTSRCBASE/$TSTDIR/Tests/ValidateSystemCatalogTables.sql
rm -f .monetdb
diff --git a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
--- a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
+++ b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
@@ -5,6 +5,6 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -e -f \"$TSTSRCBASE/$TSTDIR/Tests/bogus-auto-generated-keys.sql\""
+java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$TSTSRCBASE/$TSTDIR/Tests/bogus-auto-generated-keys.sql\"
rm -f .monetdb
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
@@ -10,8 +10,7 @@ def client(cmd, infile = None):
else:
f = None
with process.client(cmd, stdin = f,
- stdout = process.PIPE, stderr = process.PIPE,
- log = True) as clt:
+ stdout = process.PIPE, stderr = process.PIPE) as clt:
if f is not None:
f.close()
out, err = clt.communicate()
diff --git a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
--- a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
+++ b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
@@ -8,8 +8,7 @@ with process.client('sql',
stdin = open(os.path.join(os.getenv('TSTSRCDIR'),
os.path.pardir,
'dumping_tables.SF-2776908.sql')),
- stdout = process.PIPE, stderr = process.PIPE,
- log = True) as c:
+ stdout = process.PIPE, stderr = process.PIPE) as c:
out, err = c.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
diff --git
a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.test
b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.test
deleted file mode 100644
--- a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.test
+++ /dev/null
@@ -1,9 +0,0 @@
-query ITITITIII rowsort
-SELECT * from tables OFFSET 2147483647
-----
-
-query ITITITIII rowsort
-SELECT * from tables OFFSET 2147483646
-----
-
-
diff --git
a/sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
b/sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
---
a/sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
+++
b/sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
@@ -11,17 +11,8 @@ try:
except pymonetdb.DatabaseError as e:
has_huge = False
-cur1.execute('select 10000000 *
100000 * 11.51 + 51.097 * 100000;')
-if cur1.fetchall() != [(11510005109700,)]:
- sys.stderr.write('[(11510005109700,)] expected')
try:
- cur1.execute('select convert(1000000000000000000 , decimal(20)) *
100000000000000 * 11.51 + 51.097 * 100000000000000;')
- sys.stderr.write("Exception expected")
-except pymonetdb.DatabaseError as e:
- if "overflow in calculation" not in str(e):
- sys.stderr.write('Wrong error %s, expected overflow in calculation' %
(str(e)))
-try:
- cur1.execute('select convert ( 10000000 *
100000 * 11.51 , decimal(15)) + convert (51.097 * 100000 ,
decimal(15));')
+ cur1.execute('select 10000000 *
100000 * 11.51 + 51.097 * 100000;')
if has_huge:
if cur1.fetchall() != [(11510005109700,)]:
sys.stderr.write('[(11510005109700,)] expected')
@@ -29,10 +20,27 @@ try:
sys.stderr.write("Exception expected")
except pymonetdb.DatabaseError as e:
if not has_huge:
+ if "overflow in calculation" not in str(e):
+ sys.stderr.write('Wrong error %s, expected overflow in
calculation' % (str(e)))
+ else:
+ raise e
+try:
+ cur1.execute('select convert(1000000000000000000 , decimal(20)) *
100000000000000 * 11.51 + 51.097 * 100000000000000;')
+ if has_huge:
+ if cur1.fetchall() != [(11510005109700,)]:
+ sys.stderr.write('[(11510005109700,)] expected')
+ else:
+ sys.stderr.write("Exception expected")
+except pymonetdb.DatabaseError as e:
+ if has_huge:
+ if "overflow in calculation" not in str(e):
+ sys.stderr.write('Wrong error %s, expected overflow in
calculation' % (str(e)))
+ else:
if "Decimal of 20 digits are not supported in" not in str(e):
sys.stderr.write('Wrong error %s, expected Decimal of 20 digits
are not supported in' % (str(e)))
- else:
- raise e
+cur1.execute('select convert ( 10000000 *
100000 * 11.51 , decimal(15)) + convert (51.097 * 100000 ,
decimal(15));')
+if cur1.fetchall() != [(11510005109700,)]:
+ sys.stderr.write('[(11510005109700,)] expected')
try:
cur1.execute('select convert (convert(1000000000000000000 , decimal(20)) *
100000000000000 * 11.51 , decimal(35)) + convert (51.097 * 100000000000000 ,
decimal(35));')
if has_huge:
diff --git a/sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh
b/sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh
--- a/sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh
+++ b/sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x "php -d include_path=$PHP_INCPATH -f $TSTSRCDIR/php-size-limit-bug.php
$MAPIPORT $TSTDB"
+php -d include_path=$PHP_INCPATH -f $TSTSRCDIR/php-size-limit-bug.php
$MAPIPORT $TSTDB
diff --git a/sql/test/BugTracker-2014/Tests/round.Bug-3542.py
b/sql/test/BugTracker-2014/Tests/round.Bug-3542.py
--- a/sql/test/BugTracker-2014/Tests/round.Bug-3542.py
+++ b/sql/test/BugTracker-2014/Tests/round.Bug-3542.py
@@ -56,8 +56,8 @@ try:
except pymonetdb.DatabaseError as e:
if has_huge:
raise e
- elif "overflow in calculation" not in str(e):
- sys.stderr.write('Wrong error %s, expected overflow in calculation' %
(str(e)))
+ elif "overflow in conversion" not in str(e):
+ sys.stderr.write('Wrong error %s, expected overflow in conversion' %
(str(e)))
cur1.execute("drop table test_num_data;")
cur1.close()
diff --git a/sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
b/sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
--- a/sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
+++ b/sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
@@ -5,7 +5,7 @@ except ImportError:
import process
def client(args):
- with process.client('sql', args=args, log=True,
+ with process.client('sql', args=args,
stdout=process.PIPE, stderr=process.PIPE) as clt:
out, err = clt.communicate()
sys.stdout.write(out)
diff --git a/sql/test/VOC/Tests/VOC.SQL.py b/sql/test/VOC/Tests/VOC.SQL.py
--- a/sql/test/VOC/Tests/VOC.SQL.py
+++ b/sql/test/VOC/Tests/VOC.SQL.py
@@ -37,7 +37,7 @@ with SQLTestCase() as tc:
# with process.client(lang='sql',
# user=user, passwd=passwd,
# args=[os.path.join(d, os.pardir, file)],
-# log=True, echo=echo) as c:
+# echo=echo) as c:
# c.communicate()
#
#client('VOCcreate_user.sql', 'monetdb', 'monetdb')
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
+++ b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
@@ -8,6 +8,6 @@ EOF
LC_ALL="`locale -a | grep -i en_us | grep -i utf | head -n 1`"
export LC_ALL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
