Changeset: 6cc39a6cdd4d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6cc39a6cdd4d
Modified Files:
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.SQL.py
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb/Tests/testdb-dump.SQL.py
sql/test/testdb/Tests/testdb-dump.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out.Windows
Branch: Jul2015
Log Message:
Use less floating point precision when checking dump results.
diffs (207 lines):
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
@@ -1,4 +1,5 @@
import sys
+import re
try:
from MonetDBtesting import process
except ImportError:
@@ -6,5 +7,11 @@ except ImportError:
p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
out, err = p.communicate()
-sys.stdout.write(out)
+
+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/testdb-upgrade-chain-hge/Tests/dump.stable.out
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
@@ -101289,7 +101289,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
'\t','\n','"';
-POINT (10.5000000000000000 12.3000000000000007) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000)) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) MULTIPOINT (20.0000000000000000
80.0000000000000000, 110.0000000000000000 160.0000000000000000,
20.0000000000000000 160.0000000000000000) MULTILINESTRING
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.000000000
0000000 80.0000000000000000, 60.0000000000000000 0.0000000000000000,
0.0000000000000000 0.0000000000000000)) MULTILINESTRING ((0.0000000000000000
0.0000000000000000, 0.0000000000000000 80.0000000000000000, 60.0000000000000000
80.0000000000000000, 60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.0000000000000000)),
((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.00000000000
00000)), ((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) GEOMETRYCOLLECTION (POLYGON
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
100.0000000000000000, 100.0000000000000000 100.0000000000000000,
100.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)), LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
create view keytest3 as select t2.key1, t2.key2, t1.key3 from keytest1 t1,
keytest2 t2 where t1.key1 = t2.key1 and t1.key2 = t2.key2;
create trigger keytesttrigger after update on keytest1 referencing new row as
new_row for each row insert into keytest2 values (new_row.key1, new_row.key2);
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
@@ -1,4 +1,5 @@
import sys
+import re
try:
from MonetDBtesting import process
except ImportError:
@@ -6,5 +7,11 @@ except ImportError:
p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
out, err = p.communicate()
-sys.stdout.write(out)
+
+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/testdb-upgrade-chain/Tests/dump.stable.out
b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
@@ -101231,7 +101231,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
'\t','\n','"';
-POINT (10.5000000000000000 12.3000000000000007) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000)) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) MULTIPOINT (20.0000000000000000
80.0000000000000000, 110.0000000000000000 160.0000000000000000,
20.0000000000000000 160.0000000000000000) MULTILINESTRING
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.000000000
0000000 80.0000000000000000, 60.0000000000000000 0.0000000000000000,
0.0000000000000000 0.0000000000000000)) MULTILINESTRING ((0.0000000000000000
0.0000000000000000, 0.0000000000000000 80.0000000000000000, 60.0000000000000000
80.0000000000000000, 60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.0000000000000000)),
((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.00000000000
00000)), ((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) GEOMETRYCOLLECTION (POLYGON
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
100.0000000000000000, 100.0000000000000000 100.0000000000000000,
100.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)), LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
create view keytest3 as select t2.key1, t2.key2, t1.key3 from keytest1 t1,
keytest2 t2 where t1.key1 = t2.key1 and t1.key2 = t2.key2;
create trigger keytesttrigger after update on keytest1 referencing new row as
new_row for each row insert into keytest2 values (new_row.key1, new_row.key2);
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
--- a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
@@ -101231,7 +101231,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
'\t','\n','"';
-POINT (10.5000000000000000 12.3000000000000010) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000)) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) MULTIPOINT (20.0000000000000000
80.0000000000000000, 110.0000000000000000 160.0000000000000000,
20.0000000000000000 160.0000000000000000) MULTILINESTRING
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.000000000
0000000 80.0000000000000000, 60.0000000000000000 0.0000000000000000,
0.0000000000000000 0.0000000000000000)) MULTILINESTRING ((0.0000000000000000
0.0000000000000000, 0.0000000000000000 80.0000000000000000, 60.0000000000000000
80.0000000000000000, 60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.0000000000000000)),
((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.00000000000
00000)), ((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) GEOMETRYCOLLECTION (POLYGON
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
100.0000000000000000, 100.0000000000000000 100.0000000000000000,
100.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)), LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
create view keytest3 as select t2.key1, t2.key2, t1.key3 from keytest1 t1,
keytest2 t2 where t1.key1 = t2.key1 and t1.key2 = t2.key2;
create trigger keytesttrigger after update on keytest1 referencing new row as
new_row for each row insert into keytest2 values (new_row.key1, new_row.key2);
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
@@ -1,4 +1,5 @@
import sys
+import re
try:
from MonetDBtesting import process
except ImportError:
@@ -6,5 +7,11 @@ except ImportError:
p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
out, err = p.communicate()
-sys.stdout.write(out)
+
+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/testdb-upgrade-hge/Tests/dump.stable.out
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
@@ -101298,7 +101298,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
'\t','\n','"';
-POINT (10.5000000000000000 12.3000000000000007) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000)) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) MULTIPOINT (20.0000000000000000
80.0000000000000000, 110.0000000000000000 160.0000000000000000,
20.0000000000000000 160.0000000000000000) MULTILINESTRING
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.000000000
0000000 80.0000000000000000, 60.0000000000000000 0.0000000000000000,
0.0000000000000000 0.0000000000000000)) MULTILINESTRING ((0.0000000000000000
0.0000000000000000, 0.0000000000000000 80.0000000000000000, 60.0000000000000000
80.0000000000000000, 60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.0000000000000000)),
((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.00000000000
00000)), ((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) GEOMETRYCOLLECTION (POLYGON
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
100.0000000000000000, 100.0000000000000000 100.0000000000000000,
100.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)), LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."mt3" ADD TABLE "mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "t4";
diff --git a/sql/test/testdb-upgrade/Tests/dump.SQL.py
b/sql/test/testdb-upgrade/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade/Tests/dump.SQL.py
@@ -1,4 +1,5 @@
import sys
+import re
try:
from MonetDBtesting import process
except ImportError:
@@ -6,5 +7,11 @@ except ImportError:
p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
out, err = p.communicate()
-sys.stdout.write(out)
+
+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/testdb-upgrade/Tests/dump.stable.out
b/sql/test/testdb-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade/Tests/dump.stable.out
@@ -101273,7 +101273,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
'\t','\n','"';
-POINT (10.5000000000000000 12.3000000000000007) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000)) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) MULTIPOINT (20.0000000000000000
80.0000000000000000, 110.0000000000000000 160.0000000000000000,
20.0000000000000000 160.0000000000000000) MULTILINESTRING
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.000000000
0000000 80.0000000000000000, 60.0000000000000000 0.0000000000000000,
0.0000000000000000 0.0000000000000000)) MULTILINESTRING ((0.0000000000000000
0.0000000000000000, 0.0000000000000000 80.0000000000000000, 60.0000000000000000
80.0000000000000000, 60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.0000000000000000)),
((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.00000000000
00000)), ((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) GEOMETRYCOLLECTION (POLYGON
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
100.0000000000000000, 100.0000000000000000 100.0000000000000000,
100.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)), LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."mt3" ADD TABLE "mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "t4";
diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
b/sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
--- a/sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
+++ b/sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
@@ -101273,7 +101273,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
'\t','\n','"';
-POINT (10.5000000000000000 12.3000000000000010) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000)) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) MULTIPOINT (20.0000000000000000
80.0000000000000000, 110.0000000000000000 160.0000000000000000,
20.0000000000000000 160.0000000000000000) MULTILINESTRING
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.000000000
0000000 80.0000000000000000, 60.0000000000000000 0.0000000000000000,
0.0000000000000000 0.0000000000000000)) MULTILINESTRING ((0.0000000000000000
0.0000000000000000, 0.0000000000000000 80.0000000000000000, 60.0000000000000000
80.0000000000000000, 60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.0000000000000000)),
((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.00000000000
00000)), ((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) GEOMETRYCOLLECTION (POLYGON
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
100.0000000000000000, 100.0000000000000000 100.0000000000000000,
100.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)), LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."mt3" ADD TABLE "mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "t4";
diff --git a/sql/test/testdb/Tests/testdb-dump.SQL.py
b/sql/test/testdb/Tests/testdb-dump.SQL.py
--- a/sql/test/testdb/Tests/testdb-dump.SQL.py
+++ b/sql/test/testdb/Tests/testdb-dump.SQL.py
@@ -1,10 +1,18 @@
import sys
+import re
try:
from MonetDBtesting import process
except ImportError:
import process
sys.stdout.flush() # just to be sure
-p = process.client('sqldump', stderr = process.PIPE)
+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/testdb/Tests/testdb-dump.stable.out
b/sql/test/testdb/Tests/testdb-dump.stable.out
--- a/sql/test/testdb/Tests/testdb-dump.stable.out
+++ b/sql/test/testdb/Tests/testdb-dump.stable.out
@@ -101272,7 +101272,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
'\t','\n','"';
-POINT (10.5000000000000000 12.3000000000000007) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000)) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) MULTIPOINT (20.0000000000000000
80.0000000000000000, 110.0000000000000000 160.0000000000000000,
20.0000000000000000 160.0000000000000000) MULTILINESTRING
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.000000000
0000000 80.0000000000000000, 60.0000000000000000 0.0000000000000000,
0.0000000000000000 0.0000000000000000)) MULTILINESTRING ((0.0000000000000000
0.0000000000000000, 0.0000000000000000 80.0000000000000000, 60.0000000000000000
80.0000000000000000, 60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.0000000000000000)),
((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.00000000000
00000)), ((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) GEOMETRYCOLLECTION (POLYGON
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
100.0000000000000000, 100.0000000000000000 100.0000000000000000,
100.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)), LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."mt3" ADD TABLE "mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "t4";
diff --git a/sql/test/testdb/Tests/testdb-dump.stable.out.Windows
b/sql/test/testdb/Tests/testdb-dump.stable.out.Windows
--- a/sql/test/testdb/Tests/testdb-dump.stable.out.Windows
+++ b/sql/test/testdb/Tests/testdb-dump.stable.out.Windows
@@ -101272,7 +101272,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
'\t','\n','"';
-POINT (10.5000000000000000 12.3000000000000010) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000) POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000)) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) MULTIPOINT (20.0000000000000000
80.0000000000000000, 110.0000000000000000 160.0000000000000000,
20.0000000000000000 160.0000000000000000) MULTILINESTRING
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.000000000
0000000 80.0000000000000000, 60.0000000000000000 0.0000000000000000,
0.0000000000000000 0.0000000000000000)) MULTILINESTRING ((0.0000000000000000
0.0000000000000000, 0.0000000000000000 80.0000000000000000, 60.0000000000000000
80.0000000000000000, 60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.0000000000000000)),
((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) MULTIPOLYGON (((140.0000000000000000
110.0000000000000000, 260.0000000000000000 110.0000000000000000,
170.0000000000000000 20.0000000000000000, 50.0000000000000000
20.0000000000000000, 140.0000000000000000 110.00000000000
00000)), ((300.0000000000000000 270.0000000000000000, 420.0000000000000000
270.0000000000000000, 340.0000000000000000 190.0000000000000000,
220.0000000000000000 190.0000000000000000, 300.0000000000000000
270.0000000000000000))) POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)) GEOMETRYCOLLECTION (POLYGON
((0.0000000000000000 0.0000000000000000, 0.0000000000000000
100.0000000000000000, 100.0000000000000000 100.0000000000000000,
100.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000)), LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."mt3" ADD TABLE "mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "t4";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
