Skip to content

Commit d163ad3

Browse files
BuggynoursBuggynours
committed
- Fix to MDEV-9542 Connect was not handling NULLs in the answer
 from catalog functions and tables. It does now and when decimal is NULL defines DOUBLE without parameters. modified: storage/connect/ha_connect.cc modified: storage/connect/mysql-test/connect/r/odbc.result modified: storage/connect/mysql-test/connect/r/odbc_oracle.result modified: storage/connect/mysql-test/connect/r/odbc_postgresql.result modified: storage/connect/mysql-test/connect/r/odbc_sqlite3.result modified: storage/connect/mysql-test/connect/r/odbc_xls.result modified: storage/connect/odbconn.cpp modified: storage/connect/table.cpp modified: storage/connect/valblk.h
1 parent 8fb34ea commit d163ad3

File tree

9 files changed

+2519
-2489
lines changed

9 files changed

+2519
-2489
lines changed

‎storage/connect/ha_connect.cc‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4926,11 +4926,11 @@ static bool add_field(String *sql, const char *field_name, int typ, int len,
49264926
error|= sql->append("` ");
49274927
error|= sql->append(type);
49284928

4929-
if (len && typ != TYPE_DATE) {
4929+
if (len && typ != TYPE_DATE && (typ != TYPE_DOUBLE || dec >= 0)) {
49304930
error|= sql->append('(');
49314931
error|= sql->append_ulonglong(len);
49324932

4933-
if (!strcmp(type, "DOUBLE")) {
4933+
if (typ == TYPE_DOUBLE) {
49344934
error|= sql->append(',');
49354935
// dec must be < len and < 31
49364936
error|= sql->append_ulonglong(MY_MIN(dec, (MY_MIN(len, 31) - 1)));
@@ -5516,16 +5516,17 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
55165516
dec= crp->Prec;
55175517
flg= crp->Flag;
55185518
v= crp->Var;
5519+
tm= (crp->Kdata->IsNullable()) ? 0 : NOT_NULL_FLAG;
55195520

55205521
if (!len && typ == TYPE_STRING)
55215522
len= 256; // STRBLK's have 0 length
55225523

55235524
// Now add the field
55245525
#if defined(NEW_WAY)
55255526
rc= add_fields(g, thd, &alter_info, cnm, typ, len, dec,
5526-
NOT_NULL_FLAG, "", flg, dbf, v);
5527+
tm, "", flg, dbf, v);
55275528
#else // !NEW_WAY
5528-
if (add_field(&sql, cnm, typ, len, dec, NULL, NOT_NULL_FLAG,
5529+
if (add_field(&sql, cnm, typ, len, dec, NULL, tm,
55295530
NULL, NULL, NULL, NULL, flg, dbf, v))
55305531
rc= HA_ERR_OUT_OF_MEM;
55315532
#endif // !NEW_WAY
@@ -5582,7 +5583,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
55825583
len= crp->Kdata->GetIntValue(i);
55835584
break;
55845585
case FLD_SCALE:
5585-
dec= crp->Kdata->GetIntValue(i);
5586+
dec = (!crp->Kdata->IsNull(i)) ? crp->Kdata->GetIntValue(i) : -1;
55865587
break;
55875588
case FLD_NULL:
55885589
if (crp->Kdata->GetIntValue(i))
@@ -5675,14 +5676,14 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
56755676
dec= 0;
56765677
} // endswitch typ
56775678

5678-
} // endif ttp
5679+
} else
56795680
#endif // ODBC_SUPPORT
5680-
56815681
// Make the arguments as required by add_fields
5682-
if (typ == TYPE_DATE)
5682+
if (typ == TYPE_DOUBLE)
5683+
prec= len;
5684+
5685+
if (typ == TYPE_DATE)
56835686
prec= 0;
5684-
else if (typ == TYPE_DOUBLE)
5685-
prec= len;
56865687

56875688
// Now add the field
56885689
#if defined(NEW_WAY)

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,43 @@ SHOW CREATE TABLE t1;
55
Table Create Table
66
t1 CREATE TABLE `t1` (
77
`Name` varchar(256) NOT NULL,
8-
`Description` varchar(256) NOT NULL
8+
`Description` varchar(256) DEFAULT NULL
99
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
1010
DROP TABLE t1;
1111
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Drivers;
1212
SHOW CREATE TABLE t1;
1313
Table Create Table
1414
t1 CREATE TABLE `t1` (
1515
`Description` char(128) NOT NULL,
16-
`Attributes` varchar(256) NOT NULL
16+
`Attributes` varchar(256) DEFAULT NULL
1717
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Drivers'
1818
DROP TABLE t1;
1919
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Tables CONNECTION='Not important';
2020
SHOW CREATE TABLE t1;
2121
Table Create Table
2222
t1 CREATE TABLE `t1` (
23-
`Table_Cat` char(128) NOT NULL,
24-
`Table_Schema` char(128) NOT NULL,
23+
`Table_Cat` char(128) DEFAULT NULL,
24+
`Table_Schema` char(128) DEFAULT NULL,
2525
`Table_Name` char(128) NOT NULL,
2626
`Table_Type` char(16) NOT NULL,
27-
`Remark` char(255) NOT NULL
27+
`Remark` char(255) DEFAULT NULL
2828
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Tables'
2929
DROP TABLE t1;
3030
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Columns CONNECTION='Not important';
3131
SHOW CREATE TABLE t1;
3232
Table Create Table
3333
t1 CREATE TABLE `t1` (
34-
`Table_Cat` char(128) NOT NULL,
35-
`Table_Schema` char(128) NOT NULL,
34+
`Table_Cat` char(128) DEFAULT NULL,
35+
`Table_Schema` char(128) DEFAULT NULL,
3636
`Table_Name` char(128) NOT NULL,
3737
`Column_Name` char(128) NOT NULL,
3838
`Data_Type` smallint(6) NOT NULL,
3939
`Type_Name` char(30) NOT NULL,
4040
`Column_Size` int(10) NOT NULL,
4141
`Buffer_Length` int(10) NOT NULL,
42-
`Decimal_Digits` smallint(6) NOT NULL,
43-
`Radix` smallint(6) NOT NULL,
42+
`Decimal_Digits` smallint(6) DEFAULT NULL,
43+
`Radix` smallint(6) DEFAULT NULL,
4444
`Nullable` smallint(6) NOT NULL,
45-
`Remarks` char(255) NOT NULL
45+
`Remarks` char(255) DEFAULT NULL
4646
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Columns'
4747
DROP TABLE t1;

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Table Create Table
22
t1 CREATE TABLE `t1` (
33
`Name` varchar(256) NOT NULL,
4-
`Description` varchar(256) NOT NULL
4+
`Description` varchar(256) DEFAULT NULL
55
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
66
SET NAMES utf8;
77
#
@@ -14,53 +14,53 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
1414
CATFUNC=Tables;
1515
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
1616
Table_Cat Table_Schema Table_Name Table_Type Remark
17-
MTR T1 TABLE
18-
MTR T2 TABLE
19-
MTR V1 VIEW
17+
NULLMTR T1 TABLENULL
18+
NULLMTR T2 TABLENULL
19+
NULLMTR V1 VIEWNULL
2020
DROP TABLE t1;
2121
# All tables in all schemas (filtered with WHERE)
2222
CREATE TABLE t1 ENGINE=CONNECT
2323
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
2424
CATFUNC=Tables TABNAME='%.%';
2525
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
2626
Table_Cat Table_Schema Table_Name Table_Type Remark
27-
MTR T1 TABLE
28-
MTR T2 TABLE
29-
MTR V1 VIEW
27+
NULLMTR T1 TABLENULL
28+
NULLMTR T2 TABLENULL
29+
NULLMTR V1 VIEWNULL
3030
DROP TABLE t1;
3131
# All tables "T1" in all schemas (filtered with WHERE)
3232
CREATE TABLE t1 ENGINE=CONNECT
3333
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
3434
CATFUNC=Tables TABNAME='%.T1';
3535
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
3636
Table_Cat Table_Schema Table_Name Table_Type Remark
37-
MTR T1 TABLE
37+
NULLMTR T1 TABLENULL
3838
DROP TABLE t1;
3939
# All tables "T1" in all schemas (filtered with WHERE)
4040
CREATE TABLE t1 ENGINE=CONNECT
4141
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
4242
CATFUNC=Tables TABNAME='T1';
4343
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
4444
Table_Cat Table_Schema Table_Name Table_Type Remark
45-
MTR T1 TABLE
45+
NULLMTR T1 TABLENULL
4646
DROP TABLE t1;
4747
# Table "T1" in the schema "MTR"
4848
CREATE TABLE t1 ENGINE=CONNECT
4949
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
5050
CATFUNC=Tables TABNAME='MTR.T1';
5151
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
5252
Table_Cat Table_Schema Table_Name Table_Type Remark
53-
MTR T1 TABLE
53+
NULLMTR T1 TABLENULL
5454
DROP TABLE t1;
5555
# All tables in the schema "MTR"
5656
CREATE TABLE t1 ENGINE=CONNECT
5757
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
5858
CATFUNC=Tables TABNAME='MTR.%';
5959
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
6060
Table_Cat Table_Schema Table_Name Table_Type Remark
61-
MTR T1 TABLE
62-
MTR T2 TABLE
63-
MTR V1 VIEW
61+
NULLMTR T1 TABLENULL
62+
NULLMTR T2 TABLENULL
63+
NULLMTR V1 VIEWNULL
6464
DROP TABLE t1;
6565
#
6666
# Checking CATFUNC=Columns
@@ -73,10 +73,10 @@ 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
7575
MTR T1 A 3 DECIMAL 38 40 0 10 1
76-
MTR T1 B 6 NUMBER 38 400 01
77-
MTR T2 A 12 VARCHAR2 64 640 01
76+
MTR T1 B 6 NUMBER 38 40NULL NULL1
77+
MTR T2 A 12 VARCHAR2 64 64NULL NULL1
7878
MTR V1 A 3 DECIMAL 38 40 0 10 1
79-
MTR V1 B 6 NUMBER 38 400 01
79+
MTR V1 B 6 NUMBER 38 40NULL NULL1
8080
DROP TABLE t1;
8181
# All columns in all schemas (limited with WHERE)
8282
CREATE TABLE t1 ENGINE=CONNECT
@@ -85,17 +85,17 @@ 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
8787
MTR T1 A 3 DECIMAL 38 40 0 10 1
88-
MTR T1 B 6 NUMBER 38 400 01
89-
MTR T2 A 12 VARCHAR2 64 640 01
88+
MTR T1 B 6 NUMBER 38 40NULL NULL1
89+
MTR T2 A 12 VARCHAR2 64 64NULL NULL1
9090
MTR V1 A 3 DECIMAL 38 40 0 10 1
91-
MTR V1 B 6 NUMBER 38 400 01
91+
MTR V1 B 6 NUMBER 38 40NULL NULL1
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
9797
MTR T1 A 3 DECIMAL 38 40 0 10 1
98-
MTR T1 B 6 NUMBER 38 400 01
98+
MTR T1 B 6 NUMBER 38 40NULL NULL1
9999
DROP TABLE t1;
100100
# Table "T1" in the schema "MTR"
101101
CREATE TABLE t1 ENGINE=CONNECT
@@ -104,7 +104,7 @@ 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
106106
MTR T1 A 3 DECIMAL 38 40 0 10 1
107-
MTR T1 B 6 NUMBER 38 400 01
107+
MTR T1 B 6 NUMBER 38 40NULL NULL1
108108
DROP TABLE t1;
109109
# All tables "T1" in all schemas (filtered with WHERE)
110110
CREATE TABLE t1 ENGINE=CONNECT
@@ -113,7 +113,7 @@ 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
115115
MTR T1 A 3 DECIMAL 38 40 0 10 1
116-
MTR T1 B 6 NUMBER 38 400 01
116+
MTR T1 B 6 NUMBER 38 40NULL NULL1
117117
DROP TABLE t1;
118118
#
119119
# Checking tables
@@ -127,32 +127,32 @@ SHOW CREATE TABLE t1;
127127
Table Create Table
128128
t1 CREATE TABLE `t1` (
129129
`A` decimal(40,0) DEFAULT NULL,
130-
`B` double(40,0) DEFAULT NULL
130+
`B` double DEFAULT NULL
131131
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='T1'
132132
SELECT * FROM t1 ORDER BY A;
133133
A B
134134
10 1000000000
135135
20 1000000000000
136-
301000000000000000
136+
301e15
137137
CREATE TABLE t2 AS SELECT * FROM t1;
138138
SHOW CREATE TABLE t2;
139139
Table Create Table
140140
t2 CREATE TABLE `t2` (
141141
`A` decimal(40,0) DEFAULT NULL,
142-
`B` double(40,0) DEFAULT NULL
142+
`B` double DEFAULT NULL
143143
) ENGINE=MyISAM DEFAULT CHARSET=latin1
144144
SELECT * FROM t2;
145145
A B
146146
10 1000000000
147147
20 1000000000000
148-
301000000000000000
148+
301e15
149149
DROP TABLE t2;
150150
CREATE VIEW v1 AS SELECT * FROM t1;
151151
SELECT * FROM v1;
152152
A B
153153
10 1000000000
154154
20 1000000000000
155-
301000000000000000
155+
301e15
156156
DROP VIEW v1;
157157
DROP TABLE t1;
158158
# Table "T1" in the schema "MTR"
@@ -163,13 +163,13 @@ SHOW CREATE TABLE t1;
163163
Table Create Table
164164
t1 CREATE TABLE `t1` (
165165
`A` decimal(40,0) DEFAULT NULL,
166-
`B` double(40,0) DEFAULT NULL
166+
`B` double DEFAULT NULL
167167
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='MTR.T1'
168168
SELECT * FROM t1;
169169
A B
170170
10 1000000000
171171
20 1000000000000
172-
301000000000000000
172+
301e15
173173
DROP TABLE t1;
174174
# View "V1" in the schema "MTR"
175175
CREATE TABLE t1 ENGINE=CONNECT
@@ -179,32 +179,32 @@ SHOW CREATE TABLE t1;
179179
Table Create Table
180180
t1 CREATE TABLE `t1` (
181181
`A` decimal(40,0) DEFAULT NULL,
182-
`B` double(40,0) DEFAULT NULL
182+
`B` double DEFAULT NULL
183183
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='MTR.V1'
184184
SELECT * FROM t1;
185185
A B
186186
10 1000000000
187187
20 1000000000000
188-
301000000000000000
188+
301e15
189189
CREATE TABLE t2 AS SELECT * FROM t1;
190190
SHOW CREATE TABLE t2;
191191
Table Create Table
192192
t2 CREATE TABLE `t2` (
193193
`A` decimal(40,0) DEFAULT NULL,
194-
`B` double(40,0) DEFAULT NULL
194+
`B` double DEFAULT NULL
195195
) ENGINE=MyISAM DEFAULT CHARSET=latin1
196196
SELECT * FROM t2;
197197
A B
198198
10 1000000000
199199
20 1000000000000
200-
301000000000000000
200+
301e15
201201
DROP TABLE t2;
202202
CREATE VIEW v1 AS SELECT * FROM t1;
203203
SELECT * FROM v1;
204204
A B
205205
10 1000000000
206206
20 1000000000000
207-
301000000000000000
207+
301e15
208208
DROP VIEW v1;
209209
DROP TABLE t1;
210210
# Table "T2" in the schema "MTR"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Table Create Table
22
t1 CREATE TABLE `t1` (
33
`Name` varchar(256) NOT NULL,
4-
`Description` varchar(256) NOT NULL
4+
`Description` varchar(256) DEFAULT NULL
55
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
66
SET NAMES utf8;
77
#
@@ -99,9 +99,9 @@ Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Bu
9999
mtr public t1 a 4 int4 10 4 0 10 0
100100
mtr public t2 a 4 int4 10 4 0 10 0
101101
mtr public v1 a 4 int4 10 4 0 10 1
102-
mtr schema1 t1 a 1 bpchar 10 600 00
103-
mtr schema1 t2 a 1 bpchar 10 600 00
104-
mtr schema1 v1 a 1 bpchar 10 600 01
102+
mtr schema1 t1 a 1 bpchar 10 60NULL NULL0
103+
mtr schema1 t2 a 1 bpchar 10 60NULL NULL0
104+
mtr schema1 v1 a 1 bpchar 10 60NULL NULL1
105105
DROP TABLE t1;
106106
# All columns in the schemas "public" and "schema1"
107107
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.%.%';
@@ -110,16 +110,16 @@ Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Bu
110110
mtr public t1 a 4 int4 10 4 0 10 0
111111
mtr public t2 a 4 int4 10 4 0 10 0
112112
mtr public v1 a 4 int4 10 4 0 10 1
113-
mtr schema1 t1 a 1 bpchar 10 600 00
114-
mtr schema1 t2 a 1 bpchar 10 600 00
115-
mtr schema1 v1 a 1 bpchar 10 600 01
113+
mtr schema1 t1 a 1 bpchar 10 60NULL NULL0
114+
mtr schema1 t2 a 1 bpchar 10 60NULL NULL0
115+
mtr schema1 v1 a 1 bpchar 10 60NULL NULL1
116116
DROP TABLE t1;
117117
# All tables "t1" in all schemas
118118
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.%.t1';
119119
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
120120
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
121121
mtr public t1 a 4 int4 10 4 0 10 0
122-
mtr schema1 t1 a 1 bpchar 10 600 00
122+
mtr schema1 t1 a 1 bpchar 10 60NULL NULL0
123123
DROP TABLE t1;
124124
# Table "t1" in the schema "public"
125125
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.public.t1';
@@ -131,14 +131,14 @@ DROP TABLE t1;
131131
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.schema1.t1';
132132
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
133133
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
134-
mtr schema1 t1 a 1 bpchar 10 600 00
134+
mtr schema1 t1 a 1 bpchar 10 60NULL NULL0
135135
DROP TABLE t1;
136136
# All tables "t1" in all schemas (Catalog name is ignored by PostgreSQL)
137137
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='xxx.%.t1';
138138
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
139139
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
140140
mtr public t1 a 4 int4 10 4 0 10 0
141-
mtr schema1 t1 a 1 bpchar 10 600 00
141+
mtr schema1 t1 a 1 bpchar 10 60NULL NULL0
142142
DROP TABLE t1;
143143
#
144144
# Checking tables

0 commit comments

Comments
 (0)