Changeset: 1f99ed426a52 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f99ed426a52
Added Files:
        sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128
        sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
Modified Files:
        sql/test/prepare/Tests/sqlancer_prepare.SQL.py
        sql/test/prepare/Tests/sqlancer_prepare.stable.err
        sql/test/prepare/Tests/sqlancer_prepare.stable.out
Branch: default
Log Message:

Use a different output for no-int128 sqlancer prepared statements


diffs (67 lines):

diff --git a/sql/test/prepare/Tests/sqlancer_prepare.SQL.py 
b/sql/test/prepare/Tests/sqlancer_prepare.SQL.py
--- a/sql/test/prepare/Tests/sqlancer_prepare.SQL.py
+++ b/sql/test/prepare/Tests/sqlancer_prepare.SQL.py
@@ -1,9 +1,20 @@
 from MonetDBtesting.sqltest import SQLTestCase
+import pymonetdb, os
+
+conn1 = pymonetdb.connect(database=os.getenv("TSTDB"), 
port=int(os.getenv("MAPIPORT")), autocommit=True)
+cur1 = conn1.cursor()
+try:
+    cur1.execute('select cast(1 as hugeint)')
+    suffix = '.int128'
+except pymonetdb.DatabaseError as e:
+    suffix = ''
+cur1.close()
+conn1.close()
 
 with SQLTestCase() as tc:
     # optional or default connection
     tc.connect()
     with open('sqlancer_prepare.sql') as f:
         tc.execute(query=None, client='mclient', stdin=f)\
-            .assertMatchStableOut(fout='sqlancer_prepare.stable.out')\
-            .assertMatchStableError(ferr='sqlancer_prepare.stable.err')
+            .assertMatchStableOut(fout='sqlancer_prepare.stable.out%s' % 
(suffix))\
+            .assertMatchStableError(ferr='sqlancer_prepare.stable.err%s' % 
(suffix))
diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.err 
b/sql/test/prepare/Tests/sqlancer_prepare.stable.err
--- a/sql/test/prepare/Tests/sqlancer_prepare.stable.err
+++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.err
@@ -16,11 +16,7 @@ ERROR = !Cannot have a parameter (?) for
 CODE  = 42000
 MAPI  = (monetdb) /var/tmp/mtest-918314/.s.monetdb.35583
 QUERY = PREPARE SELECT (1 + CAST(l0t0.c0 AS BIGINT)) * scale_up(?, 2) FROM 
(select 1) AS l0t0(c0);
-ERROR = !SELECT: no such binary operator 'sql_mul(hugeint,month_interval)'
-CODE  = 42000
-MAPI  = (monetdb) /var/tmp/mtest-918314/.s.monetdb.35583
-QUERY = PREPARE SELECT DISTINCT ((((CAST(l0t0.c0 AS INT))-(CAST(? AS 
BIGINT))))*(scale_up(?, ((-438139776)*(-813129345))))) FROM (select 1) AS 
l0t0(c0);
-ERROR = !SELECT: no such binary operator 'sql_mul(hugeint,day_interval)'
+ERROR = !SELECT: no such binary operator 'sql_mul(bigint,month_interval)'
 CODE  = 42000
 MAPI  = (monetdb) /var/tmp/mtest-918314/.s.monetdb.35583
 QUERY = PREPARE VALUES (CAST(? >> 1.2 AS INTERVAL SECOND)), (interval '1' 
second); -- error, types decimal(2,1) and sec_interval(13,0) are not equal
diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.err 
b/sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128
copy from sql/test/prepare/Tests/sqlancer_prepare.stable.err
copy to sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128
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
@@ -43,6 +43,15 @@
 % 7,   1,      1,      0,      2,      2 # length
 [ "tinyint",   1,      0,      "",     "%2",   "%2"    ]
 [ "boolean",   1,      0,      NULL,   NULL,   NULL    ]
+#PREPARE SELECT DISTINCT ((((CAST(l0t0.c0 AS INT))-(CAST(? AS 
BIGINT))))*(scale_up(?, ((-438139776)*(-813129345))))) FROM (select 1) AS 
l0t0(c0);
+#PREPARE SELECT DISTINCT ((((CAST(l0t0.c0 AS INT))-(CAST(? AS 
BIGINT))))*(scale_up(?, ((-438139776)*(-813129345))))) FROM (select 1) AS 
l0t0(c0);
+% .prepare,    .prepare,       .prepare,       .prepare,       .prepare,       
.prepare # table_name
+% type,        digits, scale,  schema, table,  column # name
+% varchar,     int,    int,    str,    str,    str # type
+% 12,  2,      1,      0,      2,      2 # length
+[ "day_interval",      4,      0,      "",     "%3",   "%3"    ]
+[ "bigint",    64,     0,      NULL,   NULL,   NULL    ]
+[ "day_interval",      4,      0,      NULL,   NULL,   NULL    ]
 #PREPARE SELECT round(-'b', ?);
 #PREPARE SELECT round(-'b', ?);
 % .prepare,    .prepare,       .prepare,       .prepare,       .prepare,       
.prepare # table_name
diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.out 
b/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
copy from sql/test/prepare/Tests/sqlancer_prepare.stable.out
copy to sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to