Changeset: f3912c0f0998 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3912c0f0998
Modified Files:
        sql/backends/monet5/generator/Tests/generator02.sql
        sql/backends/monet5/generator/Tests/generator02.stable.err
        sql/backends/monet5/generator/Tests/generator02.stable.out
        sql/backends/monet5/generator/Tests/generator04.stable.err
Branch: default
Log Message:

IMHO fixed(?) some more generator error messages,
revealing some more --- to me --- unexpected errors,
resp., SQL function / type resolution behaviour


diffs (216 lines):

diff --git a/sql/backends/monet5/generator/Tests/generator02.sql 
b/sql/backends/monet5/generator/Tests/generator02.sql
--- a/sql/backends/monet5/generator/Tests/generator02.sql
+++ b/sql/backends/monet5/generator/Tests/generator02.sql
@@ -1,10 +1,25 @@
 select * from generate_series(0.0,10.0,1.6);
+select * from generate_series(cast(0.0 as real),cast(10.0 as real),cast(1.6 as 
real));
+select * from generate_series(cast(0.0 as double),cast(10.0 as 
double),cast(1.6 as double));
+select * from generate_series(cast(0.0 as decimal(10,2)),cast(10.0 as 
decimal(10,2)),cast(1.6 as decimal(10,2)));
 
 select * from generate_series(0.1,10.0,1.77) 
 where value <5.0;
+select * from generate_series(cast(0.1 as real),cast(10.0 as real),cast(1.77 
as real)) 
+where value <5.0;
+select * from generate_series(cast(0.1 as double),cast(10.0 as 
double),cast(1.77 as double)) 
+where value <5.0;
+select * from generate_series(cast(0.1 as decimal(10,2)),cast(10.0 as 
decimal(10,2)),cast(1.77 as decimal(10,2))) 
+where value <5.0;
 
 select * from generate_series(0.2,10.0,1.9) as v
 where value <7.0 and value >3.0;
+select * from generate_series(cast(0.2 as real),cast(10.0 as real),cast(1.9 as 
real)) as v
+where value <7.0 and value >3.0;
+select * from generate_series(cast(0.2 as double),cast(10.0 as 
double),cast(1.9 as double)) as v
+where value <7.0 and value >3.0;
+select * from generate_series(cast(0.2 as decimal(10,2)),cast(10.0 as 
decimal(10,2)),cast(1.9 as decimal(10,2))) as v
+where value <7.0 and value >3.0;
 
 select * from generate_series(0.0e0,10.0e0,1.6e0);
 
diff --git a/sql/backends/monet5/generator/Tests/generator02.stable.err 
b/sql/backends/monet5/generator/Tests/generator02.stable.err
--- a/sql/backends/monet5/generator/Tests/generator02.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator02.stable.err
@@ -29,18 +29,6 @@ stderr of test 'generator02` in director
 # 21:27:46 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-4222" "--port=32932"
 # 21:27:46 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-3464/.s.monetdb.39652
-QUERY = select * from generate_series(0.0,10.0,1.6);
-ERROR = !types decimal(2,1) and timestamp(7,0) are not equal for column 'L1'
-MAPI  = (monetdb) /var/tmp/mtest-3464/.s.monetdb.39652
-QUERY = select * from generate_series(0.1,10.0,1.77) 
-        where value <5.0;
-ERROR = !types decimal(2,1) and timestamp(7,0) are not equal for column 'L1'
-MAPI  = (monetdb) /var/tmp/mtest-3464/.s.monetdb.39652
-QUERY = select * from generate_series(0.2,10.0,1.9) as v
-        where value <7.0 and value >3.0;
-ERROR = !types decimal(2,1) and timestamp(7,0) are not equal for column 'L1'
-
 
 # 21:27:46 >  
 # 21:27:46 >  "Done."
diff --git a/sql/backends/monet5/generator/Tests/generator02.stable.out 
b/sql/backends/monet5/generator/Tests/generator02.stable.out
--- a/sql/backends/monet5/generator/Tests/generator02.stable.out
+++ b/sql/backends/monet5/generator/Tests/generator02.stable.out
@@ -36,6 +36,42 @@ Ready.
 [ 6.4  ]
 [ 8    ]
 [ 9.6  ]
+#select * from generate_series(cast(0.0 as real),cast(10.0 as real),cast(1.6 
as real));
+% . # table_name
+% value # name
+% real # type
+% 15 # length
+[ 0    ]
+[ 1.60000002   ]
+[ 3.20000005   ]
+[ 4.80000019   ]
+[ 6.4000001    ]
+[ 8    ]
+[ 9.60000038   ]
+#select * from generate_series(cast(0.0 as double),cast(10.0 as 
double),cast(1.6 as double));
+% . # table_name
+% value # name
+% double # type
+% 24 # length
+[ 0    ]
+[ 1.6  ]
+[ 3.2  ]
+[ 4.8  ]
+[ 6.4  ]
+[ 8    ]
+[ 9.6  ]
+#select * from generate_series(cast(0.0 as decimal(10,2)),cast(10.0 as 
decimal(10,2)),cast(1.6 as decimal(10,2)));
+% . # table_name
+% value # name
+% decimal # type
+% 12 # length
+[ 0.00 ]
+[ 1.60 ]
+[ 3.20 ]
+[ 4.80 ]
+[ 6.40 ]
+[ 8.00 ]
+[ 9.60 ]
 #select * from generate_series(0.1,10.0,1.77) 
 #where value <5.0;
 % . # table_name
