Changeset: 0a30eb9230a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a30eb9230a7
Modified Files:
        sql/test/pg_regress/Tests/text.sql
        sql/test/pg_regress/Tests/text.stable.err
        sql/test/pg_regress/Tests/text.stable.out
Branch: default
Log Message:

Corrected missing castings.
Added cleanup of created test table at the end.


diffs (112 lines):

diff --git a/sql/test/pg_regress/Tests/text.sql 
b/sql/test/pg_regress/Tests/text.sql
--- a/sql/test/pg_regress/Tests/text.sql
+++ b/sql/test/pg_regress/Tests/text.sql
@@ -2,9 +2,9 @@
 -- TEXT
 --
 
-SELECT text 'this is a text string' = text 'this is a text string' AS true;
+SELECT cast ('this is a text string' AS text) = cast('this is a text string' 
AS text) AS "true";
 
-SELECT text 'this is a text string' = text 'this is a text strin' AS false;
+SELECT cast ('this is a text string' AS text) = cast('this is a text strin' AS 
text) AS "false";
 
 CREATE TABLE TEXT_TBL (f1 text);
 
@@ -13,3 +13,5 @@ INSERT INTO TEXT_TBL VALUES ('hi de ho n
 
 SELECT '' AS two, * FROM TEXT_TBL;
 
+-- cleanup
+DROP TABLE TEXT_TBL;
diff --git a/sql/test/pg_regress/Tests/text.stable.err 
b/sql/test/pg_regress/Tests/text.stable.err
--- a/sql/test/pg_regress/Tests/text.stable.err
+++ b/sql/test/pg_regress/Tests/text.stable.err
@@ -74,12 +74,9 @@ stderr of test 'text` in directory 'sql/
 # 22:26:27 >  Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb 
--host=pegasus --port=35864  -e < 
../../../../../../../../../../mirror/fabian/monetdb/current/sql/src/test/pg_regress/Tests/../monetdb/text.sql
 # 22:26:27 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
-QUERY = SELECT text 'this is a text string' = text 'this is a text string' AS 
true;
-ERROR = !syntax error, unexpected STRING, expecting SCOLON in: "select text 
'this is a text string'"
-MAPI  = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
-QUERY = SELECT text 'this is a text string' = text 'this is a text strin' AS 
false;
-ERROR = !syntax error, unexpected STRING, expecting SCOLON in: "select text 
'this is a text string'"
+# 17:59:44 >  
+# 17:59:44 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-5665" "--port=31854"
+# 17:59:44 >  
 
 = ! above error messages need to be verified (with expected output in 
sql/test/pg_regress/expected/text.out) ! =
 
diff --git a/sql/test/pg_regress/Tests/text.stable.out 
b/sql/test/pg_regress/Tests/text.stable.out
--- a/sql/test/pg_regress/Tests/text.stable.out
+++ b/sql/test/pg_regress/Tests/text.stable.out
@@ -15,25 +15,51 @@ stdout of test 'text` in directory 'sql/
 # MonetDB/SQL module v2.31.0 loaded
 
 Ready.
-#function user.main():void;
-#    clients.quit();
-#end main;
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
 
+# 17:59:44 >  
+# 17:59:44 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-5665" "--port=31854"
+# 17:59:44 >  
 
-# 22:26:27 >  
-# 22:26:27 >  ./text.SQL.sh text 
-# 22:26:27 >  
-
-
-# 22:26:27 >  
-# 22:26:27 >  Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb 
--host=pegasus --port=35864  -e < 
../../../../../../../../../../mirror/fabian/monetdb/current/sql/src/test/pg_regress/Tests/../monetdb/text.sql
-# 22:26:27 >  
-
-#--
-#-- TEXT
-#--
-#SELECT text 'this is a text string' = text 'this is a text string' AS true;
-#SELECT text 'this is a text string' = text 'this is a text strin' AS false;
+#SELECT cast ('this is a text string' AS text) = cast('this is a text string' 
AS text) AS "true";
+% .L # table_name
+% true # name
+% boolean # type
+% 5 # length
+[ true ]
+#SELECT cast ('this is a text string' AS text) = cast('this is a text strin' 
AS text) AS "false";
+% .L # table_name
+% false # name
+% boolean # type
+% 5 # length
+[ false        ]
 #CREATE TABLE TEXT_TBL (f1 text);
 [ 1    ]
 [ 1    ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to