Changeset: 5553cf252d94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5553cf252d94
Modified Files:
sql/test/pg_regress/Tests/point.sql
sql/test/pg_regress/Tests/point.stable.out
sql/test/pg_regress/postgresql2sql99.sh
Branch: default
Log Message:
Made small corrections to point.sql
diffs (69 lines):
diff --git a/sql/test/pg_regress/Tests/point.sql
b/sql/test/pg_regress/Tests/point.sql
--- a/sql/test/pg_regress/Tests/point.sql
+++ b/sql/test/pg_regress/Tests/point.sql
@@ -24,7 +24,7 @@ INSERT INTO POINT_TBL(f1) VALUES ('(10.0
INSERT INTO POINT_TBL(f1) VALUES ('(10.0,10.0');
-SELECT '' AS six, POINT_TBL.*;
+SELECT '' AS six, POINT_TBL.* FROM POINT_TBL;
-- left of
SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)';
@@ -55,7 +55,7 @@ SELECT '' AS six, p.f1, p.f1 <-> string
FROM POINT_TBL p
ORDER BY dist;
-SET geqo TO 'off';
+/* SET geqo TO 'off'; */
SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS
dist
FROM POINT_TBL p1, POINT_TBL p2
@@ -77,5 +77,4 @@ SELECT '' AS three, p1.f1 AS point1, p2.
WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1
ORDER BY distance;
-RESET geqo;
-
+/* RESET geqo; */
diff --git a/sql/test/pg_regress/Tests/point.stable.out
b/sql/test/pg_regress/Tests/point.stable.out
--- a/sql/test/pg_regress/Tests/point.stable.out
+++ b/sql/test/pg_regress/Tests/point.stable.out
@@ -46,7 +46,7 @@ Ready.
[ 1 ]
#
#
-#SELECT '' AS six, POINT_TBL.*;
+#SELECT '' AS six, POINT_TBL.* FROM POINT_TBL;
% sys.L0, sys.L0 # table_name
% six, f1 # name
% ?, ? # type
@@ -146,7 +146,6 @@ Ready.
[ "", "(10,10)", 14.14213562 ]
[ "", "(5.1,34.5)", 34.87491935 ]
-SET geqo TO 'off';
#SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS
dist
# FROM POINT_TBL p1, POINT_TBL p2
# ORDER BY dist, point1 using <<, point2 using <<;
@@ -267,8 +266,6 @@ SET geqo TO 'off';
[ "", "(-10,0)", "(-5,-12)", 13 ]
[ "", "(5.1,34.5)", "(10,10)", 24.98519562 ]
-RESET geqo;
-
= ! Correct / expected output still needs to be provided / verified / approved
! =
# 17:11:19 >
diff --git a/sql/test/pg_regress/postgresql2sql99.sh
b/sql/test/pg_regress/postgresql2sql99.sh
--- a/sql/test/pg_regress/postgresql2sql99.sh
+++ b/sql/test/pg_regress/postgresql2sql99.sh
@@ -80,6 +80,8 @@ sed -r \
-e 's/\) (INHERITS.*);/\); -- \1/ig' \
-e 's/VACUUM ANALYZE *;/\/* VACUUM ANALYZE \1; *\//ig' \
-e 's/alter table * alter column * set storage external;/\/* alter
table \1 alter column \2 set storage external; *\//ig' \
+ -e 's/SET geqo TO *;/\/* SET geqo TO \1; *\//ig' \
+ -e 's/RESET geqo;/\/* RESET geqo; *\//ig' \
-e 's/\s+([^\s]+)::float[248]\b/ cast(\1 as double)/ig' \
-e 's/\s+([^\s]+)::int2\b/ cast(\1 as smallint)/ig' \
-e 's/\s+([^\s]+)::int4\b/ cast(\1 as integer)/ig' \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
