Changeset: 7d9eb861b815 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7d9eb861b815
Modified Files:
sql/server/sql_parser.y
Branch: default
Log Message:
Merge with Mar2025 branch.
diffs (29 lines):
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -3965,8 +3965,8 @@ table_ref:
append_symbol(l, $2);
$$ = _symbol_create_list(SQL_TABLE, l);
} else {
- append_int($2->data.lval, 0);
- append_symbol($1->data.lval, $2);
+ append_int($$->data.lval, 0);
+ append_symbol($$->data.lval, $2);
}
}
| LATERAL select_with_parens opt_table_name
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2986,8 +2986,9 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
if lang == 'sql' and
os.path.exists(os.path.join(TSTTRGDIR, TST+'.test.in')):
bs = '\\'
testfile = TST+'.test.in'
-
defines.append(f'QTSTDATAPATH={TSTDATAPATH.replace(bs,bs+bs)}')
- defines.append(f'TSTDATAPATH={TSTDATAPATH}')
+ if TSTDATAPATH:
+
defines.append(f'QTSTDATAPATH={TSTDATAPATH.replace(bs,bs+bs)}')
+
defines.append(f'TSTDATAPATH={TSTDATAPATH}')
defines.append(f'UTSTSRCDIR=file://{url(TSTSRCDIR)}')
defines.append(f'QTSTSRCDIR={TSTSRCDIR.replace(bs,bs+bs)}')
defines.append(f'TSTSRCDIR={TSTSRCDIR}')
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
