Skip to content

Commit 439878c

Browse files
cmb69cmb69
committed
Rename $qualifier/$owner params to $catalog/$schema
These have been called qualifier and owner with ODBC 2, but ODBC 3 changed that to catalog and schema, respectively. Closes GH-6210.
1 parent 43ce18f commit 439878c

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎ext/odbc/odbc.stub.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ function odbc_setoption($conn_id, int $which, int $option, int $value): bool {}
129129
* @param resource $connection_id
130130
* @return resource|false
131131
*/
132-
function odbc_tables($connection_id, ?string $qualfier = null, ?string $owner = null, ?string $name = null, ?string $table_types = null) {}
132+
function odbc_tables($connection_id, ?string $catalog = null, ?string $schema = null, ?string $name = null, ?string $table_types = null) {}
133133

134134
/**
135135
* @param resource $connection_id
136136
* @return resource|false
137137
*/
138-
function odbc_columns($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $table_name = null, ?string $column_name = null) {}
138+
function odbc_columns($connection_id, ?string $catalog = null, ?string $schema = null, ?string $table_name = null, ?string $column_name = null) {}
139139

140140
/**
141141
* @param resource $connection_id
@@ -147,46 +147,46 @@ function odbc_gettypeinfo($connection_id, int $data_type = 0) {}
147147
* @param resource $connection_id
148148
* @return resource|false
149149
*/
150-
function odbc_primarykeys($connection_id, ?string $qualifier, string $owner, string $table) {}
150+
function odbc_primarykeys($connection_id, ?string $catalog, string $schema, string $table) {}
151151

152152
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
153153
/**
154154
* @param resource $connection_id
155155
* @return resource|false
156156
*/
157-
function odbc_procedurecolumns($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $proc = null, ?string $column = null) {}
157+
function odbc_procedurecolumns($connection_id, ?string $catalog = null, ?string $schema = null, ?string $proc = null, ?string $column = null) {}
158158

159159
/**
160160
* @param resource $connection_id
161161
* @return resource|false
162162
*/
163-
function odbc_procedures($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $name = null) {}
163+
function odbc_procedures($connection_id, ?string $catalog = null, ?string $schema = null, ?string $name = null) {}
164164

165165
/**
166166
* @param resource $connection_id
167167
* @return resource|false
168168
*/
169-
function odbc_foreignkeys($connection_id, ?string $pk_qualifier, string $pk_owner, string $pk_table, string $fk_qualifier, string $fk_owner, string $fk_table) {}
169+
function odbc_foreignkeys($connection_id, ?string $pk_catalog, string $pk_schema, string $pk_table, string $fk_catalog, string $fk_schema, string $fk_table) {}
170170
#endif
171171

172172
/**
173173
* @param resource $connection_id
174174
* @return resource|false
175175
*/
176-
function odbc_specialcolumns($connection_id, int $type, ?string $qualifier, string $owner, string $table, int $scope, int $nullable) {}
176+
function odbc_specialcolumns($connection_id, int $type, ?string $catalog, string $schema, string $table, int $scope, int $nullable) {}
177177

178178
/**
179179
* @param resource $connection_id
180180
* @return resource|false
181181
*/
182-
function odbc_statistics($connection_id, ?string $qualfier, string $owner, string $name, int $unique, int $accuracy) {}
182+
function odbc_statistics($connection_id, ?string $catalog, string $schema, string $name, int $unique, int $accuracy) {}
183183

184184
#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
185185
/**
186186
* @param resource $connection_id
187187
* @return resource|false
188188
*/
189-
function odbc_tableprivileges($connection_id, ?string $qualifier, string $owner, string $name) {}
189+
function odbc_tableprivileges($connection_id, ?string $catalog, string $schema, string $name) {}
190190

191191
/**
192192
* @param resource $connection_id

‎ext/odbc/odbc_arginfo.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 3e7073410f7d9d8357f2eeacd0457567901dbe08 */
2+
* Stub hash: 53069f42e460cfea8e2daf499277f6ceb9c760f7 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_close_all, 0, 0, IS_VOID, 0)
55
ZEND_END_ARG_INFO()
@@ -150,16 +150,16 @@ ZEND_END_ARG_INFO()
150150

