Changeset: 9294a9c93d28 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/9294a9c93d28 Modified Files: sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.stable.out sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.stable.err sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.stable.out sql/test/BugTracker-2024/Tests/7574-startswith-bug.test sql/test/BugTracker-2024/Tests/7602-copy-into-multiple-files.test sql/test/BugTracker-2024/Tests/7603-copy-into-3files-crash.test sql/test/Dump/Tests/dump-again.stable.out sql/test/Dump/Tests/dump.stable.out sql/test/Dump/Tests/reload-again.stable.out sql/test/Dump/Tests/reload.stable.out sql/test/UserDump/Tests/dump_with_test.stable.out sql/test/analytics/Tests/analytics20.stable.out sql/test/bincopy/Tests/bincopy_support.py sql/test/file_loader/Tests/file_loader_field_separator.test.in sql/test/miscellaneous/Tests/blobs.stable.out sql/test/miscellaneous/Tests/deallocate.stable.err sql/test/miscellaneous/Tests/deallocate.stable.out sql/test/miscellaneous/Tests/groupby_prepare.stable.err sql/test/miscellaneous/Tests/groupby_prepare.stable.out sql/test/miscellaneous/Tests/select_groupby.stable.err sql/test/miscellaneous/Tests/select_groupby.stable.out sql/test/prepare/Tests/bind_with_cast.SF-1720934.stable.out sql/test/prepare/Tests/crash_with_prepare_statement.Bug-2549.stable.out sql/test/prepare/Tests/decimal_needs_truncation.SF-2605686.stable.out sql/test/prepare/Tests/decimal_prepare.SF-1655818.stable.out sql/test/prepare/Tests/fixed_limit_for_prepare.Bug-3208.stable.out sql/test/prepare/Tests/insert-prepare.Bug-7230.stable.out sql/test/prepare/Tests/large_prepare.SF-1363729.stable.out sql/test/prepare/Tests/large_prepare_2.SF-1363729.stable.out sql/test/prepare/Tests/limit_in_prepare.Bug-2552.stable.out sql/test/prepare/Tests/prepare-complex.stable.out sql/test/prepare/Tests/prepare-insert-into.stable.out sql/test/prepare/Tests/prepare-mergetable.stable.out sql/test/prepare/Tests/prepare-smallint.Bug-3297.stable.out sql/test/prepare/Tests/prepare-smallint.Bug-3297.stable.out.int128 sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err sql/test/prepare/Tests/prepare-types.Bug-6724.stable.out sql/test/prepare/Tests/prepare-utf8.Bug-3930.stable.out sql/test/prepare/Tests/prepare-view.stable.out sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out sql/test/prepare/Tests/prepare_commit_execute.SF-2606020.stable.out sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.err sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.out sql/test/prepare/Tests/prepare_decimal_float.SF-1675795.stable.out sql/test/prepare/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.out sql/test/prepare/Tests/prepare_on_boolean_bug.Bug-2581.stable.out sql/test/prepare/Tests/prepare_statements_crash_server.Bug-2599.stable.out sql/test/prepare/Tests/prepare_statements_crash_server.Bug-2599.stable.out.int128 sql/test/prepare/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out sql/test/prepare/Tests/prepare_unop_crash.Bug-3653.stable.out sql/test/prepare/Tests/prepared-merge-statement.Bug-6706.stable.err sql/test/prepare/Tests/prepared-merge-statement.Bug-6706.stable.out sql/test/prepare/Tests/prepared-select-with-error-causes-hang.Bug-6761.stable.out sql/test/prepare/Tests/prepared-statement-with-udf.Bug-6650.stable.out sql/test/prepare/Tests/rename_exps.Bug-3974.stable.out sql/test/prepare/Tests/round-or-truncate.Bug-6193.stable.out sql/test/prepare/Tests/sample.15.stable.err sql/test/prepare/Tests/sample.15.stable.out sql/test/prepare/Tests/sqlancer_prepare.stable.err sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128 sql/test/prepare/Tests/sqlancer_prepare.stable.out sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128 sql/test/prepare/Tests/subquery_prepare.stable.err sql/test/prepare/Tests/subquery_prepare.stable.out testing/Mtest.py.in testing/sqltest.py Branch: Aug2024 Log Message:
Fix up all stable output that is checked using sqltest. Also, when Mtest.py --approve is used, the assertMatchStable* methods now produce .newtest files in the test target directories (just like already happened for .test and .test.in files). diffs (truncated from 4606 to 300 lines): diff --git a/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out b/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out --- a/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out +++ b/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out @@ -1,33 +1,3 @@ -stdout of test 'mclient-lsql-D` in directory 'sql/test/BugTracker-2009` itself: - - -# 21:51:00 > -# 21:51:00 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=38418 --set xrpc_port=47399 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 21:51:00 > - -# MonetDB server v5.12.0, based on kernel v1.30.0 -# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:38418/ -# MonetDB/SQL module v2.30.1 loaded - -#function user.main():void; -# clients.quit(); -#end main; - - -# 21:51:00 > -# 21:51:00 > ./mclient-lsql-D.SQL.sh mclient-lsql-D -# 21:51:00 > - - -# 21:51:00 > -# 21:51:00 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38418 -D < /dev/null -# 21:51:00 > - START TRANSACTION; SET SCHEMA "sys"; CREATE TABLE "sys"."table_a" ( @@ -58,8 +28,3 @@ ALTER TABLE "sys"."table_c" ADD CONSTRAI ALTER TABLE "sys"."table_c" ADD CONSTRAINT "fk_table_c_table_d_id" FOREIGN KEY ("table_d_id") REFERENCES "sys"."table_b" ("table_b_id"); ALTER TABLE "sys"."table_d" ADD CONSTRAINT "fk_table_d_table_a_id" FOREIGN KEY ("table_a_id") REFERENCES "sys"."table_a" ("table_a_id"); COMMIT; - -# 21:51:00 > -# 21:51:00 > Done. -# 21:51:00 > - diff --git a/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.stable.out b/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.stable.out --- a/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.stable.out +++ b/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.stable.out @@ -1,523 +1,3 @@ -stdout of test 'msqldump-mapi-cache.Bug-6777` in directory 'sql/test/BugTracker-2019` itself: - - -# 10:39:12 > -# 10:39:12 > "/usr/bin/python3" "msqldump-mapi-cache.Bug-6777.py" "msqldump-mapi-cache.Bug-6777" -# 10:39:12 > - -#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, -#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, -#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), -#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, -#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, -#create table web_site -#( -# web_site_sk integer not null, -# web_site_id char(16) not null, -# web_rec_start_date date, -# web_rec_end_date date, -# web_name varchar(50), -# web_open_date_sk integer, -# web_close_date_sk integer, -# web_class varchar(50), -# web_manager varchar(40), -# web_mkt_id integer, -# web_mkt_class varchar(50), -# web_mkt_desc varchar(100), -# web_market_manager varchar(40), -# web_company_id integer, -# web_company_name char(50), -# web_street_number char(10), -# web_street_name varchar(60), -# web_street_type char(15), -#create table store_returns -#( -# sr_returned_date_sk integer, -# sr_return_time_sk integer, -# sr_item_sk integer not null, -# sr_customer_sk integer, -# sr_cdemo_sk integer, -# sr_hdemo_sk integer, -# sr_addr_sk integer, -# sr_store_sk integer, -# sr_reason_sk integer, -# sr_ticket_number integer not null, -# sr_return_quantity integer, -# sr_return_amt decimal(7,2), -# sr_return_tax decimal(7,2), -# sr_return_amt_inc_tax decimal(7,2), -# sr_fee decimal(7,2), -# sr_return_ship_cost decimal(7,2), -# sr_refunded_cash decimal(7,2), _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
