Changeset: aa832e36c6fb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa832e36c6fb
Modified Files:
sql/test/Users/Tests/copyinto.SQL.py
Branch: Jun2016
Log Message:
Cover all bases: translate paths with single and double backslashes.
diffs (35 lines):
diff --git a/sql/test/Users/Tests/copyinto.SQL.py
b/sql/test/Users/Tests/copyinto.SQL.py
--- a/sql/test/Users/Tests/copyinto.SQL.py
+++ b/sql/test/Users/Tests/copyinto.SQL.py
@@ -16,27 +16,27 @@ c.stdin.write("CREATE USER copyuser WITH
c.stdin.write("GRANT INSERT, SELECT on region to copyuser;\n")
out, err = c.communicate()
sys.stdout.write(out)
-sys.stderr.write(err.replace(DATADIR, '$DATADIR').replace('DIR\\', 'DIR/'))
+sys.stderr.write(err.replace(DATADIR,
'$DATADIR').replace(DATADIR.replace('\\', r'\\'), '$DATADIR').replace(r'DIR\\',
'DIR/').replace('DIR\\', 'DIR/'))
c = process.client('sql', user = 'copyuser', passwd = 'copyuser', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
c.stdin.write("COPY 5 RECORDS INTO region from '%s' USING DELIMITERS '|',
'|\\n';\n" % os.path.join(DATADIR, 'region.tbl').replace('\\', r'\\'))
c.stdin.write("select count(*) from region;\n")
out, err = c.communicate()
sys.stdout.write(out)
-sys.stderr.write(err.replace(DATADIR, '$DATADIR').replace('DIR\\', 'DIR/'))
+sys.stderr.write(err.replace(DATADIR,
'$DATADIR').replace(DATADIR.replace('\\', r'\\'), '$DATADIR').replace(r'DIR\\',
'DIR/').replace('DIR\\', 'DIR/'))
c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
c.stdin.write("GRANT COPY FROM, COPY INTO to copyuser;\n")
out, err = c.communicate()
sys.stdout.write(out)
-sys.stderr.write(err.replace(DATADIR, '$DATADIR').replace('DIR\\', 'DIR/'))
+sys.stderr.write(err.replace(DATADIR,
'$DATADIR').replace(DATADIR.replace('\\', r'\\'), '$DATADIR').replace(r'DIR\\',
'DIR/').replace('DIR\\', 'DIR/'))
c = process.client('sql', user = 'copyuser', passwd = 'copyuser', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
c.stdin.write("COPY 5 RECORDS INTO region from '%s' USING DELIMITERS '|',
'|\\n';\n" % os.path.join(DATADIR, 'region.tbl').replace('\\', r'\\'))
c.stdin.write("select count(*) from region;\n")
out, err = c.communicate()
sys.stdout.write(out)
-sys.stderr.write(err.replace(DATADIR, '$DATADIR').replace('DIR\\', 'DIR/'))
+sys.stderr.write(err.replace(DATADIR,
'$DATADIR').replace(DATADIR.replace('\\', r'\\'), '$DATADIR').replace(r'DIR\\',
'DIR/').replace('DIR\\', 'DIR/'))
c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
c.stdin.write("REVOKE COPY FROM, COPY INTO from copyuser;\n")
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
