Changeset: 6785f10f0a52 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6785f10f0a52 Added Files: sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.py Removed Files: sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.sql sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err.int128 sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.test Modified Files: sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.out Branch: mtest Log Message:
Unified 128 and no int128 outputs for limits_of_decimal.SF-1685357 test diffs (154 lines): diff --git a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.sql b/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.py rename from sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.sql rename to sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.py --- a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.sql +++ b/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.py @@ -1,4 +1,40 @@ -create table tab1 ( col1 decimal(20,0) not null ); -drop table tab1; -create table tab2 ( col1 decimal(40,0) not null ); -drop table tab2; +import sys, os, pymonetdb + +db = os.getenv("TSTDB") +port = int(os.getenv("MAPIPORT")) + +conn1 = pymonetdb.connect(database=db, port=port, autocommit=True, username='monetdb', password='monetdb') +cur1 = conn1.cursor() +try: + cur1.execute('select cast(1 as hugeint)') + has_huge = True +except pymonetdb.DatabaseError as e: + has_huge = False + +if has_huge: + cur1.execute(""" + start transaction; + create table tab1 (col1 decimal(20,0) not null); + rollback; + """) + try: + cur1.execute('create table tab2 (col1 decimal(40,0) not null);') + sys.stderr.write("Exception expected") + except pymonetdb.DatabaseError as e: + if "Decimal(40,0) isn't supported because P=40 > 38 in:" not in str(e): + sys.stderr.write('Wrong error %s, expected Decimal(40,0) isn\'t supported because P=40 > 38 in:' % (str(e))) +else: + try: + cur1.execute('create table tab1 (col1 decimal(20,0) not null);') + sys.stderr.write("Exception expected") + except pymonetdb.DatabaseError as e: + if "Decimal(20,0) isn't supported because P=20 > 18 in:" not in str(e): + sys.stderr.write('Wrong error %s, expected Decimal(20,0) isn\'t supported because P=20 > 18 in:' % (str(e))) + try: + cur1.execute('create table tab2 (col1 decimal(40,0) not null);') + sys.stderr.write("Exception expected") + except pymonetdb.DatabaseError as e: + if "Decimal(40,0) isn't supported because P=40 > 18 in:" not in str(e): + sys.stderr.write('Wrong error %s, expected Decimal(40,0) isn\'t supported because P=40 > 18 in:' % (str(e))) +cur1.close() +conn1.close() diff --git a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err b/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err --- a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err +++ b/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err @@ -7,29 +7,6 @@ stderr of test 'limits_of_decimal.SF-168 # 10:32:42 > -# 10:32:42 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=34802 -# 10:32:42 > - -MAPI = (monetdb) /var/tmp/mtest-9513/.s.monetdb.37125 -QUERY = create table tab1 ( col1 decimal(20,0) not null ); -ERROR = !Decimal(20,0) isn't supported because P=20 > 18 in: "create table tab1 ( col1 decimal(20,0)" - !syntax error, unexpected NOT in: "not" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225 -QUERY = drop table tab1; -ERROR = !DROP TABLE: no such table 'tab1' -CODE = 42S02 -MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225 -QUERY = create table tab2 ( col1 decimal(40,0) not null ); -ERROR = !Decimal(40,0) isn't supported because P=40 > 18 in: "create table tab2 ( col1 decimal(40,0)" - !syntax error, unexpected NOT in: "not" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225 -QUERY = drop table tab2; -ERROR = !DROP TABLE: no such table 'tab2' -CODE = 42S02 - -# 10:32:42 > # 10:32:42 > Done. # 10:32:42 > diff --git a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err.int128 b/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err.int128 deleted file mode 100644 --- a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err.int128 +++ /dev/null @@ -1,26 +0,0 @@ -stderr of test 'limits_of_decimal.SF-1685357` in directory 'sql/test/BugTracker` itself: - - -# 10:32:42 > -# 10:32:42 > Mtimeout -timeout 180 Mserver "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/sql_logs" --set "xquery_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/xquery_logs" --set mapi_port=34802 --set xrpc_port=48372 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker" --dbinit=" module(sql_server);" ; echo ; echo Over.. -# 10:32:42 > - - -# 10:32:42 > -# 10:32:42 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=34802 -# 10:32:42 > - -MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 -QUERY = create table tab2 ( col1 decimal(40,0) not null ); -ERROR = !Decimal(40,0) isn't supported because P=40 > 38 in: "create table tab2 ( col1 decimal(40,0)" - !syntax error, unexpected NOT in: "not null" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = drop table tab2; -ERROR = !DROP TABLE: no such table 'tab2' -CODE = 42S02 - -# 10:32:42 > -# 10:32:42 > Done. -# 10:32:42 > - diff --git a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.out b/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.out --- a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.out +++ b/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.out @@ -5,18 +5,6 @@ stdout of test 'limits_of_decimal.SF-168 # 10:32:42 > Mtimeout -timeout 180 Mserver "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/sql_logs" --set "xquery_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/xquery_logs" --set mapi_port=34802 --set xrpc_port=48372 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker" --dbinit=" module(sql_server);" ; echo ; echo Over.. # 10:32:42 > -# Monet Database Server V4.16.3 -# Copyright (c) 1993-2007, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically linked. -# Visit http://monetdb.cwi.nl/ for further information. - - - - -# 10:32:42 > -# 10:32:42 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=34802 -# 10:32:42 > - # 10:32:42 > # 10:32:42 > Done. diff --git a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.test b/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.test deleted file mode 100644 --- a/sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.test +++ /dev/null @@ -1,13 +0,0 @@ -statement ok -create table tab1 ( col1 decimal(20,0) not null ) - -statement ok -drop table tab1 - -statement error -create table tab2 ( col1 decimal(40,0) not null ) - -statement error -drop table tab2 - - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list