Changeset: 8a3533b8b6f5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8a3533b8b6f5
Modified Files:
        testing/sqllogictest.py
Branch: Dec2025
Log Message:

Implemented row extension for sqllogictest.


diffs (34 lines):

diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -1060,7 +1060,7 @@ class SQLLogic:
                     hash = None
                     expected = []
                     while line and line != '\n':
-                        expected.append(line.rstrip('\n'))
+                        expected.extend(line.rstrip('\n').split('\t'))
                         line = self.readline()
                     nresult = len(expected)
                 if not skipping:
@@ -1074,8 +1074,19 @@ class SQLLogic:
                             self.writeline(line.rstrip(), replace=True)
                         if result1[0] == 'query':
                             self.writeline('----')
-                            for line in result2:
-                                self.writeline(line)
+                            if result1[2] in ('rowsort', 'nosort'):
+                                line = []
+                                ncols = len(result1[1])
+                                for val in result2:
+                                    line.append(val)
+                                    if len(line) == ncols:
+                                        self.writeline('\t'.join(line))
+                                        line = []
+                                if line:
+                                    self.writeline('\t'.join(line))
+                            else:
+                                for line in result2:
+                                    self.writeline(line)
                 if skipping:
                     self.writeline(qrline.rstrip())
                     for line in query:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to