Changeset: a71e02537e8c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a71e02537e8c
Modified Files:
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/src/test/Tests/copy_into.sql
Branch: default
Log Message:
Merged from Oct2010
diffs (108 lines):
diff -r 0ffb8bdefa05 -r a71e02537e8c
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
--- a/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
Wed Dec 15 13:36:09 2010 +0100
+++ b/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
Wed Dec 15 14:23:18 2010 +0100
@@ -1,3 +1,3 @@
create table cm_tmp(i int);
-plan copy into cm_tmp from 'file1','file2';
+plan copy into cm_tmp from '/file1','/file2';
drop table cm_tmp;
diff -r 0ffb8bdefa05 -r a71e02537e8c
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
Wed Dec 15 13:36:09 2010 +0100
+++
b/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
Wed Dec 15 14:23:18 2010 +0100
@@ -29,12 +29,12 @@
% .plan # table_name
% rel # name
% clob # type
-% 96 # length
+% 94 # length
insert(
| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
| union (
-| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', 'file1', -1, 0,
0), [ cm_tmp.i ],
-| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', 'file2', -1, 0,
0), [ cm_tmp.i ]
+| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', '/file1', -1,
0), [ cm_tmp.i ],
+| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', '/file2', -1,
0), [ cm_tmp.i ]
| )
)
diff -r 0ffb8bdefa05 -r a71e02537e8c sql/src/test/Skyserver/Skyserver_import.sql
--- a/sql/src/test/Skyserver/Skyserver_import.sql Wed Dec 15 13:36:09
2010 +0100
+++ b/sql/src/test/Skyserver/Skyserver_import.sql Wed Dec 15 14:23:18
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 0ffb8bdefa05 -r a71e02537e8c
sql/src/test/Skyserver/Skyserver_import_v6.sql
--- a/sql/src/test/Skyserver/Skyserver_import_v6.sql Wed Dec 15 13:36:09
2010 +0100
+++ b/sql/src/test/Skyserver/Skyserver_import_v6.sql Wed Dec 15 14:23:18
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 0ffb8bdefa05 -r a71e02537e8c
sql/src/test/Skyserver/Tests/Skyserver.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver.SQL.py Wed Dec 15 13:36:09
2010 +0100
+++ b/sql/src/test/Skyserver/Tests/Skyserver.SQL.py Wed Dec 15 14:23:18
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 0ffb8bdefa05 -r a71e02537e8c
sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py Wed Dec 15 13:36:09
2010 +0100
+++ b/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py Wed Dec 15 14:23:18
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)
diff -r 0ffb8bdefa05 -r a71e02537e8c sql/src/test/Tests/copy_into.sql
--- a/sql/src/test/Tests/copy_into.sql Wed Dec 15 13:36:09 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-create table copyouttest ( str VARCHAR(20), str2 VARCHAR(20));
-insert into copyouttest values ('', 'test');
-insert into copyouttest values ('test', '');
-insert into copyouttest values ('','');
-insert into copyouttest values (' Test ','');
-select * from copyouttest;
-
-copy select * from copyouttest into 'x.dat' delimiters '[]', '\n';
-drop table copyouttest;
-
-create table copyintest ( str VARCHAR(20), str2 VARCHAR(20));
-copy into copyintest from 'x.dat' delimiters '[]', '\n', '"';
-
-select * from copyintest;
-drop table copyintest;
-
diff -r 0ffb8bdefa05 -r a71e02537e8c sql/src/test/Tests/copy_into.sql.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/Tests/copy_into.sql.in Wed Dec 15 14:23:18 2010 +0100
@@ -0,0 +1,16 @@
+create table copyouttest ( str VARCHAR(20), str2 VARCHAR(20));
+insert into copyouttest values ('', 'test');
+insert into copyouttest values ('test', '');
+insert into copyouttest values ('','');
+insert into copyouttest values (' Test ','');
+select * from copyouttest;
+
+copy select * from copyouttest into '$TSTTRGBASE/mTests/x.dat' delimiters
'[]', '\n';
+drop table copyouttest;
+
+create table copyintest ( str VARCHAR(20), str2 VARCHAR(20));
+copy into copyintest from '$TSTTRGBASE/mTests/x.dat' delimiters '[]', '\n',
'"';
+
+select * from copyintest;
+drop table copyintest;
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
