diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-09-04 22:32:02 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-09-04 22:32:02 +0200 |
| commit | 7e65bdba7b1e6f5aa7ac08d5c886b04c53c4da50 (patch) | |
| tree | e9b49bfe9d96ae52a387f8370d74191bcc8cff99 /storage/connect/mysql-test | |
| parent | 703ce16a114c6bc4665f596f7331d1a1f33da94f (diff) | |
| download | mariadb-git-7e65bdba7b1e6f5aa7ac08d5c886b04c53c4da50.tar.gz | |
- Update version number
modified: storage/connect/ha_connect.cc
- Regard columns with binary charset as string (was binary)
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabutil.cpp
- Support length 0 for CHAR and VARCHAR
modified: storage/connect/ha_connect.cc
modified: storage/connect/reldef.cpp
modified: storage/connect/value.cpp
- Add ACCEPT option for void columns in discovery
modified: storage/connect/tabjson.cpp
- Update some tests because of above change
modified: storage/connect/mysql-test/connect/r/json_java_2.result
modified: storage/connect/mysql-test/connect/r/json_java_3.result
modified: storage/connect/mysql-test/connect/r/json_mongo_c.result
modified: storage/connect/mysql-test/connect/r/mongo_c.result
modified: storage/connect/mysql-test/connect/r/mongo_java_2.result
modified: storage/connect/mysql-test/connect/r/mongo_java_3.result
modified: storage/connect/mysql-test/connect/r/odbc_oracle.result
modified: storage/connect/mysql-test/connect/r/updelx.result
modified: storage/connect/mysql-test/connect/t/mongo_test.inc
Diffstat (limited to 'storage/connect/mysql-test')
9 files changed, 287 insertions, 280 deletions
diff --git a/storage/connect/mysql-test/connect/r/json_java_2.result b/storage/connect/mysql-test/connect/r/json_java_2.result index 83272ec00ce..96c58221b24 100644 --- a/storage/connect/mysql-test/connect/r/json_java_2.result +++ b/storage/connect/mysql-test/connect/r/json_java_2.result @@ -1,4 +1,5 @@ SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar'; +set connect_enable_mongo=1; # # Test the MONGO table type # @@ -25,7 +26,6 @@ address_street 1 CHAR 38 38 0 0 address.street address_zipcode 1 CHAR 5 5 0 0 address.zipcode borough 1 CHAR 13 13 0 0 cuisine 1 CHAR 64 64 0 0 -grades 1 CHAR 0 0 0 1 grades_date 1 CHAR 256 256 0 1 grades.0.date grades_grade 1 CHAR 14 14 0 1 grades.0.grade grades_score 5 BIGINT 2 2 0 1 grades.0.score @@ -72,7 +72,6 @@ t1 CREATE TABLE `t1` ( `address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode', `borough` char(13) NOT NULL, `cuisine` char(64) NOT NULL, - `grades` char(1) DEFAULT NULL, `grades_date` varchar(256) DEFAULT NULL `FIELD_FORMAT`='grades.0.date', `grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade', `grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score', @@ -80,12 +79,12 @@ t1 CREATE TABLE `t1` ( `restaurant_id` char(8) NOT NULL ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mongodb://localhost:27017' `TABLE_TYPE`='JSON' `TABNAME`='restaurants' `OPTION_LIST`='Level=1,Driver=Java,Version=2' `DATA_CHARSET`='utf8' `LRECL`=4096 SELECT * FROM t1 LIMIT 5; -_id address_building address_coord address_street address_zipcode borough cuisine grades grades_date grades_grade grades_score name restaurant_id -58ada47de5a51ddfcd5ed51c 1007 -73.856077 Morris Park Ave 10462 Bronx Bakery 2 2014-03-03T00:00:00.000Z A 2 Morris Park Bake Shop 30075445 -58ada47de5a51ddfcd5ed51d 469 -73.961704 Flatbush Avenue 11225 Brooklyn Hamburgers 2 2014-12-30T00:00:00.000Z A 8 Wendy'S 30112340 -58ada47de5a51ddfcd5ed51e 351 -73.98513559999999 West 57 Street 10019 Manhattan Irish 2 2014-09-06T00:00:00.000Z A 2 Dj Reynolds Pub And Restaurant 30191841 -58ada47de5a51ddfcd5ed51f 2780 -73.98241999999999 Stillwell Avenue 11224 Brooklyn American 2 2014-06-10T00:00:00.000Z A 5 Riviera Caterer 40356018 -58ada47de5a51ddfcd5ed520 97-22 -73.8601152 63 Road 11374 Queens Jewish/Kosher 2 2014-11-24T00:00:00.000Z Z 20 Tov Kosher Kitchen 40356068 +_id address_building address_coord address_street address_zipcode borough cuisine grades_date grades_grade grades_score name restaurant_id +58ada47de5a51ddfcd5ed51c 1007 -73.856077 Morris Park Ave 10462 Bronx Bakery 2014-03-03T00:00:00.000Z A 2 Morris Park Bake Shop 30075445 +58ada47de5a51ddfcd5ed51d 469 -73.961704 Flatbush Avenue 11225 Brooklyn Hamburgers 2014-12-30T00:00:00.000Z A 8 Wendy'S 30112340 +58ada47de5a51ddfcd5ed51e 351 -73.98513559999999 West 57 Street 10019 Manhattan Irish 2014-09-06T00:00:00.000Z A 2 Dj Reynolds Pub And Restaurant 30191841 +58ada47de5a51ddfcd5ed51f 2780 -73.98241999999999 Stillwell Avenue 11224 Brooklyn American 2014-06-10T00:00:00.000Z A 5 Riviera Caterer 40356018 +58ada47de5a51ddfcd5ed520 97-22 -73.8601152 63 Road 11374 Queens Jewish/Kosher 2014-11-24T00:00:00.000Z Z 20 Tov Kosher Kitchen 40356068 DROP TABLE t1; # # Dropping a column @@ -259,7 +258,6 @@ t1 CREATE TABLE `t1` ( `address_street` char(38) NOT NULL `FIELD_FORMAT`='address.street', `address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode', `borough` char(13) NOT NULL, - `grades` char(1) DEFAULT NULL, `grades_date` char(24) DEFAULT NULL `FIELD_FORMAT`='grades.0.date', `grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade', `grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score', @@ -384,3 +382,4 @@ planner 167 41.75 postcard 23 5.75 DROP TABLE t1; true +set connect_enable_mongo=0; diff --git a/storage/connect/mysql-test/connect/r/json_java_3.result b/storage/connect/mysql-test/connect/r/json_java_3.result index 563bcef7321..09901452975 100644 --- a/storage/connect/mysql-test/connect/r/json_java_3.result +++ b/storage/connect/mysql-test/connect/r/json_java_3.result @@ -1,4 +1,5 @@ SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar'; +set connect_enable_mongo=1; # # Test the MONGO table type # @@ -25,7 +26,6 @@ address_street 1 CHAR 38 38 0 0 address.street address_zipcode 1 CHAR 5 5 0 0 address.zipcode borough 1 CHAR 13 13 0 0 cuisine 1 CHAR 64 64 0 0 -grades 1 CHAR 0 0 0 1 grades_date 1 CHAR 256 256 0 1 grades.0.date grades_grade 1 CHAR 14 14 0 1 grades.0.grade grades_score 5 BIGINT 2 2 0 1 grades.0.score @@ -72,7 +72,6 @@ t1 CREATE TABLE `t1` ( `address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode', `borough` char(13) NOT NULL, `cuisine` char(64) NOT NULL, - `grades` char(1) DEFAULT NULL, `grades_date` varchar(256) DEFAULT NULL `FIELD_FORMAT`='grades.0.date', `grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade', `grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score', @@ -80,12 +79,12 @@ t1 CREATE TABLE `t1` ( `restaurant_id` char(8) NOT NULL ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mongodb://localhost:27017' `TABLE_TYPE`='JSON' `TABNAME`='restaurants' `OPTION_LIST`='Level=1,Driver=Java,Version=3' `DATA_CHARSET`='utf8' `LRECL`=4096 SELECT * FROM t1 LIMIT 5; -_id address_building address_coord address_street address_zipcode borough cuisine grades grades_date grades_grade grades_score name restaurant_id -58ada47de5a51ddfcd5ed51c 1007 -73.856077 Morris Park Ave 10462 Bronx Bakery 1 1393804800 A 2 Morris Park Bake Shop 30075445 -58ada47de5a51ddfcd5ed51d 469 -73.961704 Flatbush Avenue 11225 Brooklyn Hamburgers 1 1419897600 A 8 Wendy'S 30112340 -58ada47de5a51ddfcd5ed51e 351 -73.98513559999999 West 57 Street 10019 Manhattan Irish 1 1409961600 A 2 Dj Reynolds Pub And Restaurant 30191841 -58ada47de5a51ddfcd5ed51f 2780 -73.98241999999999 Stillwell Avenue 11224 Brooklyn American 1 1402358400 A 5 Riviera Caterer 40356018 -58ada47de5a51ddfcd5ed520 97-22 -73.8601152 63 Road 11374 Queens Jewish/Kosher 1 1416787200 Z 20 Tov Kosher Kitchen 40356068 +_id address_building address_coord address_street address_zipcode borough cuisine grades_date grades_grade grades_score name restaurant_id +58ada47de5a51ddfcd5ed51c 1007 -73.856077 Morris Park Ave 10462 Bronx Bakery 1393804800 A 2 Morris Park Bake Shop 30075445 +58ada47de5a51ddfcd5ed51d 469 -73.961704 Flatbush Avenue 11225 Brooklyn Hamburgers 1419897600 A 8 Wendy'S 30112340 +58ada47de5a51ddfcd5ed51e 351 -73.98513559999999 West 57 Street 10019 Manhattan Irish 1409961600 A 2 Dj Reynolds Pub And Restaurant 30191841 +58ada47de5a51ddfcd5ed51f 2780 -73.98241999999999 Stillwell Avenue 11224 Brooklyn American 1402358400 A 5 Riviera Caterer 40356018 +58ada47de5a51ddfcd5ed520 97-22 -73.8601152 63 Road 11374 Queens Jewish/Kosher 1416787200 Z 20 Tov Kosher Kitchen 40356068 DROP TABLE t1; # # Dropping a column @@ -259,7 +258,6 @@ t1 CREATE TABLE `t1` ( `address_street` char(38) NOT NULL `FIELD_FORMAT`='address.street', `address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode', `borough` char(13) NOT NULL, - `grades` char(1) DEFAULT NULL, `grades_date` bigint(13) DEFAULT NULL `FIELD_FORMAT`='grades.0.date', `grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade', `grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score', @@ -384,3 +382,4 @@ planner 167 41.75 postcard 23 5.75 DROP TABLE t1; true +set connect_enable_mongo=0; diff --git a/storage/connect/mysql-test/connect/r/json_mongo_c.result b/storage/connect/mysql-test/connect/r/json_mongo_c.result index d3363f39eab..afcad8d2ea2 100644 --- a/storage/connect/mysql-test/connect/r/json_mongo_c.result +++ b/storage/connect/mysql-test/connect/r/json_mongo_c.result @@ -1,3 +1,4 @@ +set connect_enable_mongo=1; # # Test the MONGO table type # @@ -24,7 +25,6 @@ address_street 1 CHAR 38 38 0 0 address.street address_zipcode 1 CHAR 5 5 0 0 address.zipcode borough 1 CHAR 13 13 0 0 cuisine 1 CHAR 64 64 0 0 -grades 1 CHAR 0 0 0 1 grades_date 1 CHAR 256 256 0 1 grades.0.date grades_grade 1 CHAR 14 14 0 1 grades.0.grade grades_score 5 BIGINT 2 2 0 1 grades.0.score @@ -71,7 +71,6 @@ t1 CREATE TABLE `t1` ( `address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode', `borough` char(13) NOT NULL, `cuisine` char(64) NOT NULL, - `grades` char(1) DEFAULT NULL, `grades_date` varchar(256) DEFAULT NULL `FIELD_FORMAT`='grades.0.date', `grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade', `grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score', @@ -79,12 +78,12 @@ t1 CREATE TABLE `t1` ( `restaurant_id` char(8) NOT NULL ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mongodb://localhost:27017' `TABLE_TYPE`='JSON' `TABNAME`='restaurants' `OPTION_LIST`='Level=1,Driver=C,Version=0' `DATA_CHARSET`='utf8' `LRECL`=1024 SELECT * FROM t1 LIMIT 5; -_id address_building address_coord address_street address_zipcode borough cuisine grades grades_date grades_grade grades_score name restaurant_id -58ada47de5a51ddfcd5ed51c 1007 -73.856076999999999089 Morris Park Ave 10462 Bronx Bakery 1 1393804800 A 2 Morris Park Bake Shop 30075445 -58ada47de5a51ddfcd5ed51d 469 -73.96170399999999745 Flatbush Avenue 11225 Brooklyn Hamburgers 1 1419897600 A 8 Wendy'S 30112340 -58ada47de5a51ddfcd5ed51e 351 -73.985135599999992451 West 57 Street 10019 Manhattan Irish 1 1409961600 A 2 Dj Reynolds Pub And Restaurant 30191841 -58ada47de5a51ddfcd5ed51f 2780 -73.982419999999990523 Stillwell Avenue 11224 Brooklyn American 1 1402358400 A 5 Riviera Caterer 40356018 -58ada47de5a51ddfcd5ed520 97-22 -73.860115199999995639 63 Road 11374 Queens Jewish/Kosher 1 1416787200 Z 20 Tov Kosher Kitchen 40356068 +_id address_building address_coord address_street address_zipcode borough cuisine grades_date grades_grade grades_score name restaurant_id +58ada47de5a51ddfcd5ed51c 1007 -73.856076999999999089 Morris Park Ave 10462 Bronx Bakery 1393804800 A 2 Morris Park Bake Shop 30075445 +58ada47de5a51ddfcd5ed51d 469 -73.96170399999999745 Flatbush Avenue 11225 Brooklyn Hamburgers 1419897600 A 8 Wendy'S 30112340 +58ada47de5a51ddfcd5ed51e 351 -73.985135599999992451 West 57 Street 10019 Manhattan Irish 1409961600 A 2 Dj Reynolds Pub And Restaurant 30191841 +58ada47de5a51ddfcd5ed51f 2780 -73.982419999999990523 Stillwell Avenue 11224 Brooklyn American 1402358400 A 5 Riviera Caterer 40356018 +58ada47de5a51ddfcd5ed520 97-22 -73.860115199999995639 63 Road 11374 Queens Jewish/Kosher 1416787200 Z 20 Tov Kosher Kitchen 40356068 DROP TABLE t1; # # Dropping a column @@ -258,7 +257,6 @@ t1 CREATE TABLE `t1` ( `address_street` char(38) NOT NULL `FIELD_FORMAT`='address.street', `address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode', `borough` char(13) NOT NULL, - `grades` char(1) DEFAULT NULL, `grades_date` bigint(13) DEFAULT NULL `FIELD_FORMAT`='grades.0.date', `grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade', `grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score', @@ -383,3 +381,4 @@ planner 167 41.75 postcard 23 5.75 DROP TABLE t1; true +set connect_enable_mongo=0; diff --git a/storage/connect/mysql-test/connect/r/mongo_c.result b/storage/connect/mysql-test/connect/r/mongo_c.result index da0832994c2..f90f3a94b44 100644 --- a/storage/connect/mysql-test/connect/r/mongo_c.result +++ b/storage/connect/mysql-test/connect/r/mongo_c.result @@ -1,3 +1,4 @@ +set connect_enable_mongo=1; # # Test the MONGO table type # @@ -376,3 +377,4 @@ planner 167 41.750000 postcard 23 5.750000 DROP TABLE t1; true +set connect_enable_mongo=0; diff --git a/storage/connect/mysql-test/connect/r/mongo_java_2.result b/storage/connect/mysql-test/connect/r/mongo_java_2.result index b1e9ea74f72..02b8ae09d34 100644 --- a/storage/connect/mysql-test/connect/r/mongo_java_2.result +++ b/storage/connect/mysql-test/connect/r/mongo_java_2.result @@ -1,4 +1,5 @@ SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar'; +set connect_enable_mongo=1; # # Test the MONGO table type # @@ -377,3 +378,4 @@ planner 167 41.75 postcard 23 5.75 DROP TABLE t1; true +set connect_enable_mongo=0; diff --git a/storage/connect/mysql-test/connect/r/mongo_java_3.result b/storage/connect/mysql-test/connect/r/mongo_java_3.result index e2fe584620f..c4387bfa5b1 100644 --- a/storage/connect/mysql-test/connect/r/mongo_java_3.result +++ b/storage/connect/mysql-test/connect/r/mongo_java_3.result @@ -1,4 +1,5 @@ SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar'; +set connect_enable_mongo=1; # # Test the MONGO table type # @@ -377,3 +378,4 @@ planner 167 41.75 postcard 23 5.75 DROP TABLE t1; true +set connect_enable_mongo=0; diff --git a/storage/connect/mysql-test/connect/r/odbc_oracle.result b/storage/connect/mysql-test/connect/r/odbc_oracle.result index db7f78f67cd..8dc7dc07bb1 100644 --- a/storage/connect/mysql-test/connect/r/odbc_oracle.result +++ b/storage/connect/mysql-test/connect/r/odbc_oracle.result @@ -72,11 +72,11 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' CATFUNC=Columns; SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name; Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks -NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL -NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL -NULL MTR T2 A 12 VARCHAR2 64 64 NULL NULL 1 NULL -NULL MTR V1 A 3 DECIMAL 38 40 0 10 1 NULL -NULL MTR V1 B 6 NUMBER 38 40 NULL NULL 1 NULL + MTR T1 A 3 DECIMAL 38 40 0 10 1 + MTR T1 B 6 NUMBER 38 40 NULL NULL 1 + MTR T2 A 12 VARCHAR2 64 64 NULL NULL 1 + MTR V1 A 3 DECIMAL 38 40 0 10 1 + MTR V1 B 6 NUMBER 38 40 NULL NULL 1 DROP TABLE t1; # All columns in all schemas (limited with WHERE) CREATE TABLE t1 ENGINE=CONNECT @@ -84,18 +84,18 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.%'; SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name; Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks -NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL -NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL -NULL MTR T2 A 12 VARCHAR2 64 64 NULL NULL 1 NULL -NULL MTR V1 A 3 DECIMAL 38 40 0 10 1 NULL -NULL MTR V1 B 6 NUMBER 38 40 NULL NULL 1 NULL + MTR T1 A 3 DECIMAL 38 40 0 10 1 + MTR T1 B 6 NUMBER 38 40 NULL NULL 1 + MTR T2 A 12 VARCHAR2 64 64 NULL NULL 1 + MTR V1 A 3 DECIMAL 38 40 0 10 1 + MTR V1 B 6 NUMBER 38 40 NULL NULL 1 DROP TABLE t1; # All tables "T1" in all schemas (limited with WHERE) CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.T1'; SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name; Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks -NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL -NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL + MTR T1 A 3 DECIMAL 38 40 0 10 1 + MTR T1 B 6 NUMBER 38 40 NULL NULL 1 DROP TABLE t1; # Table "T1" in the schema "MTR" CREATE TABLE t1 ENGINE=CONNECT @@ -103,8 +103,8 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='MTR.T1'; SELECT * FROM t1 ORDER BY Table_Schema, Table_Name; Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks -NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL -NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL + MTR T1 A 3 DECIMAL 38 40 0 10 1 + MTR T1 B 6 NUMBER 38 40 NULL NULL 1 DROP TABLE t1; # All tables "T1" in all schemas (filtered with WHERE) CREATE TABLE t1 ENGINE=CONNECT @@ -112,8 +112,8 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.T1'; SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name; Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks -NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL -NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL + MTR T1 A 3 DECIMAL 38 40 0 10 1 + MTR T1 B 6 NUMBER 38 40 NULL NULL 1 DROP TABLE t1; # # Checking tables diff --git a/storage/connect/mysql-test/connect/r/updelx.result b/storage/connect/mysql-test/connect/r/updelx.result index 4b8441a6cde..2aed1e06928 100644 --- a/storage/connect/mysql-test/connect/r/updelx.result +++ b/storage/connect/mysql-test/connect/r/updelx.result @@ -986,108 +986,108 @@ DELETE FROM t1; INSERT INTO t1 VALUES(4, 'four'),(7,'seven'),(10,'ten'),(40,'forty'),(60,'sixty'),(81,'eighty one'),(72,'seventy two'),(11,'eleven'),(1,'one'),(35,'thirty five'),(8,'eight'); SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 sixty -81 eighty one -72 seventy two -11 eleven -1 one -35 thirty five -8 eight +4 four +7 seven +10 ten +40 forty +60 sixty +81 eighty one +72 seventy two +11 eleven +1 one +35 thirty five +8 eight UPDATE t1 SET msg = 'bof' WHERE id = 35; SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 sixty -81 eighty one -72 seventy two -11 eleven -1 one -35 bof -8 eight +4 four +7 seven +10 ten +40 forty +60 sixty +81 eighty one +72 seventy two +11 eleven +1 one +35 bof +8 eight UPDATE t1 SET msg = 'big' WHERE id > 50; SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 big -81 big -72 big -11 eleven -1 one -35 bof -8 eight +4 four +7 seven +10 ten +40 forty +60 big +81 big +72 big +11 eleven +1 one +35 bof +8 eight UPDATE t1 SET msg = 'updated' WHERE id IN (8,35,60,72); SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 updated -81 big -72 updated -11 eleven -1 one -35 updated -8 updated +4 four +7 seven +10 ten +40 forty +60 updated +81 big +72 updated +11 eleven +1 one +35 updated +8 updated UPDATE t1 SET msg = 'twin' WHERE id IN (81,10); SELECT * FROM t1; id msg -4 four -7 seven -10 twin -40 forty -60 updated -81 twin -72 updated -11 eleven -1 one -35 updated -8 updated +4 four +7 seven +10 twin +40 forty +60 updated +81 twin +72 updated +11 eleven +1 one +35 updated +8 updated UPDATE t1 SET msg = 'sixty' WHERE id = 60; SELECT * FROM t1 WHERE id = 60; id msg -60 sixty +60 sixty DELETE FROM t1 WHERE id = 4; SELECT * FROM t1; id msg -7 seven -10 twin -40 forty -60 sixty -81 twin -72 updated -11 eleven -1 one -35 updated -8 updated +7 seven +10 twin +40 forty +60 sixty +81 twin +72 updated +11 eleven +1 one +35 updated +8 updated DELETE FROM t1 WHERE id IN (40,11,35); SELECT * FROM t1; id msg -7 seven -10 twin -60 sixty -81 twin -72 updated -1 one -8 updated +7 seven +10 twin +60 sixty +81 twin +72 updated +1 one +8 updated DELETE FROM t1 WHERE id IN (4,60,1); SELECT msg FROM t1; msg -seven -twin -twin -updated -updated +seven +twin +twin +updated +updated DELETE FROM t1 WHERE id IN (81,72); SELECT id FROM t1; id @@ -1097,7 +1097,7 @@ id DELETE FROM t1 WHERE id IN (7,10); SELECT * FROM t1; id msg -8 updated +8 updated DELETE FROM t1 WHERE id = 8; SELECT * FROM t1; id msg @@ -1106,108 +1106,108 @@ DELETE FROM t1; INSERT INTO t1 VALUES(4, 'four'),(7,'seven'),(10,'ten'),(40,'forty'),(60,'sixty'),(81,'eighty one'),(72,'seventy two'),(11,'eleven'),(1,'one'),(35,'thirty five'),(8,'eight'); SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 sixty -81 eighty one -72 seventy two -11 eleven -1 one -35 thirty five -8 eight +4 four +7 seven +10 ten +40 forty +60 sixty +81 eighty one +72 seventy two +11 eleven +1 one +35 thirty five +8 eight UPDATE t1 SET msg = 'bof' WHERE id = 35; SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 sixty -81 eighty one -72 seventy two -11 eleven -1 one -35 bof -8 eight +4 four +7 seven +10 ten +40 forty +60 sixty +81 eighty one +72 seventy two +11 eleven +1 one +35 bof +8 eight UPDATE t1 SET msg = 'big' WHERE id > 50; SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 big -81 big -72 big -11 eleven -1 one -35 bof -8 eight +4 four +7 seven +10 ten +40 forty +60 big +81 big +72 big +11 eleven +1 one +35 bof +8 eight UPDATE t1 SET msg = 'updated' WHERE id IN (8,35,60,72); SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 updated -81 big -72 updated -11 eleven -1 one -35 updated -8 updated +4 four +7 seven +10 ten +40 forty +60 updated +81 big +72 updated +11 eleven +1 one +35 updated +8 updated UPDATE t1 SET msg = 'twin' WHERE id IN (81,10); SELECT * FROM t1; id msg -4 four -7 seven -10 twin -40 forty -60 updated -81 twin -72 updated -11 eleven -1 one -35 updated -8 updated +4 four +7 seven +10 twin +40 forty +60 updated +81 twin +72 updated +11 eleven +1 one +35 updated +8 updated UPDATE t1 SET msg = 'sixty' WHERE id = 60; SELECT * FROM t1 WHERE id = 60; id msg -60 sixty +60 sixty DELETE FROM t1 WHERE id = 4; SELECT * FROM t1; id msg -7 seven -10 twin -40 forty -60 sixty -81 twin -72 updated -11 eleven -1 one -35 updated -8 updated +7 seven +10 twin +40 forty +60 sixty +81 twin +72 updated +11 eleven +1 one +35 updated +8 updated DELETE FROM t1 WHERE id IN (40,11,35); SELECT * FROM t1; id msg -7 seven -10 twin -60 sixty -81 twin -72 updated -1 one -8 updated +7 seven +10 twin +60 sixty +81 twin +72 updated +1 one +8 updated DELETE FROM t1 WHERE id IN (4,60,1); SELECT msg FROM t1; msg -seven -twin -twin -updated -updated +seven +twin +twin +updated +updated DELETE FROM t1 WHERE id IN (81,72); SELECT id FROM t1; id @@ -1217,7 +1217,7 @@ id DELETE FROM t1 WHERE id IN (7,10); SELECT * FROM t1; id msg -8 updated +8 updated DELETE FROM t1 WHERE id = 8; SELECT * FROM t1; id msg @@ -1226,108 +1226,108 @@ DELETE FROM t1; INSERT INTO t1 VALUES(4, 'four'),(7,'seven'),(10,'ten'),(40,'forty'),(60,'sixty'),(81,'eighty one'),(72,'seventy two'),(11,'eleven'),(1,'one'),(35,'thirty five'),(8,'eight'); SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 sixty -81 eighty one -72 seventy two -11 eleven -1 one -35 thirty five -8 eight +4 four +7 seven +10 ten +40 forty +60 sixty +81 eighty one +72 seventy two +11 eleven +1 one +35 thirty five +8 eight UPDATE t1 SET msg = 'bof' WHERE id = 35; SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 sixty -81 eighty one -72 seventy two -11 eleven -1 one -35 bof -8 eight +4 four +7 seven +10 ten +40 forty +60 sixty +81 eighty one +72 seventy two +11 eleven +1 one +35 bof +8 eight UPDATE t1 SET msg = 'big' WHERE id > 50; SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 big -81 big -72 big -11 eleven -1 one -35 bof -8 eight +4 four +7 seven +10 ten +40 forty +60 big +81 big +72 big +11 eleven +1 one +35 bof +8 eight UPDATE t1 SET msg = 'updated' WHERE id IN (8,35,60,72); SELECT * FROM t1; id msg -4 four -7 seven -10 ten -40 forty -60 updated -81 big -72 updated -11 eleven -1 one -35 updated -8 updated +4 four +7 seven +10 ten +40 forty +60 updated +81 big +72 updated +11 eleven +1 one +35 updated +8 updated UPDATE t1 SET msg = 'twin' WHERE id IN (81,10); SELECT * FROM t1; id msg -4 four -7 seven -10 twin -40 forty -60 updated -81 twin -72 updated -11 eleven -1 one -35 updated -8 updated +4 four +7 seven +10 twin +40 forty +60 updated +81 twin +72 updated +11 eleven +1 one +35 updated +8 updated UPDATE t1 SET msg = 'sixty' WHERE id = 60; SELECT * FROM t1 WHERE id = 60; id msg -60 sixty +60 sixty DELETE FROM t1 WHERE id = 4; SELECT * FROM t1; id msg -7 seven -10 twin -40 forty -60 sixty -81 twin -72 updated -11 eleven -1 one -35 updated -8 updated +7 seven +10 twin +40 forty +60 sixty +81 twin +72 updated +11 eleven +1 one +35 updated +8 updated DELETE FROM t1 WHERE id IN (40,11,35); SELECT * FROM t1; id msg -7 seven -10 twin -60 sixty -81 twin -72 updated -1 one -8 updated +7 seven +10 twin +60 sixty +81 twin +72 updated +1 one +8 updated DELETE FROM t1 WHERE id IN (4,60,1); SELECT msg FROM t1; msg -seven -twin -twin -updated -updated +seven +twin +twin +updated +updated DELETE FROM t1 WHERE id IN (81,72); SELECT id FROM t1; id @@ -1337,7 +1337,7 @@ id DELETE FROM t1 WHERE id IN (7,10); SELECT * FROM t1; id msg -8 updated +8 updated DELETE FROM t1 WHERE id = 8; SELECT * FROM t1; id msg diff --git a/storage/connect/mysql-test/connect/t/mongo_test.inc b/storage/connect/mysql-test/connect/t/mongo_test.inc index c223e70f719..c728b85fd2f 100644 --- a/storage/connect/mysql-test/connect/t/mongo_test.inc +++ b/storage/connect/mysql-test/connect/t/mongo_test.inc @@ -1,3 +1,5 @@ +set connect_enable_mongo=1; + --echo # --echo # Test the MONGO table type --echo # @@ -201,3 +203,5 @@ OPTION_LIST='Driver=$DRV,Version=$VERS,Pipeline=YES' $CONN; SELECT * FROM t1; DROP TABLE t1; --exec $MONGO --eval "db.testcoll.drop()" --quiet + +set connect_enable_mongo=0; |