Changeset: 4756e58c7be8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4756e58c7be8
Added Files:
sql/test/Dump/Tests/dump-empty.sql
sql/test/emptydb-upgrade-chain-hge/Tests/dump.sql
sql/test/emptydb-upgrade-chain/Tests/dump.sql
sql/test/emptydb-upgrade-hge/Tests/dump.sql
sql/test/emptydb-upgrade/Tests/dump.sql
sql/test/emptydb/Tests/dump.sql
sql/test/testdb-upgrade-chain-hge/Tests/dump.sql
sql/test/testdb-upgrade-chain/Tests/dump.sql
sql/test/testdb-upgrade-hge/Tests/dump.sql
sql/test/testdb-upgrade/Tests/dump.sql
sql/test/testdb/Tests/testdb-dump.sql
Removed Files:
sql/test/Dump/Tests/dump-empty.SQL.py
sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py
sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py
sql/test/emptydb-upgrade/Tests/dump.SQL.py
sql/test/emptydb/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src
sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src
sql/test/testdb-upgrade/Tests/dump.SQL.py.src
sql/test/testdb/Tests/testdb-dump.SQL.py
Branch: Mar2018
Log Message:
No need for Python scripts for doing simple dumps.
diffs (236 lines):
diff --git a/sql/test/Dump/Tests/dump-empty.SQL.py
b/sql/test/Dump/Tests/dump-empty.SQL.py
deleted file mode 100644
--- a/sql/test/Dump/Tests/dump-empty.SQL.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import sys
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
diff --git a/sql/test/Dump/Tests/dump-empty.sql
b/sql/test/Dump/Tests/dump-empty.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/Dump/Tests/dump-empty.sql
@@ -0,0 +1,1 @@
+\D
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py
b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py
deleted file mode 100644
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sys
-import re
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.sql
b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.sql
@@ -0,0 +1,1 @@
+\D
diff --git a/sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py
b/sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py
deleted file mode 100644
--- a/sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sys
-import re
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
diff --git a/sql/test/emptydb-upgrade-chain/Tests/dump.sql
b/sql/test/emptydb-upgrade-chain/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade-chain/Tests/dump.sql
@@ -0,0 +1,1 @@
+\D
diff --git a/sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py
b/sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py
deleted file mode 100644
--- a/sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sys
-import re
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
diff --git a/sql/test/emptydb-upgrade-hge/Tests/dump.sql
b/sql/test/emptydb-upgrade-hge/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade-hge/Tests/dump.sql
@@ -0,0 +1,1 @@
+\D
diff --git a/sql/test/emptydb-upgrade/Tests/dump.SQL.py
b/sql/test/emptydb-upgrade/Tests/dump.SQL.py
deleted file mode 100644
--- a/sql/test/emptydb-upgrade/Tests/dump.SQL.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sys
-import re
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
diff --git a/sql/test/emptydb-upgrade/Tests/dump.sql
b/sql/test/emptydb-upgrade/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade/Tests/dump.sql
@@ -0,0 +1,1 @@
+\D
diff --git a/sql/test/emptydb/Tests/dump.SQL.py
b/sql/test/emptydb/Tests/dump.SQL.py
deleted file mode 100644
--- a/sql/test/emptydb/Tests/dump.SQL.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import sys
-import re
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-sys.stdout.flush() # just to be sure
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
diff --git a/sql/test/emptydb/Tests/dump.sql b/sql/test/emptydb/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb/Tests/dump.sql
@@ -0,0 +1,1 @@
+\D
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src
deleted file mode 100644
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src
+++ /dev/null
@@ -1,1 +0,0 @@
-$RELSRCDIR/../../testdb/Tests/testdb-dump.SQL.py
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.sql
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.sql
@@ -0,0 +1,2 @@
+SET TIME ZONE INTERVAL '+00:00' HOUR TO MINUTE;
+\D
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src
b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src
deleted file mode 100644
--- a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src
+++ /dev/null
@@ -1,1 +0,0 @@
-$RELSRCDIR/../../testdb/Tests/testdb-dump.SQL.py
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.sql
b/sql/test/testdb-upgrade-chain/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.sql
@@ -0,0 +1,2 @@
+SET TIME ZONE INTERVAL '+00:00' HOUR TO MINUTE;
+\D
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src
b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src
deleted file mode 100644
--- a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src
+++ /dev/null
@@ -1,1 +0,0 @@
-$RELSRCDIR/../../testdb/Tests/testdb-dump.SQL.py
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.sql
b/sql/test/testdb-upgrade-hge/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.sql
@@ -0,0 +1,2 @@
+SET TIME ZONE INTERVAL '+00:00' HOUR TO MINUTE;
+\D
diff --git a/sql/test/testdb-upgrade/Tests/dump.SQL.py.src
b/sql/test/testdb-upgrade/Tests/dump.SQL.py.src
deleted file mode 100644
--- a/sql/test/testdb-upgrade/Tests/dump.SQL.py.src
+++ /dev/null
@@ -1,1 +0,0 @@
-$RELSRCDIR/../../testdb/Tests/testdb-dump.SQL.py
diff --git a/sql/test/testdb-upgrade/Tests/dump.sql
b/sql/test/testdb-upgrade/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade/Tests/dump.sql
@@ -0,0 +1,2 @@
+SET TIME ZONE INTERVAL '+00:00' HOUR TO MINUTE;
+\D
diff --git a/sql/test/testdb/Tests/testdb-dump.SQL.py
b/sql/test/testdb/Tests/testdb-dump.SQL.py
deleted file mode 100644
--- a/sql/test/testdb/Tests/testdb-dump.SQL.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import sys
-import re
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-sys.stdout.flush() # just to be sure
-p = process.client('sqldump')
-p.communicate()
diff --git a/sql/test/testdb/Tests/testdb-dump.sql
b/sql/test/testdb/Tests/testdb-dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb/Tests/testdb-dump.sql
@@ -0,0 +1,2 @@
+SET TIME ZONE INTERVAL '+00:00' HOUR TO MINUTE;
+\D
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
