Changeset: 3d71e42c76c8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d71e42c76c8
Modified Files:
sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
Branch: mtest
Log Message:
convert msqldump-mapi-cache.Bug-6777
diffs (truncated from 733 to 300 lines):
diff --git a/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
b/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
--- a/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
+++ b/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
@@ -1,12 +1,8 @@
-import sys
+from MonetDBtesting.sqltest import SQLTestCase
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-with process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as c:
- out, err = c.communicate('''
+with SQLTestCase() as tc:
+ # TODO match on the output
+ tc.execute('''
start transaction;
create table dbgen_version
(
@@ -639,17 +635,9 @@ alter table web_sales add constraint ws_
alter table web_site add constraint web_d1 foreign key (web_close_date_sk)
references date_dim (d_date_sk);
alter table web_site add constraint web_d2 foreign key (web_open_date_sk)
references date_dim (d_date_sk);
commit;
-''')
- sys.stdout.write(out)
- sys.stderr.write(err)
-
-with process.client('sqldump', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE) as c:
- out, err = c.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
-
-with process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as c:
- out, err = c.communicate('''
+ ''', client='mclient').assertSucceeded()
+
tc.sqldump().assertMatchStableOut(fout='msqldump-mapi-cache.Bug-6777.stable.out')
+ tc.execute('''
start transaction;
drop table if exists dbgen_version cascade;
drop table if exists customer_address cascade;
@@ -677,6 +665,688 @@ drop table if exists web_sales cascade;
drop table if exists catalog_sales cascade;
drop table if exists store_sales cascade;
commit;
-''')
- sys.stdout.write(out)
- sys.stderr.write(err)
+ ''').assertSucceeded()
+
+
+#import sys
+#
+#try:
+# from MonetDBtesting import process
+#except ImportError:
+# import process
+#
+#with process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as c:
+# out, err = c.communicate('''
+#start transaction;
+#create table dbgen_version
+#(
+# dv_version varchar(16),
+# dv_create_date date,
+# dv_create_time time,
+# dv_cmdline_args varchar(200)
+#);
+#create table customer_address
+#(
+# ca_address_sk integer not null,
+# ca_address_id char(16) not null,
+# ca_street_number char(10),
+# ca_street_name varchar(60),
+# ca_street_type char(15),
+# ca_suite_number char(10),
+# ca_city varchar(60),
+# ca_county varchar(30),
+# ca_state char(2),
+# ca_zip char(10),
+# ca_country varchar(20),
+# ca_gmt_offset decimal(5,2),
+# ca_location_type char(20),
+# primary key (ca_address_sk)
+#);
+#create table customer_demographics
+#(
+# cd_demo_sk integer not null,
+# cd_gender char(1),
+# cd_marital_status char(1),
+# cd_education_status char(20),
+# cd_purchase_estimate integer,
+# cd_credit_rating char(10),
+# cd_dep_count integer,
+# cd_dep_employed_count integer,
+# cd_dep_college_count integer,
+# primary key (cd_demo_sk)
+#);
+#create table date_dim
+#(
+# d_date_sk integer not null,
+# d_date_id char(16) not null,
+# d_date date,
+# d_month_seq integer,
+# d_week_seq integer,
+# d_quarter_seq integer,
+# d_year integer,
+# d_dow integer,
+# d_moy integer,
+# d_dom integer,
+# d_qoy integer,
+# d_fy_year integer,
+# d_fy_quarter_seq integer,
+# d_fy_week_seq integer,
+# d_day_name char(9),
+# d_quarter_name char(6),
+# d_holiday char(1),
+# d_weekend char(1),
+# d_following_holiday char(1),
+# d_first_dom integer,
+# d_last_dom integer,
+# d_same_day_ly integer,
+# d_same_day_lq integer,
+# d_current_day char(1),
+# d_current_week char(1),
+# d_current_month char(1),
+# d_current_quarter char(1),
+# d_current_year char(1),
+# primary key (d_date_sk)
+#);
+#create table warehouse
+#(
+# w_warehouse_sk integer not null,
+# w_warehouse_id char(16) not null,
+# w_warehouse_name varchar(20),
+# w_warehouse_sq_ft integer,
+# w_street_number char(10),
+# w_street_name varchar(60),
+# w_street_type char(15),
+# w_suite_number char(10),
+# w_city varchar(60),
+# w_county varchar(30),
+# w_state char(2),
+# w_zip char(10),
+# w_country varchar(20),
+# w_gmt_offset decimal(5,2),
+# primary key (w_warehouse_sk)
+#);
+#create table ship_mode
+#(
+# sm_ship_mode_sk integer not null,
+# sm_ship_mode_id char(16) not null,
+# sm_type char(30),
+# sm_code char(10),
+# sm_carrier char(20),
+# sm_contract char(20),
+# primary key (sm_ship_mode_sk)
+#);
+#create table time_dim
+#(
+# t_time_sk integer not null,
+# t_time_id char(16) not null,
+# t_time integer,
+# t_hour integer,
+# t_minute integer,
+# t_second integer,
+# t_am_pm char(2),
+# t_shift char(20),
+# t_sub_shift char(20),
+# t_meal_time char(20),
+# primary key (t_time_sk)
+#);
+#create table reason
+#(
+# r_reason_sk integer not null,
+# r_reason_id char(16) not null,
+# r_reason_desc char(100),
+# primary key (r_reason_sk)
+#);
+#create table income_band
+#(
+# ib_income_band_sk integer not null,
+# ib_lower_bound integer,
+# ib_upper_bound integer,
+# primary key (ib_income_band_sk)
+#);
+#create table item
+#(
+# i_item_sk integer not null,
+# i_item_id char(16) not null,
+# i_rec_start_date date,
+# i_rec_end_date date,
+# i_item_desc varchar(200),
+# i_current_price decimal(7,2),
+# i_wholesale_cost decimal(7,2),
+# i_brand_id integer,
+# i_brand char(50),
+# i_class_id integer,
+# i_class char(50),
+# i_category_id integer,
+# i_category char(50),
+# i_manufact_id integer,
+# i_manufact char(50),
+# i_size char(20),
+# i_formulation char(20),
+# i_color char(20),
+# i_units char(10),
+# i_container char(10),
+# i_manager_id integer,
+# i_product_name char(50),
+# primary key (i_item_sk)
+#);
+#create table store
+#(
+# s_store_sk integer not null,
+# s_store_id char(16) not null,
+# s_rec_start_date date,
+# s_rec_end_date date,
+# s_closed_date_sk integer,
+# s_store_name varchar(50),
+# s_number_employees integer,
+# s_floor_space integer,
+# s_hours char(20),
+# s_manager varchar(40),
+# s_market_id integer,
+# s_geography_class varchar(100),
+# s_market_desc varchar(100),
+# s_market_manager varchar(40),
+# s_division_id integer,
+# s_division_name varchar(50),
+# s_company_id integer,
+# s_company_name varchar(50),
+# s_street_number varchar(10),
+# s_street_name varchar(60),
+# s_street_type char(15),
+# s_suite_number char(10),
+# s_city varchar(60),
+# s_county varchar(30),
+# s_state char(2),
+# s_zip char(10),
+# s_country varchar(20),
+# s_gmt_offset decimal(5,2),
+# s_tax_precentage decimal(5,2),
+# primary key (s_store_sk)
+#);
+#create table call_center
+#(
+# cc_call_center_sk integer not null,
+# cc_call_center_id char(16) not null,
+# cc_rec_start_date date,
+# cc_rec_end_date date,
+# cc_closed_date_sk integer,
+# cc_open_date_sk integer,
+# cc_name varchar(50),
+# cc_class varchar(50),
+# cc_employees integer,
+# cc_sq_ft integer,
+# cc_hours char(20),
+# cc_manager varchar(40),
+# cc_mkt_id integer,
+# cc_mkt_class char(50),
+# cc_mkt_desc varchar(100),
+# cc_market_manager varchar(40),
+# cc_division integer,
+# cc_division_name varchar(50),
+# cc_company integer,
+# cc_company_name char(50),
+# cc_street_number char(10),
+# cc_street_name varchar(60),
+# cc_street_type char(15),
+# cc_suite_number char(10),
+# cc_city varchar(60),
+# cc_county varchar(30),
+# cc_state char(2),
+# cc_zip char(10),
+# cc_country varchar(20),
+# cc_gmt_offset decimal(5,2),
+# cc_tax_percentage decimal(5,2),
+# primary key (cc_call_center_sk)
+#);
+#create table customer
+#(
+# c_customer_sk integer not null,
+# c_customer_id char(16) not null,
+# c_current_cdemo_sk integer,
+# c_current_hdemo_sk integer,
+# c_current_addr_sk integer,
+# c_first_shipto_date_sk integer,
+# c_first_sales_date_sk integer,
+# c_salutation char(10),
+# c_first_name char(20),
+# c_last_name char(30),
+# c_preferred_cust_flag char(1),
+# c_birth_day integer,
+# c_birth_month integer,
+# c_birth_year integer,
+# c_birth_country varchar(20),
+# c_login char(13),
+# c_email_address char(50),
+# c_last_review_date_sk integer,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