151151
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1)
152152
ZEND_ARG_INFO(0, connection_id)
153-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualfier, IS_STRING, 1, "null")
154-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
153+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, catalog, IS_STRING, 1, "null")
154+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
155155
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
156156
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, table_types, IS_STRING, 1, "null")
157157
ZEND_END_ARG_INFO()
158158

159159
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columns, 0, 0, 1)
160160
ZEND_ARG_INFO(0, connection_id)
161-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
162-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
161+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, catalog, IS_STRING, 1, "null")
162+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
163163
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, table_name, IS_STRING, 1, "null")
164164
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, column_name, IS_STRING, 1, "null")
165165
ZEND_END_ARG_INFO()
@@ -171,16 +171,16 @@ ZEND_END_ARG_INFO()
171171

172172
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_primarykeys, 0, 0, 4)
173173
ZEND_ARG_INFO(0, connection_id)
174-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
175-
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
174+
ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
175+
ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
176176
ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
177177
ZEND_END_ARG_INFO()
178178

179179
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
180180
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1)
181181
ZEND_ARG_INFO(0, connection_id)
182-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
183-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
182+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, catalog, IS_STRING, 1, "null")
183+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
184184
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, proc, IS_STRING, 1, "null")
185185
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, column, IS_STRING, 1, "null")
186186
ZEND_END_ARG_INFO()
@@ -189,38 +189,38 @@ ZEND_END_ARG_INFO()
189189
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
190190
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1)
191191
ZEND_ARG_INFO(0, connection_id)
192-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
193-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
192+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, catalog, IS_STRING, 1, "null")
193+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
194194
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
195195
ZEND_END_ARG_INFO()
196196
#endif
197197

198198
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
199199
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_foreignkeys, 0, 0, 7)
200200
ZEND_ARG_INFO(0, connection_id)
201-
ZEND_ARG_TYPE_INFO(0, pk_qualifier, IS_STRING, 1)
202-
ZEND_ARG_TYPE_INFO(0, pk_owner, IS_STRING, 0)
201+
ZEND_ARG_TYPE_INFO(0, pk_catalog, IS_STRING, 1)
202+
ZEND_ARG_TYPE_INFO(0, pk_schema, IS_STRING, 0)
203203
ZEND_ARG_TYPE_INFO(0, pk_table, IS_STRING, 0)
204-
ZEND_ARG_TYPE_INFO(0, fk_qualifier, IS_STRING, 0)
205-
ZEND_ARG_TYPE_INFO(0, fk_owner, IS_STRING, 0)
204+
ZEND_ARG_TYPE_INFO(0, fk_catalog, IS_STRING, 0)
205+
ZEND_ARG_TYPE_INFO(0, fk_schema, IS_STRING, 0)
206206
ZEND_ARG_TYPE_INFO(0, fk_table, IS_STRING, 0)
207207
ZEND_END_ARG_INFO()
208208
#endif
209209

210210
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 7)
211211
ZEND_ARG_INFO(0, connection_id)
212212
ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
213-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
214-
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
213+
ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
214+
ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
215215
ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
216216
ZEND_ARG_TYPE_INFO(0, scope, IS_LONG, 0)
217217
ZEND_ARG_TYPE_INFO(0, nullable, IS_LONG, 0)
218218
ZEND_END_ARG_INFO()
219219

220220
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6)
221221
ZEND_ARG_INFO(0, connection_id)
222-
ZEND_ARG_TYPE_INFO(0, qualfier, IS_STRING, 1)
223-
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
222+
ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
223+
ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
224224
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
225225
ZEND_ARG_TYPE_INFO(0, unique, IS_LONG, 0)
226226
ZEND_ARG_TYPE_INFO(0, accuracy, IS_LONG, 0)
@@ -229,8 +229,8 @@ ZEND_END_ARG_INFO()
229229
#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
230230
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tableprivileges, 0, 0, 4)
231231
ZEND_ARG_INFO(0, connection_id)
232-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
233-
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
232+
ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
233+
ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
234234
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
235235
ZEND_END_ARG_INFO()
236236
#endif

0 commit comments

Comments
 (0)