Changeset: b695fc68cc76 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b695fc68cc76
Modified Files:
sql/src/test/Skyserver/Skyserver_import.sql
sql/src/test/Skyserver/Skyserver_import_v6.sql
sql/src/test/Skyserver/Tests/Skyserver.SQL.py
sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py
Branch: Oct2010
Log Message:
COPY INTO from <file> now requires adminstrator privileges, i.e., user "monetdb"
diffs (41 lines):
diff -r 4ab898142bf6 -r b695fc68cc76 sql/src/test/Skyserver/Skyserver_import.sql
--- a/sql/src/test/Skyserver/Skyserver_import.sql Wed Dec 15 13:08:32
2010 +0100
+++ b/sql/src/test/Skyserver/Skyserver_import.sql Wed Dec 15 14:00:23
2010 +0100
@@ -1,3 +1,4 @@
+SET SCHEMA "skyserver";
COPY 25000 RECORDS INTO RC3 FROM 'DATA/RC3.dat.bz2' USING DELIMITERS '\t',
'\015\n', '"';
diff -r 4ab898142bf6 -r b695fc68cc76
sql/src/test/Skyserver/Skyserver_import_v6.sql
--- a/sql/src/test/Skyserver/Skyserver_import_v6.sql Wed Dec 15 13:08:32
2010 +0100
+++ b/sql/src/test/Skyserver/Skyserver_import_v6.sql Wed Dec 15 14:00:23
2010 +0100
@@ -1,3 +1,5 @@
+SET SCHEMA "skyserver";
+
COPY 88 RECORDS INTO Ap7Mag FROM 'DATA_DIR/Ap7Mag.dat.bz2' USING DELIMITERS
'\t', '\n','"' NULL as 'NULL';
COPY 111 RECORDS INTO Chunk FROM 'DATA_DIR/Chunk.dat.bz2' USING DELIMITERS
'\t', '\n','"' NULL as 'NULL';
COPY 339 RECORDS INTO DataConstants FROM 'DATA_DIR/DataConstants.dat.bz2'
USING DELIMITERS '\t', '\n','"' NULL as 'NULL';
diff -r 4ab898142bf6 -r b695fc68cc76
sql/src/test/Skyserver/Tests/Skyserver.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver.SQL.py Wed Dec 15 13:08:32
2010 +0100
+++ b/sql/src/test/Skyserver/Tests/Skyserver.SQL.py Wed Dec 15 14:00:23
2010 +0100
@@ -25,7 +25,7 @@
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
- clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
+ clt1 = process.client('sql', user = 'monetdb', passwd = 'monetdb', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
sql = open(os.path.join(dir, os.pardir,
'Skyserver_import.sql')).read().replace('DATA',os.path.join(dir,os.pardir,'microsky').replace('\\','\\\\'))
out,err = clt1.communicate(sql)
sys.stdout.write(out)
diff -r 4ab898142bf6 -r b695fc68cc76
sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py Wed Dec 15 13:08:32
2010 +0100
+++ b/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py Wed Dec 15 14:00:23
2010 +0100
@@ -29,7 +29,7 @@
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
- clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
+ clt1 = process.client('sql', user = 'monetdb', passwd = 'monetdb', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
sql = open(os.path.join(dir, os.pardir,
'Skyserver_import_v6.sql')).read().replace('DATA_DIR',os.path.join(dir,os.pardir,'microsky_v6').replace('\\','\\\\'))
out,err = clt1.communicate(sql)
sys.stdout.write(out)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list