Changeset: 720f0a5f3636 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=720f0a5f3636 Removed Files: NT/updatecodes.py Modified Files: sql/server/rel_dump.c Branch: default Log Message:
Merge with Jul2017 branch. diffs (69 lines): diff --git a/NT/updatecodes.py b/NT/updatecodes.py deleted file mode 100755 --- a/NT/updatecodes.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/python - -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. - -import subprocess -import re - -prcdre = re.compile('"ProductCode" = "8:{(.*)}"') -pacdre = re.compile('"PackageCode" = "8:{(.*)}"') - -def update(f): - p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE, - universal_newlines = True) - u, e = p.communicate() - productcode = u.strip('\n').upper() - p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE, - universal_newlines = True) - u, e = p.communicate() - packagecode = u.strip('\n').upper() - fp = open(f) - data = fp.read() - fp.close() - repl = '"ProductCode" = "8:{%s}"' % productcode - data = prcdre.sub(repl, data) - repl = '"PackageCode" = "8:{%s}"' % packagecode - data = pacdre.sub(repl, data) - fp = open(f, 'w') - fp.write(data) - fp.close() - -if __name__ == '__main__': - import sys - for f in sys.argv[1:]: - update(f) 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 @@ -1308,19 +1308,19 @@ rel_read(mvc *sql, char *r, int *pos, li rel->exps = exps; return rel; case 'u': - if (j != op_basetable) { + if (j == op_basetable) { *pos += (int) strlen("union"); j = op_union; } /* fall through */ case 'i': - if (j != op_basetable) { + if (j == op_basetable) { *pos += (int) strlen("intersect"); j = op_inter; } /* fall through */ case 'e': - if (j != op_basetable) { + if (j == op_basetable) { *pos += (int) strlen("except"); j = op_except; } _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
