Changeset: a42559e66fbe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a42559e66fbe
Modified Files:
sql/server/sql_parser.y
sql/test/odbc-escape-sequences/Tests/literals.test
Branch: escape-sequences
Log Message:
fix compilation
diffs (36 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
@@ -6577,7 +6577,7 @@ static inline symbol*
makeAtomNode(mvc *m, const char* typename, const char* val, unsigned int
digits, unsigned int scale, bool bind) {
sql_subtype sub_t;
atom *a;
- int r;
+ int sub_t_found = 0;
if (bind) {
sql_type* t = NULL;
if (!(t = mvc_bind_type(m, typename))) {
@@ -6586,9 +6586,9 @@ makeAtomNode(mvc *m, const char* typenam
}
sql_init_subtype(&sub_t, t, 0, 0);
} else {
- r = sql_find_subtype(&sub_t, typename, digits, scale);
+ sub_t_found = sql_find_subtype(&sub_t, typename, digits, scale);
}
- if (!r || (a = atom_general(m->sa, &sub_t, val)) == NULL) {
+ if ((!bind && !sub_t_found) || (a = atom_general(m->sa, &sub_t, val)) ==
NULL) {
sqlformaterror(m, SQLSTATE(22007) "Incorrect %s value (%s)", typename,
val);
return NULL;
}
diff --git a/sql/test/odbc-escape-sequences/Tests/literals.test
b/sql/test/odbc-escape-sequences/Tests/literals.test
--- a/sql/test/odbc-escape-sequences/Tests/literals.test
+++ b/sql/test/odbc-escape-sequences/Tests/literals.test
@@ -26,7 +26,7 @@ select {ts '2022-02-17 02:08:12'}
2022-02-17 02:08:12
query T rowsort
-select {guid 'e751f9e0-2cee-4eca-b0c2-1cf108cebd18'}
+select { guid 'e751f9e0-2cee-4eca-b0c2-1cf108cebd18' }
----
e751f9e0-2cee-4eca-b0c2-1cf108cebd18
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
