asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [02/44] asterixdb git commit: Renaming: "table"->"dataset", "database"->"dataverse".
Date Tue, 02 Aug 2016 01:14:04 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.2.update.sqlpp
index 9c8bfd6..074dc2f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.2.update.sqlpp
@@ -26,15 +26,15 @@
 use tpch;
 
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
-load  table Supplier using localfs ((`path`=`asterix_nc1://data/tpch0.001/supplier.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Supplier using localfs ((`path`=`asterix_nc1://data/tpch0.001/supplier.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
-load  table Region using localfs ((`path`=`asterix_nc1://data/tpch0.001/region.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Region using localfs ((`path`=`asterix_nc1://data/tpch0.001/region.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
-load  table Nation using localfs ((`path`=`asterix_nc1://data/tpch0.001/nation.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Nation using localfs ((`path`=`asterix_nc1://data/tpch0.001/nation.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
-load  table Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
-load  table SelectedNation using localfs ((`path`=`asterix_nc1://data/tpch0.001/selectednation.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset SelectedNation using localfs ((`path`=`asterix_nc1://data/tpch0.001/selectednation.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp
index b26ac3d..f44a9c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 16th Nov. 2014
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -49,5 +49,5 @@ create type tpch.LineItemType as
   l_comment : string
 }
 
-create  table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.2.update.sqlpp
index 6f25576..2e3c28e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.2.update.sqlpp
@@ -26,5 +26,5 @@
 use tpch;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp
index b26ac3d..f44a9c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 16th Nov. 2014
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -49,5 +49,5 @@ create type tpch.LineItemType as
   l_comment : string
 }
 
-create  table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.2.update.sqlpp
index 6f25576..2e3c28e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.2.update.sqlpp
@@ -26,5 +26,5 @@
 use tpch;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp
index b26ac3d..f44a9c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 16th Nov. 2014
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -49,5 +49,5 @@ create type tpch.LineItemType as
   l_comment : string
 }
 
-create  table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.2.update.sqlpp
index 6f25576..2e3c28e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.2.update.sqlpp
@@ -26,5 +26,5 @@
 use tpch;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp
index d6e46e1..1b94d4b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 16th Nov. 2014
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -49,5 +49,5 @@ create type tpch.LineItemType as
   l_comment : string
 }
 
-create  table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.2.update.sqlpp
index 1a620ef..ba67098 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.2.update.sqlpp
@@ -26,5 +26,5 @@
 use tpch;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp
index d6e46e1..1b94d4b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 16th Nov. 2014
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -49,5 +49,5 @@ create type tpch.LineItemType as
   l_comment : string
 }
 
-create  table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.2.update.sqlpp
index 1a620ef..ba67098 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.2.update.sqlpp
@@ -26,5 +26,5 @@
 use tpch;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp
index 5e79a7b..aa855ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp
index 882e0bf..ddb6bf0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp
index f3a4dde..aee26c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp
index ef2519d..f62f716 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp
index 2913bd0..f8439d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp
index 42e14de..135b693 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -42,7 +42,7 @@ create type test.deptInfoType as
   dname : string
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.2.update.sqlpp
index ca16cd5..8b57460 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset_minus_data.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset_minus_data.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset_minus_data.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset_minus_data.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp
index 9a4b7ab..3c70004 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp
index 43c27d4..e6ad2d1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp
index 91d1fe2..d1b0939 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp
index 437e81a..43cd1dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp
index bd2f70f..7fe1adf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp
index 80631b4..e4e7201 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp
index cded6ef..13e22ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp
index 4fba616..7d4c644 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp
index c35ddc3..eed520c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp
index 201b7a3..5369359 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp
index abbcaa8..924c007 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp
index 18d6bd5..e3fd576 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp
index ae862f6..5e9e7dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp
@@ -23,8 +23,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp
index 8e3d575..a0f9ae0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp
index b98cdb8..0072299 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp
index a84c172..4b2e6dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp
index fdd828e..d68f9b1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp
index 7fd74a8..74dc961 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp
@@ -22,8 +22,8 @@
 * - Expected Result: Success
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,9 +48,9 @@ create type test.deptInfoType as
   bossidint32 : int32
 }
 
-create  table empDataset(empInfoType) primary key id;
+create  dataset empDataset(empInfoType) primary key id;
 
-create  table deptDataset(deptInfoType) primary key did;
+create  dataset deptDataset(deptInfoType) primary key did;
 
 create  index empAgeIdx  on empDataset (age) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.2.update.sqlpp
index b622ea8..1e9d15e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.2.update.sqlpp
@@ -24,7 +24,7 @@
 use test;
 
 
-load  table empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
+load  dataset empDataset using localfs ((`path`=`asterix_nc1://data/types/empDataset.adm`),(`format`=`adm`));
 
-load  table deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
+load  dataset deptDataset using localfs ((`path`=`asterix_nc1://data/types/deptDataset.adm`),(`format`=`adm`));
 


Mime
View raw message