Changeset: b166c79f8e12 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b166c79f8e12
Added Files:
sql/test/bincopy/Tests/bincopy_decimal_range.reqtests
sql/test/bincopy/Tests/bincopy_string_width.reqtests
Removed Files:
sql/test/bincopy/Tests/be123.bin
sql/test/bincopy/Tests/be456.bin
sql/test/bincopy/Tests/maxint.bin
sql/test/bincopy/Tests/strings.bin
Modified Files:
sql/test/bincopy/Tests/bincopy_decimal_range.test.in
sql/test/bincopy/Tests/bincopy_string_width.test.in
sql/test/bincopy/Tests/bincopycollist-prepare.py
sql/test/bincopy/Tests/bincopycollist.test.in
Branch: copyintobinary
Log Message:
Mercurial didn't like my binary files
diffs (145 lines):
diff --git a/sql/test/bincopy/Tests/be123.bin b/sql/test/bincopy/Tests/be123.bin
deleted file mode 100644
index
fce373f3a050d46ffd46722d2e0084ae6eb0cf79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
diff --git a/sql/test/bincopy/Tests/be456.bin b/sql/test/bincopy/Tests/be456.bin
deleted file mode 100644
index
9b34b1c4d9ae801754425898f971d35faa6d3a0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
diff --git a/sql/test/bincopy/Tests/bincopy_decimal_range.reqtests
b/sql/test/bincopy/Tests/bincopy_decimal_range.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/bincopy/Tests/bincopy_decimal_range.reqtests
@@ -0,0 +1,1 @@
+bincopycollist-prepare
diff --git a/sql/test/bincopy/Tests/bincopy_decimal_range.test.in
b/sql/test/bincopy/Tests/bincopy_decimal_range.test.in
--- a/sql/test/bincopy/Tests/bincopy_decimal_range.test.in
+++ b/sql/test/bincopy/Tests/bincopy_decimal_range.test.in
@@ -5,10 +5,10 @@ statement ok
CREATE TABLE foo(i INT)
statement ok
-COPY BIG ENDIAN BINARY INTO foo FROM E'$QTSTSRCDIR/be123.bin'
+COPY BIG ENDIAN BINARY INTO foo FROM E'$QTSTTRGDIR/be123.bin'
statement ok
-COPY BIG ENDIAN BINARY INTO foo FROM E'$QTSTSRCDIR/maxint.bin'
+COPY BIG ENDIAN BINARY INTO foo FROM E'$QTSTTRGDIR/maxint.bin'
query I nosort
SELECT i FROM foo
@@ -30,7 +30,7 @@ statement ok
CREATE TABLE foo(d DECIMAL(8,2))
statement ok
-COPY BIG ENDIAN BINARY INTO foo FROM E'$QTSTSRCDIR/be123.bin'
+COPY BIG ENDIAN BINARY INTO foo FROM E'$QTSTTRGDIR/be123.bin'
query T nosort
SELECT CAST(d AS TEXT) FROM foo
@@ -40,7 +40,7 @@ 0.02
0.03
statement error
-COPY BIG ENDIAN BINARY INTO foo FROM E'$QTSTSRCDIR/maxint.bin'
+COPY BIG ENDIAN BINARY INTO foo FROM E'$QTSTTRGDIR/maxint.bin'
statement ok
ROLLBACK
diff --git a/sql/test/bincopy/Tests/bincopy_string_width.reqtests
b/sql/test/bincopy/Tests/bincopy_string_width.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/bincopy/Tests/bincopy_string_width.reqtests
@@ -0,0 +1,1 @@
+bincopycollist-prepare
diff --git a/sql/test/bincopy/Tests/bincopy_string_width.test.in
b/sql/test/bincopy/Tests/bincopy_string_width.test.in
--- a/sql/test/bincopy/Tests/bincopy_string_width.test.in
+++ b/sql/test/bincopy/Tests/bincopy_string_width.test.in
@@ -5,7 +5,7 @@ statement ok
CREATE TABLE foo(t TEXT);
statement ok
-COPY BIG ENDIAN BINARY INTO foo(t) FROM E'$QTSTSRCDIR/strings.bin'
+COPY BIG ENDIAN BINARY INTO foo(t) FROM E'$QTSTTRGDIR/strings.bin'
query T nosort
SELECT t FROM foo
@@ -24,7 +24,7 @@ statement ok
CREATE TABLE foo(t VARCHAR(5));
statement ok
-COPY BIG ENDIAN BINARY INTO foo(t) FROM E'$QTSTSRCDIR/strings.bin'
+COPY BIG ENDIAN BINARY INTO foo(t) FROM E'$QTSTTRGDIR/strings.bin'
query T nosort
SELECT t FROM foo
@@ -43,7 +43,7 @@ statement ok
CREATE TABLE foo(t VARCHAR(4));
statement error
-COPY BIG ENDIAN BINARY INTO foo(t) FROM E'$QTSTSRCDIR/strings.bin'
+COPY BIG ENDIAN BINARY INTO foo(t) FROM E'$QTSTTRGDIR/strings.bin'
statement ok
ROLLBACK
diff --git a/sql/test/bincopy/Tests/bincopycollist-prepare.py
b/sql/test/bincopy/Tests/bincopycollist-prepare.py
--- a/sql/test/bincopy/Tests/bincopycollist-prepare.py
+++ b/sql/test/bincopy/Tests/bincopycollist-prepare.py
@@ -1,9 +1,17 @@
import struct
import os
-f = open(os.path.join(os.getenv('TSTTRGDIR'), 'bincopyint.bin'), 'wb')
+target_dir = os.getenv('TSTTRGDIR')
-for i in range(10):
- f.write(struct.pack('@i', i))
+testdata = dict(
+ maxint=b'\x7f\xff\xff\xff\x7f\xff\xff\xff\x7f\xff\xff\xff',
+ strings=b'one\x00two\x00three\x00',
+ be456=b'\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\x06',
+ be123=b'\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03',
+ bincopyint=struct.pack('10i', *range(10)),
+)
-f.close()
+for name, content in testdata.items():
+ filename = os.path.join(target_dir, name + '.bin')
+ with open(filename, 'wb') as f:
+ f.write(content)
diff --git a/sql/test/bincopy/Tests/bincopycollist.test.in
b/sql/test/bincopy/Tests/bincopycollist.test.in
--- a/sql/test/bincopy/Tests/bincopycollist.test.in
+++ b/sql/test/bincopy/Tests/bincopycollist.test.in
@@ -28,10 +28,10 @@ statement ok
CREATE TABLE intvals(x INTEGER, y INTEGER);
statement ok
-COPY BIG ENDIAN BINARY INTO intvals FROM (E'$QTSTSRCDIR/be123.bin',
E'$QTSTSRCDIR/be456.bin')
+COPY BIG ENDIAN BINARY INTO intvals FROM (E'$QTSTTRGDIR/be123.bin',
E'$QTSTTRGDIR/be456.bin')
statement ok
-COPY BIG ENDIAN BINARY INTO intvals(y, x) FROM (E'$QTSTSRCDIR/be123.bin',
E'$QTSTSRCDIR/be456.bin')
+COPY BIG ENDIAN BINARY INTO intvals(y, x) FROM (E'$QTSTTRGDIR/be123.bin',
E'$QTSTTRGDIR/be456.bin')
query II nosort
SELECT x, y FROM intvals
diff --git a/sql/test/bincopy/Tests/maxint.bin
b/sql/test/bincopy/Tests/maxint.bin
deleted file mode 100644
--- a/sql/test/bincopy/Tests/maxint.bin
+++ /dev/null
@@ -1,1 +0,0 @@
-ÿÿÿÿÿÿÿÿÿ
\ No newline at end of file
diff --git a/sql/test/bincopy/Tests/strings.bin
b/sql/test/bincopy/Tests/strings.bin
deleted file mode 100644
index
6b6fcd0fadde23c4ed40fb5b1c7184890436cf94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
