Changeset: a8b8f3b90564 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a8b8f3b90564
Modified Files:
sql/server/rel_exp.c
sql/test/BugTracker-2024/Tests/exp_equal-Bug-7475.test
Branch: default
Log Message:
fixed bug #7475 by improved check for distinct expression names
diffs (32 lines):
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -1169,7 +1169,8 @@ exp_equal( sql_exp *e1, sql_exp *e2)
if (e1 == e2)
return 0;
if (e1->alias.rname && e2->alias.rname && strcmp(e1->alias.rname,
e2->alias.rname) == 0)
- return strcmp(e1->alias.name, e2->alias.name);
+ if (e1->alias.name && e2->alias.name && strcmp(e1->alias.name,
e2->alias.name) == 0)
+ return 0;
if (!e1->alias.rname && !e2->alias.rname && e1->alias.label ==
e2->alias.label && e1->alias.name && e2->alias.name)
return strcmp(e1->alias.name, e2->alias.name);
return -1;
diff --git a/sql/test/BugTracker-2024/Tests/exp_equal-Bug-7475.test
b/sql/test/BugTracker-2024/Tests/exp_equal-Bug-7475.test
--- a/sql/test/BugTracker-2024/Tests/exp_equal-Bug-7475.test
+++ b/sql/test/BugTracker-2024/Tests/exp_equal-Bug-7475.test
@@ -10,7 +10,6 @@ WITH x AS ( SELECT 1 x ) SELECT 1 , ( SE
1
1
-skipif knownfail
query II nosort
SELECT * FROM ( WITH x AS ( SELECT 1 x ) SELECT 1 , ( SELECT x FROM x ) FROM x
WHERE x ) y
----
@@ -23,7 +22,6 @@ SELECT * FROM ( WITH x AS ( SELECT 1 x )
1
1
-skipif knownfail
query II nosort
SELECT * FROM ( WITH x AS ( SELECT 1 x ) SELECT 1 , ( SELECT x FROM x ) FROM (
x NATURAL JOIN x y ) WHERE x ) y
----
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
