You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2017/08/22 10:15:01 UTC

[06/32] asterixdb git commit: [ASTERIXDB-2050][SQL] Enforce a Semicolon After Each SQL++ Statement

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
index 52b0a89..5aaa57d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
@@ -36,7 +36,7 @@ create type tpcds.customer_address_type as closed {
     ca_country:                 string?,
     ca_gmt_offset:              double?,
     ca_location_type:           string?
-}
+};
 
 create type tpcds.customer_type as closed {
     c_customer_sk:             bigint,
@@ -57,7 +57,7 @@ create type tpcds.customer_type as closed {
     c_login:                   string?,
     c_email_address:           string?,
     c_last_review_date:        string?
-}
+};
 
 create type tpcds.store_sales_type as closed {
     ss_sold_date_sk:           bigint?,
@@ -83,7 +83,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as closed {
     d_date_sk:                 bigint,
@@ -114,7 +114,7 @@ create type tpcds.date_dim_type as closed {
     d_current_month:           string?,
     d_current_quarter:         string?,
     d_current_year:            string?
-}
+};
 
 create type tpcds.item_type as closed {
     i_item_sk:                 bigint,
@@ -139,7 +139,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset customer (customer_type)
 primary key c_customer_sk;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpcds.store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
index 6ee8559..2e1364d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
@@ -36,7 +36,7 @@ create type customer_address_type as closed {
     ca_country:                 string?,
     ca_gmt_offset:              double?,
     ca_location_type:           string?
-}
+};
 
 create type customer_type as closed {
     c_customer_sk:             bigint,
@@ -57,7 +57,7 @@ create type customer_type as closed {
     c_login:                   string?,
     c_email_address:           string?,
     c_last_review_date:        string?
-}
+};
 
 create type store_sales_type as closed {
     ss_sold_date_sk:           bigint?,
@@ -83,7 +83,7 @@ create type store_sales_type as closed {
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 create type catalog_sales_type as closed {
     cs_sold_date_sk:           bigint?,
@@ -120,7 +120,7 @@ create type catalog_sales_type as closed {
     cs_net_paid_inc_ship:      double?,
     cs_net_paid_inc_ship_tax:  double?,
     cs_net_profit:             double?
-}
+};
 
 create type catalog_returns_type as closed {
     cr_returned_date_sk:       bigint?,
@@ -150,7 +150,7 @@ create type catalog_returns_type as closed {
     cr_reversed_charge:        double?,
     cr_store_credit:           double?,
     cr_net_loss:               double?
-}
+};
 
 create type tpcds.date_dim_type as closed {
     d_date_sk:                 bigint,
@@ -181,7 +181,7 @@ create type tpcds.date_dim_type as closed {
     d_current_month:           string?,
     d_current_quarter:         string?,
     d_current_year:            string?
-}
+};
 
 create type item_type as closed {
     i_item_sk:                 bigint,
@@ -206,7 +206,7 @@ create type item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create type web_sales_type as closed {
     ws_sold_date_sk:           bigint?,
@@ -243,7 +243,7 @@ create type web_sales_type as closed {
     ws_net_paid_inc_ship:      double?,
     ws_net_paid_inc_ship_tax:  double?,
     ws_net_profit:             double?
-}
+};
 
 create dataset customer (customer_type)
 primary key c_customer_sk;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp
index 04b10cc..41a51b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp
@@ -57,7 +57,7 @@ create type tpcds.catalog_sales_type as closed {
     cs_net_paid_inc_ship:      double?,
     cs_net_paid_inc_ship_tax:  double?,
     cs_net_profit:             double?
-}
+};
 
 create type tpcds.catalog_returns_type as closed {
     cr_returned_date_sk:       bigint?,
@@ -87,7 +87,7 @@ create type tpcds.catalog_returns_type as closed {
     cr_reversed_charge:        double?,
     cr_store_credit:           double?,
     cr_net_loss:               double?
-}
+};
 
 create type tpcds.item_type as closed {
     i_item_sk:                 bigint,
@@ -112,7 +112,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset catalog_sales (catalog_sales_type)
 primary key cs_item_sk, cs_order_number;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp
index 63808f7..8416f6b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp
@@ -51,7 +51,7 @@ create type tpcds.date_dim_type as closed {
     d_current_month:           string?,
     d_current_quarter:         string?,
     d_current_year:            string?
-}
+};
 
 create type tpcds.item_type as closed {
     i_item_sk:                 bigint,
@@ -76,7 +76,7 @@ create type tpcds.item_type as closed {
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset item (item_type)
 primary key i_item_sk;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index dce9f5e..4aff790 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
index e42ce21..f47341a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
@@ -19,7 +19,7 @@
 
 use tpch;
 
-set hash_merge "true"
+set hash_merge "true";
 
 select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':COLL_SUM((
         select element i.l.l_quantity

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp
index 921898b..9754354 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp
index b906c60..e42600f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp
index 327f1cd..1f11933 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp
@@ -47,7 +47,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@ create type tpch.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@ create type tpch.PartSuppType as
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create external  collection LineItem(LineItemType) using `localfs`((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp
index bd0e8f5..88b5d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp
@@ -40,7 +40,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  collection Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp
index bd0e8f5..88b5d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp
@@ -40,7 +40,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  collection Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp
index c20e577..603015c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp
@@ -40,7 +40,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  collection Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp
index d50dd81..95afadd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp
index 3cbe494..9ee2e7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp
@@ -28,7 +28,7 @@ create type tpch.RegionType as
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Regions_group_no_agg(RegionType) primary key r_regionkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp
index 089efc3..ac5b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp
@@ -40,7 +40,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
index 089efc3..ac5b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
@@ -40,7 +40,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@ create type tpch.NationType as
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;