Changeset: b179ce786131 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b179ce786131
Modified Files:
        sql/test/SQLite_regress/sqllogictest/sqllogictest.py
Branch: Nov2019
Log Message:

Improve error reporting.


diffs (23 lines):

diff --git a/sql/test/SQLite_regress/sqllogictest/sqllogictest.py 
b/sql/test/SQLite_regress/sqllogictest/sqllogictest.py
--- a/sql/test/SQLite_regress/sqllogictest/sqllogictest.py
+++ b/sql/test/SQLite_regress/sqllogictest/sqllogictest.py
@@ -117,12 +117,17 @@ class SQLLogic:
     def exec_query(self, query, columns, sorting, hashlabel, nresult, hash, 
expected):
         err = False
         try:
-            rows = self.command(query)
+            self.command(query)
         except pymonetdb.DatabaseError as e:
             self.query_error(query, 'query failed', e.args[0])
             return
+        rows = self.crs.rowcount
+        cols = len(self.crs.description)
+        if cols != len(columns):
+            self.query_error(query, 'received {} columns, expected {} 
columns'.format(cols, len(columns)))
+            return
         if rows * len(columns) != nresult:
-            self.query_error(query, 'wrong number of rows received')
+            self.query_error(query, 'received {} rows, expected {} rows ({} 
values)'.format(rows, nresult / len(columns), nresult))
             return
         data = self.crs.fetchall()
         data = self.convertresult(query, columns, data)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to