Changeset: 91402f5bf77d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91402f5bf77d
Added Files:
sql/test/mergetables/Tests/alter.sql
sql/test/mergetables/Tests/emptymergequery.sql
sql/test/mergetables/Tests/types.sql
Modified Files:
sql/backends/monet5/sql_scenario.c
sql/test/mergetables/Tests/All
Branch: default
Log Message:
More merge table tests
diffs (82 lines):
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1298,7 +1298,7 @@ SQLinitClient(Client c)
}
/* add missing features needed beyond Oct 2014 */
sql_find_subtype(&tp, "timestamp", 0, 0);
- if ( !sql_bind_func(m->sa, mvc_bind_schema(m, "sys"), "epoch",
&tp, NULL, F_FUNC) ){
+ if ( 0 && !sql_bind_func(m->sa, mvc_bind_schema(m, "sys"),
"epoch", &tp, NULL, F_FUNC) ){
if ((err = sql_update_feb2015(c)) !=NULL) {
fprintf(stderr, "!%s\n", err);
GDKfree(err);
diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All
--- a/sql/test/mergetables/Tests/All
+++ b/sql/test/mergetables/Tests/All
@@ -1,6 +1,9 @@
mergeinit
mergeload
mergequery
+emptymergequery
+altertable
+types
forex
#mergedrop corrupts the database
#crash0 crashes the server
diff --git a/sql/test/mergetables/Tests/alter.sql
b/sql/test/mergetables/Tests/alter.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/alter.sql
@@ -0,0 +1,22 @@
+create merge table smalltable(i integer, j integer);
+
+alter table smalltable add table unknowntable;
+
+drop table smalltable;
+
+create schema mys;
+set schema mys;
+
+create merge table mys.smalltable(i integer, j integer);
+
+create table mys.part (i integer, j integer);
+insert into mys.part values(1,2);
+
+alter table mys.smalltable add table part1;
+alter table mys.smalltable add table mys.part1;
+
+select * from mys.smalltable;
+
+
+drop table mys.smalltable;
+drop table mys.part;
diff --git a/sql/test/mergetables/Tests/emptymergequery.sql
b/sql/test/mergetables/Tests/emptymergequery.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/emptymergequery.sql
@@ -0,0 +1,5 @@
+create merge table emptym(i integer, j integer);
+
+select * from emptym;
+
+drop table emptym;
diff --git a/sql/test/mergetables/Tests/types.sql
b/sql/test/mergetables/Tests/types.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/types.sql
@@ -0,0 +1,15 @@
+
+CREATE TABLE part1 ( x double, y decimal(12,3), z double);
+
+CREATE TABLE part2 ( x int, y double, z double);
+
+CREATE MERGE TABLE complete ( x double, y double, z double);
+
+ALTER TABLE complete ADD TABLE part1;
+ALTER TABLE complete ADD TABLE part2;
+
+SELECT * FROM COMPLETE;
+
+DROP TABLE complete;
+DROP TABLE part1;
+DROP TABLE part2;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