@@ -45,6 +81,86 @@ Ready.
 [ 0.1  ]
 [ 1.87 ]
 [ 3.64 ]
+#select * from generate_series(cast(0.1 as real),cast(10.0 as real),cast(1.77 
as real)) 
+#where value <5.0;
+% . # table_name
+% value # name
+% real # type
+% 15 # length
+[ 0.100000001  ]
+[ 1.87 ]
+[ 3.63999987   ]
+#select * from generate_series(cast(0.1 as double),cast(10.0 as 
double),cast(1.77 as double)) 
+#where value <5.0;
+% . # table_name
+% value # name
+% double # type
+% 24 # length
+[ 0.1  ]
+[ 1.87 ]
+[ 3.64 ]
+#select * from generate_series(cast(0.1 as decimal(10,2)),cast(10.0 as 
decimal(10,2)),cast(1.77 as decimal(10,2))) 
+#where value <5.0;
+% . # table_name
+% value # name
+% decimal # type
+% 12 # length
+[ 0.10 ]
+[ 1.87 ]
+[ 3.64 ]
+#select * from generate_series(0.2,10.0,1.9) as v
+#where value <7.0 and value >3.0;
+% .v # table_name
+% value # name
+% double # type
+% 24 # length
+[ 4    ]
+[ 5.9  ]
+#select * from generate_series(cast(0.2 as real),cast(10.0 as real),cast(1.9 
as real)) as v
+#where value <7.0 and value >3.0;
+% .v # table_name
+% value # name
+% real # type
+% 15 # length
+[ 4    ]
+[ 5.89999962   ]
+#select * from generate_series(cast(0.2 as double),cast(10.0 as 
double),cast(1.9 as double)) as v
+#where value <7.0 and value >3.0;
+% .v # table_name
+% value # name
+% double # type
+% 24 # length
+[ 4    ]
+[ 5.9  ]
+#select * from generate_series(cast(0.2 as decimal(10,2)),cast(10.0 as 
decimal(10,2)),cast(1.9 as decimal(10,2))) as v
+#where value <7.0 and value >3.0;
+% .v # table_name
+% value # name
+% decimal # type
+% 12 # length
+[ 4.00 ]
+[ 5.90 ]
+#select * from generate_series(0.0e0,10.0e0,1.6e0);
+% . # table_name
+% value # name
+% double # type
+% 24 # length
+[ 0    ]
+[ 1.6  ]
+[ 3.2  ]
+[ 4.8  ]
+[ 6.4  ]
+[ 8    ]
+[ 9.6  ]
+#select * from generate_series(0.1e0,10.0e0,1.77e0) 
+#where value <5.0e0;
+% . # table_name
+% value # name
+% double # type
+% 24 # length
+[ 0.1  ]
+[ 1.87 ]
+[ 3.64 ]
 #select * from generate_series(0.2e0,10.0e0,1.9e0) as v
 #where value <7.0e0 and value >3.0e0;
 % .v # table_name
diff --git a/sql/backends/monet5/generator/Tests/generator04.stable.err 
b/sql/backends/monet5/generator/Tests/generator04.stable.err
--- a/sql/backends/monet5/generator/Tests/generator04.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator04.stable.err
@@ -31,10 +31,10 @@ stderr of test 'generator04` in director
 
 MAPI  = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
 QUERY = select * from generate_series('a','a','c');
-ERROR = !timestamp (a) has incorrect format
+ERROR = !unsupported type / unknown data type
 MAPI  = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
 QUERY = select * from generate_series(false,true,false) ;
-ERROR = !types boolean(1,0) and timestamp(7,0) are not equal for column 'L1'
+ERROR = !unsupported type / unknown data type
 MAPI  = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
 QUERY = select * from generate_series(null,null,1);
 ERROR = !Illegal generator range
@@ -43,13 +43,12 @@ QUERY = select * from generate_series(10
 ERROR = !Illegal generator range
 MAPI  = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
 QUERY = select * from generate_series(null,10,1);
-ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2'
+ERROR = !Illegal generator range
 MAPI  = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
 QUERY = select * from generate_series(
                timestamp '2008-03-01 00:00',
                timestamp '2008-03-04 12:00');
-ERROR = !types timestamp(7,0) and bigint(64,0) are not equal for column 'L1'
-
+ERROR = !Timestamp step missing
 
 # 21:38:52 >  
 # 21:38:52 >  "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to