Skip to content

Restore old PDO::PARAM_* values #7445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Restore old PDO::PARAM_* values #7445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ext/pdo/php_pdo_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ struct pdo_bound_param_data;

#define PDO_DRIVER_API 20170320

/* Doctrine hardcodes these constants, avoid changing their values. */
enum pdo_param_type {
PDO_PARAM_NULL,
PDO_PARAM_BOOL,
PDO_PARAM_INT,
PDO_PARAM_STR,
PDO_PARAM_LOB,
PDO_PARAM_NULL = 0,
PDO_PARAM_BOOL = 5,
PDO_PARAM_INT = 1,
PDO_PARAM_STR = 2,
PDO_PARAM_LOB = 3,

/* get_col: Not supported (yet?) */
PDO_PARAM_STMT, /* hierarchical result set */
PDO_PARAM_STMT = 4, /* hierarchical result set */

/* magic flag to denote a parameter as being input/output */
PDO_PARAM_INPUT_OUTPUT = 0x80000000,
Expand Down
6 changes: 3 additions & 3 deletions ext/pdo/tests/debug_emulated_prepares.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@ Key: Name: [5] :bool
paramno=-1
name=[5] ":bool"
is_param=1
param_type=1
param_type=5
Key: Name: [4] :int
paramno=-1
name=[4] ":int"
is_param=1
param_type=2
param_type=1
Key: Name: [7] :string
paramno=-1
name=[7] ":string"
is_param=1
param_type=3
param_type=2
Key: Name: [5] :null
paramno=-1
name=[5] ":null"
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo_dblib/tests/bug_45876.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ array(10) {
["native_usertype_id"]=>
int(%d)
["pdo_type"]=>
int(3)
int(2)
["name"]=>
string(13) "TABLE_CATALOG"
["len"]=>
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo_dblib/tests/pdo_dblib_param_str_natl.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Key: Name: [6] :value
paramno=-1
name=[6] ":value"
is_param=1
param_type=1073741827
param_type=1073741826
NULL
18 changes: 9 additions & 9 deletions ext/pdo_pgsql/tests/bug62498.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ array(9) {
["native_type"]=>
string(4) "int2"
["pdo_type"]=>
int(2)
int(1)
["name"]=>
string(7) "int2col"
["len"]=>
Expand All @@ -78,7 +78,7 @@ array(9) {
["native_type"]=>
string(4) "int4"
["pdo_type"]=>
int(2)
int(1)
["name"]=>
string(7) "int4col"
["len"]=>
Expand All @@ -97,7 +97,7 @@ array(9) {
["native_type"]=>
string(4) "int8"
["pdo_type"]=>
int(2)
int(1)
["name"]=>
string(7) "int8col"
["len"]=>
Expand All @@ -116,7 +116,7 @@ array(9) {
["native_type"]=>
string(7) "varchar"
["pdo_type"]=>
int(3)
int(2)
["name"]=>
string(9) "stringcol"
["len"]=>
Expand All @@ -135,7 +135,7 @@ array(9) {
["native_type"]=>
string(4) "bool"
["pdo_type"]=>
int(1)
int(5)
["name"]=>
string(7) "boolcol"
["len"]=>
Expand All @@ -154,7 +154,7 @@ array(9) {
["native_type"]=>
string(4) "date"
["pdo_type"]=>
int(3)
int(2)
["name"]=>
string(7) "datecol"
["len"]=>
Expand All @@ -173,7 +173,7 @@ array(9) {
["native_type"]=>
string(4) "text"
["pdo_type"]=>
int(3)
int(2)
["name"]=>
string(7) "textcol"
["len"]=>
Expand All @@ -192,7 +192,7 @@ array(9) {
["native_type"]=>
string(9) "timestamp"
["pdo_type"]=>
int(3)
int(2)
["name"]=>
string(5) "tscol"
["len"]=>
Expand All @@ -211,7 +211,7 @@ array(9) {
["native_type"]=>
string(5) "bytea"
["pdo_type"]=>
int(4)
int(3)
["name"]=>
string(8) "byteacol"
["len"]=>
Expand Down
6 changes: 3 additions & 3 deletions ext/pdo_pgsql/tests/debug_emulated_prepares.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ Key: Name: [5] :bool
paramno=-1
name=[5] ":bool"
is_param=1
param_type=3
param_type=2
Key: Name: [4] :int
paramno=-1
name=[4] ":int"
is_param=1
param_type=2
param_type=1
Key: Name: [7] :string
paramno=-1
name=[7] ":string"
is_param=1
param_type=3
param_type=2
Key: Name: [5] :null
paramno=-1
name=[5] ":null"
Expand Down
6 changes: 3 additions & 3 deletions ext/pdo_sqlite/tests/debugdumpparams_001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ Key: Name: [2] :a
paramno=-1
name=[2] ":a"
is_param=1
param_type=2
param_type=1
Key: Name: [2] :b
paramno=-1
name=[2] ":b"
is_param=1
param_type=3
param_type=2
Key: Position #2:
paramno=2
name=[0] ""
is_param=1
param_type=3
param_type=2
NULL