Changeset: 7a4f6ce06133 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a4f6ce06133
Modified Files:
sql/server/rel_dump.c
sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
Branch: Oct2020
Log Message:
Small bugfix, look for escaped '"' in atom strings
diffs (34 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -737,8 +737,12 @@ readString( char *r, int *pos)
if (r[*pos] == '"'){
(*pos)++;
st = r+*pos;
- while (r[*pos] != '"')
- (*pos)++;
+ while (r[*pos] != '"') {
+ if (r[*pos] == '\\' && r[*pos + 1] == '"')
+ (*pos)+=2;
+ else
+ (*pos)++;
+ }
r[*pos] = 0;
(*pos)++;
}
diff --git a/sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
b/sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
--- a/sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
+++ b/sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
@@ -58,6 +58,12 @@ with tempfile.TemporaryDirectory() as fa
print(node2_cur.fetchall())
node2_cur.execute("select * from mudf((select * from fofo))")
print(node2_cur.fetchall())
+ try:
+ node2_cur.execute("select * from mudf((select
sx,sxx,sxy,sy,syy,'\"' from fofo))")
+ sys.stderr.write('Exception expected')
+ except pymonetdb.OperationalError as e:
+ if 'to type int failed' not in str(e):
+ sys.stderr.write(str(e))
node2_cur.execute("select * from mudf2((select * from fofo))")
print(node2_cur.fetchall())
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
