Changeset: 9b5649554a35 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9b5649554a35
Modified Files:
sql/test/miscellaneous/Tests/simple_plans.test
testing/sqllogictest.py
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (92 lines):
diff --git a/sql/test/miscellaneous/Tests/simple_plans.test
b/sql/test/miscellaneous/Tests/simple_plans.test
--- a/sql/test/miscellaneous/Tests/simple_plans.test
+++ b/sql/test/miscellaneous/Tests/simple_plans.test
@@ -208,7 +208,7 @@ EXPLAIN SELECT 1 FROM another_t t1 INNER
algebra.project
1
algebra.projection
-3
+2
algebra.rangejoin
1
bat.pack
@@ -216,7 +216,7 @@ 5
querylog.define
1
sql.bind
-2
+1
sql.mvc
1
sql.resultSet
@@ -232,7 +232,7 @@ EXPLAIN SELECT 1 FROM another_t t1 INNER
algebra.project
1
algebra.projection
-3
+2
algebra.rangejoin
1
bat.pack
@@ -240,7 +240,7 @@ 5
querylog.define
1
sql.bind
-2
+1
sql.mvc
1
sql.resultSet
@@ -256,7 +256,7 @@ EXPLAIN SELECT 1 FROM another_t t1 INNER
algebra.project
2
algebra.projection
-3
+2
algebra.rangejoin
1
bat.pack
@@ -264,7 +264,7 @@ 5
querylog.define
1
sql.bind
-2
+1
sql.mvc
1
sql.resultSet
@@ -282,7 +282,7 @@ 1
algebra.project
1
algebra.projection
-3
+2
bat.pack
5
bat.single
@@ -290,7 +290,7 @@ 2
querylog.define
1
sql.bind
-2
+1
sql.mvc
1
sql.resultSet
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -545,8 +545,12 @@ class SQLLogic:
m.update(b'\n')
result.append(col)
if err and expected is not None:
+ recv = []
+ for row in ndata:
+ for col in row:
+ recv.append(col)
print('Differences:', file=self.out)
- self.out.writelines(list(difflib.ndiff([x + '\n' for x in
expected], [x + '\n' for x in ndata])))
+ self.out.writelines(list(difflib.ndiff([x + '\n' for x in
expected], [x + '\n' for x in recv])))
if resdata is not None:
result = []
for row in resdata:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
