Changeset: 5f826bc18fa9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5f826bc18fa9
Modified Files:
sql/test/remote/Tests/partition_elim.test
testing/sqllogictest.py
Branch: Aug2024
Log Message:
Check that queries return results.
diffs (65 lines):
diff --git a/sql/test/remote/Tests/partition_elim.test
b/sql/test/remote/Tests/partition_elim.test
--- a/sql/test/remote/Tests/partition_elim.test
+++ b/sql/test/remote/Tests/partition_elim.test
@@ -93,21 +93,17 @@ query R rowsort
select y from test4 where y between 0 and -1
----
-query R rowsort
+statement ok
analyze sys.test1
-----
-query R rowsort
+statement ok
analyze sys.test2
-----
-query R rowsort
+statement ok
analyze sys.test3
-----
-query R rowsort
+statement ok
analyze sys.test4
-----
query T python .explain.function_histogram
explain select x,y from test where x between 4.0 and 6.0
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -408,6 +408,7 @@ class SQLLogic:
def exec_query(self, query, columns, sorting, pyscript, hashlabel,
nresult, hash, expected, conn=None, verbose=False) -> bool:
err = False
crs = conn.cursor() if conn else self.crs
+ crs.description = None
try:
if verbose:
print(f'Executing:\n{query}')
@@ -421,6 +422,10 @@ class SQLLogic:
tpe, value, traceback = sys.exc_info()
self.query_error(query, 'unexpected error from pymonetdb',
str(value))
return ['statement', 'error'], []
+ if crs.description is None:
+ # it's not a query, it's a statement
+ self.query_error(query, 'query without results')
+ return ['statement', 'ok'], []
try:
data = crs.fetchall()
except KeyboardInterrupt:
@@ -906,9 +911,10 @@ class SQLLogic:
self.writeline(' '.join(result1))
for line in query:
self.writeline(line.rstrip(), replace=True)
- self.writeline('----')
- for line in result2:
- self.writeline(line)
+ if result1[0] == 'query':
+ self.writeline('----')
+ for line in result2:
+ self.writeline(line)
else:
self.writeline(qrline.rstrip())
for line in query:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
