Changeset: f9cd4a1d177d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f9cd4a1d177d
Removed Files:
sql/test/mergetables/Tests/mergedb_drop.reqtests
sql/test/mergetables/Tests/mergedb_drop.sql
sql/test/mergetables/Tests/mergedb_drop.stable.err
sql/test/mergetables/Tests/mergedb_drop.stable.out
sql/test/mergetables/Tests/mergedrop2.sql
sql/test/mergetables/Tests/mergedrop2.stable.err
sql/test/mergetables/Tests/mergedrop2.stable.out
sql/test/mergetables/Tests/sqlsmith-apply-outer-join-or.sql
sql/test/mergetables/Tests/sqlsmith-apply-outer-join-or.stable.err
sql/test/mergetables/Tests/sqlsmith-apply-outer-join-or.stable.out
sql/test/mergetables/Tests/sqlsmith-exist-lateral.reqtests
sql/test/mergetables/Tests/sqlsmith-exist-lateral.sql
sql/test/mergetables/Tests/sqlsmith-exist-lateral.stable.err
sql/test/mergetables/Tests/sqlsmith-exist-lateral.stable.out
sql/test/mergetables/Tests/sqlsmith.Bug-6451.reqtests
sql/test/mergetables/Tests/sqlsmith.Bug-6451.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6451.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6451.stable.out
sql/test/mergetables/Tests/sqlsmith.Bug-6453.reqtests
sql/test/mergetables/Tests/sqlsmith.Bug-6453.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6453.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6453.stable.out
sql/test/mergetables/Tests/sqlsmith.Bug-6480.reqtests
sql/test/mergetables/Tests/sqlsmith.Bug-6480.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6480.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6480.stable.out
Branch: mtest
Log Message:
merge heads
diffs (truncated from 7731 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -39,50 +39,50 @@ tst037
tst038
tst039
tst041
-#tst042
-#tst043
-#tst044
-#tst045
-#tst046
-#tst047
-#tst048
-#tst049
-#tst050
-#tst051
-#tst052
-#tst053
-#tst054
-#tst055
-#tst056
-#tst057
-#tst058
-#tst059
-#tst060
-#tst061
-#tst070
-#tst071
-#tst072
-#tst074
-#tst075
-## tst077
-#tst100
-#tst1000
-#tst1004
-#tst101
-#tst1012
-#tst102
-#tst103
-#tst107
-#tst108
-#tst109
-#tst110
-#tst111
-#tst112
-#tst113
-#tst114
-#tst117
-#tst115
-#tst116
+tst042
+tst043
+tst044
+tst045
+tst046
+tst047
+tst048
+tst049
+tst050
+tst051
+tst052
+tst053
+tst054
+tst055
+tst056
+tst057
+tst058
+tst059
+tst060
+tst061
+tst070
+tst071
+tst072
+tst074
+tst075
+## tst077 Crashes Mconvert
+tst100
+tst1000
+tst1004
+##tst101 Empty after Mconvert
+tst1012
+tst102
+tst103
+tst107
+tst108
+tst109
+tst110
+tst111
+tst112
+tst113
+tst114
+tst117
+tst115
+tst116
#tst1150
# #tst120 files are not located in module and paths are runtime dependent
# #tst1200
diff --git a/monetdb5/mal/Tests/tst042.malC b/monetdb5/mal/Tests/tst042.malC
--- a/monetdb5/mal/Tests/tst042.malC
+++ b/monetdb5/mal/Tests/tst042.malC
@@ -6,12 +6,18 @@ w:= 1:lng;
B:= 2:bte;
bb:= bat.new(:str);
-st:= inspect.getType(s); io.printf("%s\n",st);
-it:= inspect.getType(i); io.printf("%s\n",it);
-ft:= inspect.getType(f); io.printf("%s\n",ft);
-bt:= inspect.getType(b); io.printf("%s\n",bt);
-wt:= inspect.getType(w); io.printf("%s\n",wt);
-Bt:= inspect.getType(B); io.printf("%s\n",Bt);
+st:= inspect.getType(s);
+io.printf("%s\n",st);
+it:= inspect.getType(i);
+io.printf("%s\n",it);
+ft:= inspect.getType(f);
+io.printf("%s\n",ft);
+bt:= inspect.getType(b);
+io.printf("%s\n",bt);
+wt:= inspect.getType(w);
+io.printf("%s\n",wt);
+Bt:= inspect.getType(B);
+io.printf("%s\n",Bt);
tt:= inspect.getType(bb);
io.printf("bat head %s\n",tt);
diff --git a/monetdb5/mal/Tests/tst042.maltest
b/monetdb5/mal/Tests/tst042.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst042.maltest
@@ -0,0 +1,78 @@
+statement ok
+s := "hello"
+
+statement ok
+i := 1
+
+statement ok
+f := 3.14
+
+statement ok
+b:= true
+
+statement ok
+w:= 1:lng
+
+statement ok
+B:= 2:bte
+
+statement ok
+bb:= bat.new(:str)
+
+statement ok
+st:= inspect.getType(s)
+
+query T rowsort
+io.printf("%s\n",st)
+----
+str
+
+statement ok
+it:= inspect.getType(i)
+
+query T rowsort
+io.printf("%s\n",it)
+----
+int
+
+statement ok
+ft:= inspect.getType(f)
+
+query T rowsort
+io.printf("%s\n",ft)
+----
+flt
+
+statement ok
+bt:= inspect.getType(b)
+
+query T rowsort
+io.printf("%s\n",bt)
+----
+bit
+
+statement ok
+wt:= inspect.getType(w)
+
+query T rowsort
+io.printf("%s\n",wt)
+----
+lng
+
+statement ok
+Bt:= inspect.getType(B)
+
+query T rowsort
+io.printf("%s\n",Bt)
+----
+bte
+
+statement ok
+tt:= inspect.getType(bb)
+
+query T rowsort
+io.printf("bat head %s\n",tt)
+----
+bat head bat[:str]
+
+
diff --git a/monetdb5/mal/Tests/tst043.maltest
b/monetdb5/mal/Tests/tst043.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst043.maltest
@@ -0,0 +1,49 @@
+statement ok
+a:= calc.int(nil)
+
+query T rowsort
+io.printf("formatted int %-3d\n",a)
+----
+formatted int nil
+
+statement ok
+b:= calc.bit(nil)
+
+query T rowsort
+io.printf("formatted bit %s\n",b)
+----
+formatted bit nil
+
+statement ok
+c:= calc.bte(nil)
+
+query T rowsort
+io.printf("formatted bte %c\n",c)
+----
+formatted bte nil
+
+statement ok
+d:= calc.flt(nil)
+
+query T rowsort
+io.printf("formatted flt %3.2f\n",d)
+----
+formatted flt nil
+
+statement ok
+e:= calc.str(nil)
+
+query T rowsort
+io.printf("formatted str %+4s\n",e)
+----
+formatted str nil
+
+statement ok
+l:= calc.lng(nil)
+
+query T rowsort
+io.printf("formatted lng %d\n",l)
+----
+formatted lng nil
+
+
diff --git a/monetdb5/mal/Tests/tst044.malC b/monetdb5/mal/Tests/tst044.malC
--- a/monetdb5/mal/Tests/tst044.malC
+++ b/monetdb5/mal/Tests/tst044.malC
@@ -1,11 +1,19 @@
#testing floating point numbers;
-a:= 3.145:flt; io.print(a);
-a:= -3.145:flt; io.print(a);
-a:= 0.345e1:flt; io.print(a);
-a:= 3.415e-1:flt; io.print(a);
+a:= 3.145:flt;
+io.print(a);
+a:= -3.145:flt;
+io.print(a);
+a:= 0.345e1:flt;
+io.print(a);
+a:= 3.415e-1:flt;
+io.print(a);
-b:= 3.145:dbl; io.print(b);
-b:= -3.145:dbl; io.print(b);
-b:= 0.345e1:dbl; io.print(b);
-b:= 3.415e-1:dbl; io.print(b);
+b:= 3.145:dbl;
+io.print(b);
+b:= -3.145:dbl;
+io.print(b);
+b:= 0.345e1:dbl;
+io.print(b);
+b:= 3.415e-1:dbl;
+io.print(b);
diff --git a/monetdb5/mal/Tests/tst044.maltest
b/monetdb5/mal/Tests/tst044.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst044.maltest
@@ -0,0 +1,65 @@
+statement ok
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
