Changeset: f839abc15e17 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f839abc15e17
Modified Files:
sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
sql/test/BugTracker-2014/Tests/round.Bug-3542.py
sql/test/prepare/Tests/prepare_statements_crash_server.Bug-2599.stable.out
sql/test/prepare/Tests/sqlancer_prepare.stable.out
Branch: cleanup_types
Log Message:
approved output for without hugeint
diffs (195 lines):
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
@@ -14,11 +14,8 @@ except pymonetdb.DatabaseError as e:
try:
cur1.execute('select 10000000 *
100000 * 11.51 + 51.097 * 100000;')
- if has_huge:
- if cur1.fetchall()[0][0] != Decimal('11510005109700.000'):
- sys.stderr.write("Decimal('.11510005109700.000') expected")
- else:
- sys.stderr.write("Exception expected")
+ if cur1.fetchall()[0][0] != Decimal('11510005109700.000'):
+ sys.stderr.write("Decimal('.11510005109700.000') expected")
except pymonetdb.DatabaseError as e:
if not has_huge:
if "overflow in calculation" not in str(e):
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 conversion" not in str(e):
- sys.stderr.write('Wrong error %s, expected overflow in conversion' %
(str(e)))
+ elif "overflow in calculation" not in str(e):
+ sys.stderr.write('Wrong error %s, expected overflow in calculation' %
(str(e)))
cur1.execute("drop table test_num_data;")
cur1.close()
diff --git
a/sql/test/prepare/Tests/prepare_statements_crash_server.Bug-2599.stable.out
b/sql/test/prepare/Tests/prepare_statements_crash_server.Bug-2599.stable.out
--- a/sql/test/prepare/Tests/prepare_statements_crash_server.Bug-2599.stable.out
+++ b/sql/test/prepare/Tests/prepare_statements_crash_server.Bug-2599.stable.out
@@ -27,36 +27,36 @@ stdout of test 'prepare_statements_crash
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 6, 1 # length
-[ "int", 32, 0, "", "t_2599", "a" ]
-[ "int", 32, 0, "", "t_2599", "b" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
+[ "int", 31, 0, "", "t_2599", "a" ]
+[ "int", 31, 0, "", "t_2599", "b" ]
+[ "bigint", 63, 0, NULL, NULL, NULL ]
#prepare select * from t_2599 where a>2*?+1;
#prepare select * from t_2599 where a>2*?+1;
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 6, 1 # length
-[ "int", 32, 0, "", "t_2599", "a" ]
-[ "int", 32, 0, "", "t_2599", "b" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
+[ "int", 31, 0, "", "t_2599", "a" ]
+[ "int", 31, 0, "", "t_2599", "b" ]
+[ "bigint", 61, 0, NULL, NULL, NULL ]
#prepare select * from t_2599 where a>?+1;
#prepare select * from t_2599 where a>?+1;
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 6, 1 # length
-[ "int", 32, 0, "", "t_2599", "a" ]
-[ "int", 32, 0, "", "t_2599", "b" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
+[ "int", 31, 0, "", "t_2599", "a" ]
+[ "int", 31, 0, "", "t_2599", "b" ]
+[ "bigint", 63, 0, NULL, NULL, NULL ]
#prepare select * from t_2599 where a>1+?*2;
#prepare select * from t_2599 where a>1+?*2;
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 6, 1 # length
-[ "int", 32, 0, "", "t_2599", "a" ]
-[ "int", 32, 0, "", "t_2599", "b" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
+[ "int", 31, 0, "", "t_2599", "a" ]
+[ "int", 31, 0, "", "t_2599", "b" ]
+[ "bigint", 63, 0, NULL, NULL, NULL ]
#drop table t_2599;
# 12:42:06 >
diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.out
b/sql/test/prepare/Tests/sqlancer_prepare.stable.out
--- a/sql/test/prepare/Tests/sqlancer_prepare.stable.out
+++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.out
@@ -29,10 +29,10 @@
% varchar, int, int, varchar, varchar, varchar # type
% 7, 2, 1, 0, 3, 3 # length
[ "decimal", 2, 1, "", "%22", "%13" ]
-[ "int", 32, 0, "", "%22", "c2" ]
+[ "int", 31, 0, "", "%22", "c2" ]
[ "decimal", 2, 1, NULL, NULL, NULL ]
-[ "int", 32, 0, NULL, NULL, NULL ]
-[ "int", 32, 0, NULL, NULL, NULL ]
+[ "int", 31, 0, NULL, NULL, NULL ]
+[ "int", 31, 0, NULL, NULL, NULL ]
[ "boolean", 1, 0, NULL, NULL, NULL ]
#ROLLBACK;
#PREPARE SELECT 1 WHERE greatest(true, ?);
@@ -47,13 +47,13 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 2, 2 # length
-[ "bigint", 64, 0, "", "%3", "%3" ]
+[ "bigint", 63, 0, "", "%3", "%3" ]
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 2, 2 # length
-[ "bigint", 64, 0, "", "%3", "%3" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
+[ "bigint", 63, 0, "", "%3", "%3" ]
+[ "bigint", 63, 0, NULL, NULL, NULL ]
#PREPARE SELECT round(-'b', ?);
#PREPARE SELECT round(-'b', ?);
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
@@ -61,7 +61,7 @@
% varchar, int, int, varchar, varchar, varchar # type
% 7, 2, 1, 0, 2, 2 # length
[ "double", 53, 0, "", "%2", "%2" ]
-[ "tinyint", 8, 0, NULL, NULL, NULL ]
+[ "tinyint", 7, 0, NULL, NULL, NULL ]
#PREPARE SELECT sql_max(+ (0.29353363282850464), round(- (sql_min('-Infinity',
?)), ?)) LIMIT 8535194086169274474;
#PREPARE SELECT sql_max(+ (0.29353363282850464), round(- (sql_min('-Infinity',
?)), ?)) LIMIT 8535194086169274474;
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
@@ -70,14 +70,14 @@
% 7, 2, 1, 0, 2, 2 # length
[ "double", 53, 0, "", "%2", "%2" ]
[ "char", 9, 0, NULL, NULL, NULL ]
-[ "tinyint", 8, 0, NULL, NULL, NULL ]
+[ "tinyint", 7, 0, NULL, NULL, NULL ]
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 3, 2 # length
-[ "bigint", 64, 0, "", "%12", "%4" ]
+[ "bigint", 63, 0, "", "%12", "%4" ]
[ "char", 0, 0, NULL, NULL, NULL ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
+[ "bigint", 63, 0, NULL, NULL, NULL ]
#PREPARE VALUES (CASE WHEN true THEN 5 BETWEEN 4 AND 2 END);
#PREPARE VALUES (CASE WHEN true THEN 5 BETWEEN 4 AND 2 END);
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
@@ -115,8 +115,8 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 3, 2, 1, 0, 2, 2 # length
-[ "int", 32, 0, "", "%2", "%2" ]
-[ "int", 32, 0, NULL, NULL, NULL ]
+[ "int", 31, 0, "", "%2", "%2" ]
+[ "int", 31, 0, NULL, NULL, NULL ]
#EXEC 0(1);
% .%2 # table_name
% %2 # name
@@ -142,8 +142,8 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 3, 2, 1, 0, 1, 1 # length
-[ "int", 32, 0, "", "x", "a" ]
-[ "int", 32, 0, NULL, NULL, NULL ]
+[ "int", 31, 0, "", "x", "a" ]
+[ "int", 31, 0, NULL, NULL, NULL ]
% .x # table_name
% a # name
% int # type
@@ -152,15 +152,15 @@
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
-% 4, 1, 1, 0, 3, 3 # length
+% 6, 2, 1, 0, 3, 3 # length
[ "json", 0, 0, "", "%15", "%15" ]
-[ "clob", 0, 0, NULL, NULL, NULL ]
+[ "bigint", 63, 0, NULL, NULL, NULL ]
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
-% 4, 1, 1, 0, 3, 3 # length
+% 6, 2, 1, 0, 3, 3 # length
[ "json", 0, 0, "", "%15", "%15" ]
-[ "clob", 0, 0, NULL, NULL, NULL ]
+[ "bigint", 63, 0, NULL, NULL, NULL ]
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
@@ -178,7 +178,7 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 2, 2 # length
-[ "bigint", 64, 0, "", "%2", "%2" ]
+[ "bigint", 63, 0, "", "%2", "%2" ]
% .%2 # table_name
% %2 # name
% bigint # type
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
