Skip to content

Commit 2b25447

Browse files
BuggynoursBuggynours
committed
Merge branch 'ob-10.1' into 10.1
2 parents 92c8864 + 0f4b540 commit 2b25447

15 files changed

+311
-300
lines changed

‎storage/connect/ha_connect.cc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@
171171
#define JSONMAX 10 // JSON Default max grp size
172172

173173
extern "C" {
174-
char version[]= "Version 1.06.0003 August 28, 2017";
174+
char version[]= "Version 1.06.0004 September 03, 2017";
175175
#if defined(__WIN__)
176-
char compver[]= "Version 1.06.0003 " __DATE__ " " __TIME__;
176+
char compver[]= "Version 1.06.0004 " __DATE__ " " __TIME__;
177177
char slash= '\\';
178178
#else // !__WIN__
179179
char slash= '/';
@@ -1449,7 +1449,7 @@ PFOS ha_connect::GetFieldOptionStruct(Field *fdp)
14491449
void *ha_connect::GetColumnOption(PGLOBAL g, void *field, PCOLINFO pcf)
14501450
{
14511451
const char *cp;
1452-
char *chset, v;
1452+
char *chset, v = 0;
14531453
ha_field_option_struct *fop;
14541454
Field* fp;
14551455
Field* *fldp;
@@ -1502,7 +1502,6 @@ void *ha_connect::GetColumnOption(PGLOBAL g, void *field, PCOLINFO pcf)
15021502
} // endif fop
15031503

15041504
chset = (char *)fp->charset()->name;
1505-
v = (!strcmp(chset, "binary")) ? 'B' : 0;
15061505

15071506
switch (fp->type()) {
15081507
case MYSQL_TYPE_BLOB:
@@ -4343,7 +4342,7 @@ bool ha_connect::check_privileges(THD *thd, PTOS options, char *dbn, bool quick)
43434342
} else
43444343
return false;
43454344

4346-
/* Fall through to check FILE_ACL */
4345+
/* Fall through to check FILE_ACL */
43474346
case TAB_ODBC:
43484347
case TAB_JDBC:
43494348
case TAB_MYSQL:
@@ -5184,7 +5183,8 @@ static bool add_field(String *sql, const char *field_name, int typ, int len,
51845183
error|= sql->append("` ");
51855184
error|= sql->append(type);
51865185

5187-
if (len && typ != TYPE_DATE && (typ != TYPE_DOUBLE || dec >= 0)) {
5186+
if (typ == TYPE_STRING ||
5187+
(len && typ != TYPE_DATE && (typ != TYPE_DOUBLE || dec >= 0))) {
51885188
error|= sql->append('(');
51895189
error|= sql->append_ulonglong(len);
51905190

@@ -6410,6 +6410,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
64106410
case MYSQL_TYPE_VARCHAR:
64116411
case MYSQL_TYPE_VAR_STRING:
64126412
case MYSQL_TYPE_STRING:
6413+
#if 0
64136414
if (!fp->field_length) {
64146415
sprintf(g->Message, "Unsupported 0 length for column %s",
64156416
fp->field_name);
@@ -6419,7 +6420,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
64196420
MYF(0), fp->field_name);
64206421
DBUG_RETURN(rc);
64216422
} // endif fp
6422-
6423+
#endif // 0
64236424
break; // To be checked
64246425
case MYSQL_TYPE_BIT:
64256426
case MYSQL_TYPE_NULL:
@@ -7206,7 +7207,7 @@ maria_declare_plugin(connect)
72067207
0x0106, /* version number (1.05) */
72077208
NULL, /* status variables */
72087209
connect_system_variables, /* system variables */
7209-
"1.06.0003", /* string version */
7210+
"1.06.0004", /* string version */
72107211
MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
72117212
}
72127213
maria_declare_plugin_end;

‎storage/connect/mysql-test/connect/r/json_java_2.result

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar';
1+
SET GLOBAL connect_class_path='C:/MariaDB-10.1/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar';
2+
set connect_enable_mongo=1;
23
#
34
# Test the MONGO table type
45
#
@@ -25,7 +26,6 @@ address_street 1 CHAR 38 38 0 0 address.street
2526
address_zipcode 1 CHAR 5 5 0 0 address.zipcode
2627
borough 1 CHAR 13 13 0 0
2728
cuisine 1 CHAR 64 64 0 0
28-
grades 1 CHAR 0 0 0 1
2929
grades_date 1 CHAR 256 256 0 1 grades.0.date
3030
grades_grade 1 CHAR 14 14 0 1 grades.0.grade
3131
grades_score 5 BIGINT 2 2 0 1 grades.0.score
@@ -72,20 +72,19 @@ t1 CREATE TABLE `t1` (
7272
`address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode',
7373
`borough` char(13) NOT NULL,
7474
`cuisine` char(64) NOT NULL,
75-
`grades` char(1) DEFAULT NULL,
7675
`grades_date` varchar(256) DEFAULT NULL `FIELD_FORMAT`='grades.0.date',
7776
`grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade',
7877
`grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score',
7978
`name` char(98) NOT NULL,
8079
`restaurant_id` char(8) NOT NULL
8180
) 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
8281
SELECT * FROM t1 LIMIT 5;
83-
_id address_building address_coord address_street address_zipcode borough cuisine grades grades_date grades_grade grades_score name restaurant_id
84-
58ada47de5a51ddfcd5ed51c 1007 -73.856077 Morris Park Ave 10462 Bronx Bakery 2 2014-03-03T00:00:00.000Z A 2 Morris Park Bake Shop 30075445
85-
58ada47de5a51ddfcd5ed51d 469 -73.961704 Flatbush Avenue 11225 Brooklyn Hamburgers 2 2014-12-30T00:00:00.000Z A 8 Wendy'S 30112340
86-
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
87-
58ada47de5a51ddfcd5ed51f 2780 -73.98241999999999 Stillwell Avenue 11224 Brooklyn American 2 2014-06-10T00:00:00.000Z A 5 Riviera Caterer 40356018
88-
58ada47de5a51ddfcd5ed520 97-22 -73.8601152 63 Road 11374 Queens Jewish/Kosher 2 2014-11-24T00:00:00.000Z Z 20 Tov Kosher Kitchen 40356068
82+
_id address_building address_coord address_street address_zipcode borough cuisine grades_date grades_grade grades_score name restaurant_id
83+
58ada47de5a51ddfcd5ed51c 1007 -73.856077 Morris Park Ave 10462 Bronx Bakery 2014-03-03T00:00:00.000Z A 2 Morris Park Bake Shop 30075445
84+
58ada47de5a51ddfcd5ed51d 469 -73.961704 Flatbush Avenue 11225 Brooklyn Hamburgers 2014-12-30T00:00:00.000Z A 8 Wendy'S 30112340
85+
58ada47de5a51ddfcd5ed51e 351 -73.98513559999999 West 57 Street 10019 Manhattan Irish 2014-09-06T00:00:00.000Z A 2 Dj Reynolds Pub And Restaurant 30191841
86+
58ada47de5a51ddfcd5ed51f 2780 -73.98241999999999 Stillwell Avenue 11224 Brooklyn American 2014-06-10T00:00:00.000Z A 5 Riviera Caterer 40356018
87+
58ada47de5a51ddfcd5ed520 97-22 -73.8601152 63 Road 11374 Queens Jewish/Kosher 2014-11-24T00:00:00.000Z Z 20 Tov Kosher Kitchen 40356068
8988
DROP TABLE t1;
9089
#
9190
# Dropping a column
@@ -259,7 +258,6 @@ t1 CREATE TABLE `t1` (
259258
`address_street` char(38) NOT NULL `FIELD_FORMAT`='address.street',
260259
`address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode',
261260
`borough` char(13) NOT NULL,
262-
`grades` char(1) DEFAULT NULL,
263261
`grades_date` char(24) DEFAULT NULL `FIELD_FORMAT`='grades.0.date',
264262
`grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade',
265263
`grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score',
@@ -384,3 +382,4 @@ planner 167 41.75
384382
postcard 23 5.75
385383
DROP TABLE t1;
386384
true
385+
set connect_enable_mongo=0;

‎storage/connect/mysql-test/connect/r/json_java_3.result

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar';
1+
SET GLOBAL connect_class_path='C:/MariaDB-10.1/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar';
2+
set connect_enable_mongo=1;
23
#
34
# Test the MONGO table type
45
#
@@ -25,7 +26,6 @@ address_street 1 CHAR 38 38 0 0 address.street
2526
address_zipcode 1 CHAR 5 5 0 0 address.zipcode
2627
borough 1 CHAR 13 13 0 0
2728
cuisine 1 CHAR 64 64 0 0
28-
grades 1 CHAR 0 0 0 1
2929
grades_date 1 CHAR 256 256 0 1 grades.0.date
3030
grades_grade 1 CHAR 14 14 0 1 grades.0.grade
3131
grades_score 5 BIGINT 2 2 0 1 grades.0.score
@@ -72,20 +72,19 @@ t1 CREATE TABLE `t1` (
7272
`address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode',
7373
`borough` char(13) NOT NULL,
7474
`cuisine` char(64) NOT NULL,
75-
`grades` char(1) DEFAULT NULL,
7675
`grades_date` varchar(256) DEFAULT NULL `FIELD_FORMAT`='grades.0.date',
7776
`grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade',
7877
`grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score',
7978
`name` char(98) NOT NULL,
8079
`restaurant_id` char(8) NOT NULL
8180
) 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
8281
SELECT * FROM t1 LIMIT 5;
83-
_id address_building address_coord address_street address_zipcode borough cuisine grades grades_date grades_grade grades_score name restaurant_id
84-
58ada47de5a51ddfcd5ed51c 1007 -73.856077 Morris Park Ave 10462 Bronx Bakery 1 1393804800 A 2 Morris Park Bake Shop 30075445
85-
58ada47de5a51ddfcd5ed51d 469 -73.961704 Flatbush Avenue 11225 Brooklyn Hamburgers 1 1419897600 A 8 Wendy'S 30112340
86-
58ada47de5a51ddfcd5ed51e 351 -73.98513559999999 West 57 Street 10019 Manhattan Irish 1 1409961600 A 2 Dj Reynolds Pub And Restaurant 30191841
87-
58ada47de5a51ddfcd5ed51f 2780 -73.98241999999999 Stillwell Avenue 11224 Brooklyn American 1 1402358400 A 5 Riviera Caterer 40356018
88-
58ada47de5a51ddfcd5ed520 97-22 -73.8601152 63 Road 11374 Queens Jewish/Kosher 1 1416787200 Z 20 Tov Kosher Kitchen 40356068
82+
_id address_building address_coord address_street address_zipcode borough cuisine grades_date grades_grade grades_score name restaurant_id
83+
58ada47de5a51ddfcd5ed51c 1007 -73.856077 Morris Park Ave 10462 Bronx Bakery 1393804800 A 2 Morris Park Bake Shop 30075445
84+
58ada47de5a51ddfcd5ed51d 469 -73.961704 Flatbush Avenue 11225 Brooklyn Hamburgers 1419897600 A 8 Wendy'S 30112340
85+
58ada47de5a51ddfcd5ed51e 351 -73.98513559999999 West 57 Street 10019 Manhattan Irish 1409961600 A 2 Dj Reynolds Pub And Restaurant 30191841
86+
58ada47de5a51ddfcd5ed51f 2780 -73.98241999999999 Stillwell Avenue 11224 Brooklyn American 1402358400 A 5 Riviera Caterer 40356018
87+
58ada47de5a51ddfcd5ed520 97-22 -73.8601152 63 Road 11374 Queens Jewish/Kosher 1416787200 Z 20 Tov Kosher Kitchen 40356068
8988
DROP TABLE t1;
9089
#
9190
# Dropping a column
@@ -259,7 +258,6 @@ t1 CREATE TABLE `t1` (
259258
`address_street` char(38) NOT NULL `FIELD_FORMAT`='address.street',
260259
`address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode',
261260
`borough` char(13) NOT NULL,
262-
`grades` char(1) DEFAULT NULL,
263261
`grades_date` bigint(13) DEFAULT NULL `FIELD_FORMAT`='grades.0.date',
264262
`grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade',
265263
`grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score',
@@ -384,3 +382,4 @@ planner 167 41.75
384382
postcard 23 5.75
385383
DROP TABLE t1;
386384
true
385+
set connect_enable_mongo=0;

‎storage/connect/mysql-test/connect/r/json_mongo_c.result

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
set connect_enable_mongo=1;
12
#
23
# Test the MONGO table type
34
#
@@ -24,7 +25,6 @@ address_street 1 CHAR 38 38 0 0 address.street
2425
address_zipcode 1 CHAR 5 5 0 0 address.zipcode
2526
borough 1 CHAR 13 13 0 0
2627
cuisine 1 CHAR 64 64 0 0
27-
grades 1 CHAR 0 0 0 1
2828
grades_date 1 CHAR 256 256 0 1 grades.0.date
2929
grades_grade 1 CHAR 14 14 0 1 grades.0.grade
3030
grades_score 5 BIGINT 2 2 0 1 grades.0.score
@@ -71,20 +71,19 @@ t1 CREATE TABLE `t1` (
7171
`address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode',
7272
`borough` char(13) NOT NULL,
7373
`cuisine` char(64) NOT NULL,
74-
`grades` char(1) DEFAULT NULL,
7574
`grades_date` varchar(256) DEFAULT NULL `FIELD_FORMAT`='grades.0.date',
7675
`grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade',
7776
`grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score',
7877
`name` char(98) NOT NULL,
7978
`restaurant_id` char(8) NOT NULL
8079
) 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
8180
SELECT * FROM t1 LIMIT 5;
82-
_id address_building address_coord address_street address_zipcode borough cuisine grades grades_date grades_grade grades_score name restaurant_id
83-
58ada47de5a51ddfcd5ed51c 1007 -73.856076999999999089 Morris Park Ave 10462 Bronx Bakery 1 1393804800 A 2 Morris Park Bake Shop 30075445
84-
58ada47de5a51ddfcd5ed51d 469 -73.96170399999999745 Flatbush Avenue 11225 Brooklyn Hamburgers 1 1419897600 A 8 Wendy'S 30112340
85-
58ada47de5a51ddfcd5ed51e 351 -73.985135599999992451 West 57 Street 10019 Manhattan Irish 1 1409961600 A 2 Dj Reynolds Pub And Restaurant 30191841
86-
58ada47de5a51ddfcd5ed51f 2780 -73.982419999999990523 Stillwell Avenue 11224 Brooklyn American 1 1402358400 A 5 Riviera Caterer 40356018
87-
58ada47de5a51ddfcd5ed520 97-22 -73.860115199999995639 63 Road 11374 Queens Jewish/Kosher 1 1416787200 Z 20 Tov Kosher Kitchen 40356068
81+
_id address_building address_coord address_street address_zipcode borough cuisine grades_date grades_grade grades_score name restaurant_id
82+
58ada47de5a51ddfcd5ed51c 1007 -73.856076999999999089 Morris Park Ave 10462 Bronx Bakery 1393804800 A 2 Morris Park Bake Shop 30075445
83+
58ada47de5a51ddfcd5ed51d 469 -73.96170399999999745 Flatbush Avenue 11225 Brooklyn Hamburgers 1419897600 A 8 Wendy'S 30112340
84+
58ada47de5a51ddfcd5ed51e 351 -73.985135599999992451 West 57 Street 10019 Manhattan Irish 1409961600 A 2 Dj Reynolds Pub And Restaurant 30191841
85+
58ada47de5a51ddfcd5ed51f 2780 -73.982419999999990523 Stillwell Avenue 11224 Brooklyn American 1402358400 A 5 Riviera Caterer 40356018
86+
58ada47de5a51ddfcd5ed520 97-22 -73.860115199999995639 63 Road 11374 Queens Jewish/Kosher 1416787200 Z 20 Tov Kosher Kitchen 40356068
8887
DROP TABLE t1;
8988
#
9089
# Dropping a column
@@ -258,7 +257,6 @@ t1 CREATE TABLE `t1` (
258257
`address_street` char(38) NOT NULL `FIELD_FORMAT`='address.street',
259258
`address_zipcode` char(5) NOT NULL `FIELD_FORMAT`='address.zipcode',
260259
`borough` char(13) NOT NULL,
261-
`grades` char(1) DEFAULT NULL,
262260
`grades_date` bigint(13) DEFAULT NULL `FIELD_FORMAT`='grades.0.date',
263261
`grades_grade` char(14) DEFAULT NULL `FIELD_FORMAT`='grades.0.grade',
264262
`grades_score` bigint(2) DEFAULT NULL `FIELD_FORMAT`='grades.0.score',
@@ -383,3 +381,4 @@ planner 167 41.75
383381
postcard 23 5.75
384382
DROP TABLE t1;
385383
true
384+
set connect_enable_mongo=0;

‎storage/connect/mysql-test/connect/r/mongo_c.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
set connect_enable_mongo=1;
12
#
23
# Test the MONGO table type
34
#
@@ -376,3 +377,4 @@ planner 167 41.750000
376377
postcard 23 5.750000
377378
DROP TABLE t1;
378379
true
380+
set connect_enable_mongo=0;

‎storage/connect/mysql-test/connect/r/mongo_java_2.result

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar';
1+
SET GLOBAL connect_class_path='C:/MariaDB-10.1/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar';
2+
set connect_enable_mongo=1;
23
#
34
# Test the MONGO table type
45
#
@@ -377,3 +378,4 @@ planner 167 41.75
377378
postcard 23 5.75
378379
DROP TABLE t1;
379380
true
381+
set connect_enable_mongo=0;

‎storage/connect/mysql-test/connect/r/mongo_java_3.result

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar';
1+
SET GLOBAL connect_class_path='C:/MariaDB-10.1/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar';
2+
set connect_enable_mongo=1;
23
#
34
# Test the MONGO table type
45
#
@@ -377,3 +378,4 @@ planner 167 41.75
377378
postcard 23 5.75
378379
DROP TABLE t1;
379380
true
381+
set connect_enable_mongo=0;

‎storage/connect/mysql-test/connect/r/odbc_oracle.result

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,48 +72,48 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
7272
CATFUNC=Columns;
7373
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
7474
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
75-
NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL
76-
NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL
77-
NULL MTR T2 A 12 VARCHAR2 64 64 NULL NULL 1 NULL
78-
NULL MTR V1 A 3 DECIMAL 38 40 0 10 1 NULL
79-
NULL MTR V1 B 6 NUMBER 38 40 NULL NULL 1 NULL
75+
MTR T1 A 3 DECIMAL 38 40 0 10 1
76+
MTR T1 B 6 NUMBER 38 40 NULL NULL 1
77+
MTR T2 A 12 VARCHAR2 64 64 NULL NULL 1
78+
MTR V1 A 3 DECIMAL 38 40 0 10 1
79+
MTR V1 B 6 NUMBER 38 40 NULL NULL 1
8080
DROP TABLE t1;
8181
# All columns in all schemas (limited with WHERE)
8282
CREATE TABLE t1 ENGINE=CONNECT
8383
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
8484
CATFUNC=Columns TABNAME='%.%';
8585
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
8686
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
87-
NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL
88-
NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL
89-
NULL MTR T2 A 12 VARCHAR2 64 64 NULL NULL 1 NULL
90-
NULL MTR V1 A 3 DECIMAL 38 40 0 10 1 NULL
91-
NULL MTR V1 B 6 NUMBER 38 40 NULL NULL 1 NULL
87+
MTR T1 A 3 DECIMAL 38 40 0 10 1
88+
MTR T1 B 6 NUMBER 38 40 NULL NULL 1
89+
MTR T2 A 12 VARCHAR2 64 64 NULL NULL 1
90+
MTR V1 A 3 DECIMAL 38 40 0 10 1
91+
MTR V1 B 6 NUMBER 38 40 NULL NULL 1
9292
DROP TABLE t1;
9393
# All tables "T1" in all schemas (limited with WHERE)
9494
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.T1';
9595
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
9696
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
97-
NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL
98-
NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL
97+
MTR T1 A 3 DECIMAL 38 40 0 10 1
98+
MTR T1 B 6 NUMBER 38 40 NULL NULL 1
9999
DROP TABLE t1;
100100
# Table "T1" in the schema "MTR"
101101
CREATE TABLE t1 ENGINE=CONNECT
102102
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
103103
CATFUNC=Columns TABNAME='MTR.T1';
104104
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
105105
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
106-
NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL
107-
NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL
106+
MTR T1 A 3 DECIMAL 38 40 0 10 1
107+
MTR T1 B 6 NUMBER 38 40 NULL NULL 1
108108
DROP TABLE t1;
109109
# All tables "T1" in all schemas (filtered with WHERE)
110110
CREATE TABLE t1 ENGINE=CONNECT
111111
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
112112
CATFUNC=Columns TABNAME='%.T1';
113113
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
114114
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
115-
NULL MTR T1 A 3 DECIMAL 38 40 0 10 1 NULL
116-
NULL MTR T1 B 6 NUMBER 38 40 NULL NULL 1 NULL
115+
MTR T1 A 3 DECIMAL 38 40 0 10 1
116+
MTR T1 B 6 NUMBER 38 40 NULL NULL 1
117117
DROP TABLE t1;
118118
#
119119
# Checking tables

0 commit comments

Comments
 (0)