mirror of
https://github.com/php/php-src.git
synced 2025-08-21 01:45:16 +02:00
Merge branch 'PHP-7.0' into PHP-7.1
This commit is contained in:
Christopher Jones
commit
f16285b35a
10 changed files with 594 additions and 486 deletions
|
|
@ -1178,7 +1178,8 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
|
||||||
} else if (Z_TYPE_P(var) == IS_STRING) {
|
} else if (Z_TYPE_P(var) == IS_STRING) {
|
||||||
value_sz = (sb4) Z_STRLEN_P(var);
|
value_sz = (sb4) Z_STRLEN_P(var);
|
||||||
} else {
|
} else {
|
||||||
value_sz = PHP_OCI_PIECE_SIZE;
|
/* Bug-72524: revert value_sz from PHP_OCI_PIECE_SIZE to 0. This restores PHP 5.6 behavior */
|
||||||
|
value_sz = 0;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
value_sz = (sb4) maxlength;
|
value_sz = (sb4) maxlength;
|
||||||
|
|
@ -1243,6 +1244,11 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
|
||||||
bindp = zend_hash_update_ptr(statement->binds, zvtmp, bindp);
|
bindp = zend_hash_update_ptr(statement->binds, zvtmp, bindp);
|
||||||
zend_string_release(zvtmp);
|
zend_string_release(zvtmp);
|
||||||
}
|
}
|
||||||
|
/* Make sure the minimum of value_sz is 1 to avoid ORA-3149
|
||||||
|
* when both in/out parameters are bound with empty strings
|
||||||
|
*/
|
||||||
|
if (value_sz == 0)
|
||||||
|
value_sz = 1;
|
||||||
|
|
||||||
bindp->descriptor = oci_desc;
|
bindp->descriptor = oci_desc;
|
||||||
bindp->statement = oci_stmt;
|
bindp->statement = oci_stmt;
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ Interoperability Support" (ID 207303.1) for details.
|
||||||
<active>no</active>
|
<active>no</active>
|
||||||
</lead>
|
</lead>
|
||||||
|
|
||||||
<date>2016-08-04</date>
|
<date>2016-08-07</date>
|
||||||
<time>12:00:00</time>
|
<time>12:00:00</time>
|
||||||
|
|
||||||
<version>
|
<version>
|
||||||
|
|
@ -61,6 +61,7 @@ Interoperability Support" (ID 207303.1) for details.
|
||||||
<notes>
|
<notes>
|
||||||
This version is for PHP 7 only.
|
This version is for PHP 7 only.
|
||||||
Fixed invalid handle error with Implicit Result Sets
|
Fixed invalid handle error with Implicit Result Sets
|
||||||
|
Fixed bug #72524 (Binding null values triggers ORA-24816 error)
|
||||||
</notes>
|
</notes>
|
||||||
<contents>
|
<contents>
|
||||||
<dir name="/">
|
<dir name="/">
|
||||||
|
|
@ -163,6 +164,7 @@ Fixed invalid handle error with Implicit Result Sets
|
||||||
<file name="bug68298.phpt" role="test" />
|
<file name="bug68298.phpt" role="test" />
|
||||||
<file name="bug71422.phpt" role="test" />
|
<file name="bug71422.phpt" role="test" />
|
||||||
<file name="bug71600.phpt" role="test" />
|
<file name="bug71600.phpt" role="test" />
|
||||||
|
<file name="bug72524.phpt" role="test" />
|
||||||
<file name="clientversion.phpt" role="test" />
|
<file name="clientversion.phpt" role="test" />
|
||||||
<file name="close.phpt" role="test" />
|
<file name="close.phpt" role="test" />
|
||||||
<file name="coll_001.phpt" role="test" />
|
<file name="coll_001.phpt" role="test" />
|
||||||
|
|
|
||||||
|
|
@ -246,8 +246,9 @@ echo "Done\n";
|
||||||
--EXPECTF--
|
--EXPECTF--
|
||||||
Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default
|
Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default
|
||||||
Executing:
|
Executing:
|
||||||
|
Oci_execute error ORA-6502
|
||||||
string(3) "abc"
|
string(3) "abc"
|
||||||
string(3) "abc"
|
NULL
|
||||||
Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default
|
Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default
|
||||||
Executing:
|
Executing:
|
||||||
string(3) "abc"
|
string(3) "abc"
|
||||||
|
|
|
||||||
|
|
@ -246,8 +246,9 @@ echo "Done\n";
|
||||||
--EXPECTF--
|
--EXPECTF--
|
||||||
Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default
|
Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default
|
||||||
Executing:
|
Executing:
|
||||||
|
Oci_execute error ORA-6502
|
||||||
string(3) "abc"
|
string(3) "abc"
|
||||||
string(3) "abc"
|
NULL
|
||||||
Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default
|
Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default
|
||||||
Executing:
|
Executing:
|
||||||
string(3) "abc"
|
string(3) "abc"
|
||||||
|
|
|
||||||
|
|
@ -248,8 +248,9 @@ echo "Done\n";
|
||||||
--EXPECTF--
|
--EXPECTF--
|
||||||
Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default
|
Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default
|
||||||
Executing:
|
Executing:
|
||||||
|
Oci_execute error ORA-6502
|
||||||
string(3) "abc"
|
string(3) "abc"
|
||||||
string(3) "abc"
|
NULL
|
||||||
Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default
|
Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default
|
||||||
Executing:
|
Executing:
|
||||||
string(3) "abc"
|
string(3) "abc"
|
||||||
|
|
|
||||||
|
|
@ -248,8 +248,9 @@ echo "Done\n";
|
||||||
--EXPECTF--
|
--EXPECTF--
|
||||||
Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default
|
Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default
|
||||||
Executing:
|
Executing:
|
||||||
|
Oci_execute error ORA-6502
|
||||||
string(3) "abc"
|
string(3) "abc"
|
||||||
string(3) "abc"
|
NULL
|
||||||
Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default
|
Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default
|
||||||
Executing:
|
Executing:
|
||||||
string(3) "abc"
|
string(3) "abc"
|
||||||
|
|
|
||||||
|
|
@ -61,194 +61,194 @@ string(1) "6"
|
||||||
string(1) "7"
|
string(1) "7"
|
||||||
string(1) "8"
|
string(1) "8"
|
||||||
string(1) "9"
|
string(1) "9"
|
||||||
string(2) "10"
|
string(1) "1"
|
||||||
string(2) "11"
|
string(1) "1"
|
||||||
string(2) "12"
|
string(1) "1"
|
||||||
string(2) "13"
|
string(1) "1"
|
||||||
string(2) "14"
|
string(1) "1"
|
||||||
string(2) "15"
|
string(1) "1"
|
||||||
string(2) "16"
|
string(1) "1"
|
||||||
string(2) "17"
|
string(1) "1"
|
||||||
string(2) "18"
|
string(1) "1"
|
||||||
string(2) "19"
|
string(1) "1"
|
||||||
string(2) "20"
|
string(1) "2"
|
||||||
string(2) "21"
|
string(1) "2"
|
||||||
string(2) "22"
|
string(1) "2"
|
||||||
string(2) "23"
|
string(1) "2"
|
||||||
string(2) "24"
|
string(1) "2"
|
||||||
string(2) "25"
|
string(1) "2"
|
||||||
string(2) "26"
|
string(1) "2"
|
||||||
string(2) "27"
|
string(1) "2"
|
||||||
string(2) "28"
|
string(1) "2"
|
||||||
string(2) "29"
|
string(1) "2"
|
||||||
string(2) "30"
|
string(1) "3"
|
||||||
string(2) "31"
|
string(1) "3"
|
||||||
string(2) "32"
|
string(1) "3"
|
||||||
string(2) "33"
|
string(1) "3"
|
||||||
string(2) "34"
|
string(1) "3"
|
||||||
string(2) "35"
|
string(1) "3"
|
||||||
string(2) "36"
|
string(1) "3"
|
||||||
string(2) "37"
|
string(1) "3"
|
||||||
string(2) "38"
|
string(1) "3"
|
||||||
string(2) "39"
|
string(1) "3"
|
||||||
string(2) "40"
|
string(1) "4"
|
||||||
string(2) "41"
|
string(1) "4"
|
||||||
string(2) "42"
|
string(1) "4"
|
||||||
string(2) "43"
|
string(1) "4"
|
||||||
string(2) "44"
|
string(1) "4"
|
||||||
string(2) "45"
|
string(1) "4"
|
||||||
string(2) "46"
|
string(1) "4"
|
||||||
string(2) "47"
|
string(1) "4"
|
||||||
string(2) "48"
|
string(1) "4"
|
||||||
string(2) "49"
|
string(1) "4"
|
||||||
string(2) "50"
|
string(1) "5"
|
||||||
string(2) "51"
|
string(1) "5"
|
||||||
string(2) "52"
|
string(1) "5"
|
||||||
string(2) "53"
|
string(1) "5"
|
||||||
string(2) "54"
|
string(1) "5"
|
||||||
string(2) "55"
|
string(1) "5"
|
||||||
string(2) "56"
|
string(1) "5"
|
||||||
string(2) "57"
|
string(1) "5"
|
||||||
string(2) "58"
|
string(1) "5"
|
||||||
string(2) "59"
|
string(1) "5"
|
||||||
string(2) "60"
|
string(1) "6"
|
||||||
string(2) "61"
|
string(1) "6"
|
||||||
string(2) "62"
|
string(1) "6"
|
||||||
string(2) "63"
|
string(1) "6"
|
||||||
string(2) "64"
|
string(1) "6"
|
||||||
string(2) "65"
|
string(1) "6"
|
||||||
string(2) "66"
|
string(1) "6"
|
||||||
string(2) "67"
|
string(1) "6"
|
||||||
string(2) "68"
|
string(1) "6"
|
||||||
string(2) "69"
|
string(1) "6"
|
||||||
string(2) "70"
|
string(1) "7"
|
||||||
string(2) "71"
|
string(1) "7"
|
||||||
string(2) "72"
|
string(1) "7"
|
||||||
string(2) "73"
|
string(1) "7"
|
||||||
string(2) "74"
|
string(1) "7"
|
||||||
string(2) "75"
|
string(1) "7"
|
||||||
string(2) "76"
|
string(1) "7"
|
||||||
string(2) "77"
|
string(1) "7"
|
||||||
string(2) "78"
|
string(1) "7"
|
||||||
string(2) "79"
|
string(1) "7"
|
||||||
string(2) "80"
|
string(1) "8"
|
||||||
string(2) "81"
|
string(1) "8"
|
||||||
string(2) "82"
|
string(1) "8"
|
||||||
string(2) "83"
|
string(1) "8"
|
||||||
string(2) "84"
|
string(1) "8"
|
||||||
string(2) "85"
|
string(1) "8"
|
||||||
string(2) "86"
|
string(1) "8"
|
||||||
string(2) "87"
|
string(1) "8"
|
||||||
string(2) "88"
|
string(1) "8"
|
||||||
string(2) "89"
|
string(1) "8"
|
||||||
string(2) "90"
|
string(1) "9"
|
||||||
string(2) "91"
|
string(1) "9"
|
||||||
string(2) "92"
|
string(1) "9"
|
||||||
string(2) "93"
|
string(1) "9"
|
||||||
string(2) "94"
|
string(1) "9"
|
||||||
string(2) "95"
|
string(1) "9"
|
||||||
string(2) "96"
|
string(1) "9"
|
||||||
string(2) "97"
|
string(1) "9"
|
||||||
string(2) "98"
|
string(1) "9"
|
||||||
string(2) "99"
|
string(1) "9"
|
||||||
string(3) "100"
|
string(1) "1"
|
||||||
string(3) "101"
|
string(1) "1"
|
||||||
string(3) "102"
|
string(1) "1"
|
||||||
string(3) "103"
|
string(1) "1"
|
||||||
string(3) "104"
|
string(1) "1"
|
||||||
string(3) "105"
|
string(1) "1"
|
||||||
string(3) "106"
|
string(1) "1"
|
||||||
string(3) "107"
|
string(1) "1"
|
||||||
string(3) "108"
|
string(1) "1"
|
||||||
string(3) "109"
|
string(1) "1"
|
||||||
string(3) "110"
|
string(1) "1"
|
||||||
string(3) "111"
|
string(1) "1"
|
||||||
string(3) "112"
|
string(1) "1"
|
||||||
string(3) "113"
|
string(1) "1"
|
||||||
string(3) "114"
|
string(1) "1"
|
||||||
string(3) "115"
|
string(1) "1"
|
||||||
string(3) "116"
|
string(1) "1"
|
||||||
string(3) "117"
|
string(1) "1"
|
||||||
string(3) "118"
|
string(1) "1"
|
||||||
string(3) "119"
|
string(1) "1"
|
||||||
string(3) "120"
|
string(1) "1"
|
||||||
string(3) "121"
|
string(1) "1"
|
||||||
string(3) "122"
|
string(1) "1"
|
||||||
string(3) "123"
|
string(1) "1"
|
||||||
string(3) "124"
|
string(1) "1"
|
||||||
string(3) "125"
|
string(1) "1"
|
||||||
string(3) "126"
|
string(1) "1"
|
||||||
string(3) "127"
|
string(1) "1"
|
||||||
string(3) "128"
|
string(1) "1"
|
||||||
string(3) "129"
|
string(1) "1"
|
||||||
string(3) "130"
|
string(1) "1"
|
||||||
string(3) "131"
|
string(1) "1"
|
||||||
string(3) "132"
|
string(1) "1"
|
||||||
string(3) "133"
|
string(1) "1"
|
||||||
string(3) "134"
|
string(1) "1"
|
||||||
string(3) "135"
|
string(1) "1"
|
||||||
string(3) "136"
|
string(1) "1"
|
||||||
string(3) "137"
|
string(1) "1"
|
||||||
string(3) "138"
|
string(1) "1"
|
||||||
string(3) "139"
|
string(1) "1"
|
||||||
string(3) "140"
|
string(1) "1"
|
||||||
string(3) "141"
|
string(1) "1"
|
||||||
string(3) "142"
|
string(1) "1"
|
||||||
string(3) "143"
|
string(1) "1"
|
||||||
string(3) "144"
|
string(1) "1"
|
||||||
string(3) "145"
|
string(1) "1"
|
||||||
string(3) "146"
|
string(1) "1"
|
||||||
string(3) "147"
|
string(1) "1"
|
||||||
string(3) "148"
|
string(1) "1"
|
||||||
string(3) "149"
|
string(1) "1"
|
||||||
string(3) "150"
|
string(1) "1"
|
||||||
string(3) "151"
|
string(1) "1"
|
||||||
string(3) "152"
|
string(1) "1"
|
||||||
string(3) "153"
|
string(1) "1"
|
||||||
string(3) "154"
|
string(1) "1"
|
||||||
string(3) "155"
|
string(1) "1"
|
||||||
string(3) "156"
|
string(1) "1"
|
||||||
string(3) "157"
|
string(1) "1"
|
||||||
string(3) "158"
|
string(1) "1"
|
||||||
string(3) "159"
|
string(1) "1"
|
||||||
string(3) "160"
|
string(1) "1"
|
||||||
string(3) "161"
|
string(1) "1"
|
||||||
string(3) "162"
|
string(1) "1"
|
||||||
string(3) "163"
|
string(1) "1"
|
||||||
string(3) "164"
|
string(1) "1"
|
||||||
string(3) "165"
|
string(1) "1"
|
||||||
string(3) "166"
|
string(1) "1"
|
||||||
string(3) "167"
|
string(1) "1"
|
||||||
string(3) "168"
|
string(1) "1"
|
||||||
string(3) "169"
|
string(1) "1"
|
||||||
string(3) "170"
|
string(1) "1"
|
||||||
string(3) "171"
|
string(1) "1"
|
||||||
string(3) "172"
|
string(1) "1"
|
||||||
string(3) "173"
|
string(1) "1"
|
||||||
string(3) "174"
|
string(1) "1"
|
||||||
string(3) "175"
|
string(1) "1"
|
||||||
string(3) "176"
|
string(1) "1"
|
||||||
string(3) "177"
|
string(1) "1"
|
||||||
string(3) "178"
|
string(1) "1"
|
||||||
string(3) "179"
|
string(1) "1"
|
||||||
string(3) "180"
|
string(1) "1"
|
||||||
string(3) "181"
|
string(1) "1"
|
||||||
string(3) "182"
|
string(1) "1"
|
||||||
string(3) "183"
|
string(1) "1"
|
||||||
string(3) "184"
|
string(1) "1"
|
||||||
string(3) "185"
|
string(1) "1"
|
||||||
string(3) "186"
|
string(1) "1"
|
||||||
string(3) "187"
|
string(1) "1"
|
||||||
string(3) "188"
|
string(1) "1"
|
||||||
string(3) "189"
|
string(1) "1"
|
||||||
string(3) "190"
|
string(1) "1"
|
||||||
string(3) "191"
|
string(1) "1"
|
||||||
string(3) "192"
|
string(1) "1"
|
||||||
string(3) "193"
|
string(1) "1"
|
||||||
string(3) "194"
|
string(1) "1"
|
||||||
string(3) "195"
|
string(1) "1"
|
||||||
string(3) "196"
|
string(1) "1"
|
||||||
string(3) "197"
|
string(1) "1"
|
||||||
string(3) "198"
|
string(1) "1"
|
||||||
string(3) "199"
|
string(1) "1"
|
||||||
Done
|
Done
|
||||||
|
|
|
||||||
|
|
@ -155,104 +155,104 @@ string(2) "96"
|
||||||
string(2) "97"
|
string(2) "97"
|
||||||
string(2) "98"
|
string(2) "98"
|
||||||
string(2) "99"
|
string(2) "99"
|
||||||
string(3) "100"
|
string(2) "10"
|
||||||
string(3) "101"
|
string(2) "10"
|
||||||
string(3) "102"
|
string(2) "10"
|
||||||
string(3) "103"
|
string(2) "10"
|
||||||
string(3) "104"
|
string(2) "10"
|
||||||
string(3) "105"
|
string(2) "10"
|
||||||
string(3) "106"
|
string(2) "10"
|
||||||
string(3) "107"
|
string(2) "10"
|
||||||
string(3) "108"
|
string(2) "10"
|
||||||
string(3) "109"
|
string(2) "10"
|
||||||
string(3) "110"
|
string(2) "11"
|
||||||
string(3) "111"
|
string(2) "11"
|
||||||
string(3) "112"
|
string(2) "11"
|
||||||
string(3) "113"
|
string(2) "11"
|
||||||
string(3) "114"
|
string(2) "11"
|
||||||
string(3) "115"
|
string(2) "11"
|
||||||
string(3) "116"
|
string(2) "11"
|
||||||
string(3) "117"
|
string(2) "11"
|
||||||
string(3) "118"
|
string(2) "11"
|
||||||
string(3) "119"
|
string(2) "11"
|
||||||
string(3) "120"
|
string(2) "12"
|
||||||
string(3) "121"
|
string(2) "12"
|
||||||
string(3) "122"
|
string(2) "12"
|
||||||
string(3) "123"
|
string(2) "12"
|
||||||
string(3) "124"
|
string(2) "12"
|
||||||
string(3) "125"
|
string(2) "12"
|
||||||
string(3) "126"
|
string(2) "12"
|
||||||
string(3) "127"
|
string(2) "12"
|
||||||
string(3) "128"
|
string(2) "12"
|
||||||
string(3) "129"
|
string(2) "12"
|
||||||
string(3) "130"
|
string(2) "13"
|
||||||
string(3) "131"
|
string(2) "13"
|
||||||
string(3) "132"
|
string(2) "13"
|
||||||
string(3) "133"
|
string(2) "13"
|
||||||
string(3) "134"
|
string(2) "13"
|
||||||
string(3) "135"
|
string(2) "13"
|
||||||
string(3) "136"
|
string(2) "13"
|
||||||
string(3) "137"
|
string(2) "13"
|
||||||
string(3) "138"
|
string(2) "13"
|
||||||
string(3) "139"
|
string(2) "13"
|
||||||
string(3) "140"
|
string(2) "14"
|
||||||
string(3) "141"
|
string(2) "14"
|
||||||
string(3) "142"
|
string(2) "14"
|
||||||
string(3) "143"
|
string(2) "14"
|
||||||
string(3) "144"
|
string(2) "14"
|
||||||
string(3) "145"
|
string(2) "14"
|
||||||
string(3) "146"
|
string(2) "14"
|
||||||
string(3) "147"
|
string(2) "14"
|
||||||
string(3) "148"
|
string(2) "14"
|
||||||
string(3) "149"
|
string(2) "14"
|
||||||
string(3) "150"
|
string(2) "15"
|
||||||
string(3) "151"
|
string(2) "15"
|
||||||
string(3) "152"
|
string(2) "15"
|
||||||
string(3) "153"
|
string(2) "15"
|
||||||
string(3) "154"
|
string(2) "15"
|
||||||
string(3) "155"
|
string(2) "15"
|
||||||
string(3) "156"
|
string(2) "15"
|
||||||
string(3) "157"
|
string(2) "15"
|
||||||
string(3) "158"
|
string(2) "15"
|
||||||
string(3) "159"
|
string(2) "15"
|
||||||
string(3) "160"
|
string(2) "16"
|
||||||
string(3) "161"
|
string(2) "16"
|
||||||
string(3) "162"
|
string(2) "16"
|
||||||
string(3) "163"
|
string(2) "16"
|
||||||
string(3) "164"
|
string(2) "16"
|
||||||
string(3) "165"
|
string(2) "16"
|
||||||
string(3) "166"
|
string(2) "16"
|
||||||
string(3) "167"
|
string(2) "16"
|
||||||
string(3) "168"
|
string(2) "16"
|
||||||
string(3) "169"
|
string(2) "16"
|
||||||
string(3) "170"
|
string(2) "17"
|
||||||
string(3) "171"
|
string(2) "17"
|
||||||
string(3) "172"
|
string(2) "17"
|
||||||
string(3) "173"
|
string(2) "17"
|
||||||
string(3) "174"
|
string(2) "17"
|
||||||
string(3) "175"
|
string(2) "17"
|
||||||
string(3) "176"
|
string(2) "17"
|
||||||
string(3) "177"
|
string(2) "17"
|
||||||
string(3) "178"
|
string(2) "17"
|
||||||
string(3) "179"
|
string(2) "17"
|
||||||
string(3) "180"
|
string(2) "18"
|
||||||
string(3) "181"
|
string(2) "18"
|
||||||
string(3) "182"
|
string(2) "18"
|
||||||
string(3) "183"
|
string(2) "18"
|
||||||
string(3) "184"
|
string(2) "18"
|
||||||
string(3) "185"
|
string(2) "18"
|
||||||
string(3) "186"
|
string(2) "18"
|
||||||
string(3) "187"
|
string(2) "18"
|
||||||
string(3) "188"
|
string(2) "18"
|
||||||
string(3) "189"
|
string(2) "18"
|
||||||
string(3) "190"
|
string(2) "19"
|
||||||
string(3) "191"
|
string(2) "19"
|
||||||
string(3) "192"
|
string(2) "19"
|
||||||
string(3) "193"
|
string(2) "19"
|
||||||
string(3) "194"
|
string(2) "19"
|
||||||
string(3) "195"
|
string(2) "19"
|
||||||
string(3) "196"
|
string(2) "19"
|
||||||
string(3) "197"
|
string(2) "19"
|
||||||
string(3) "198"
|
string(2) "19"
|
||||||
string(3) "199"
|
string(2) "19"
|
||||||
Done
|
Done
|
||||||
|
|
|
||||||
|
|
@ -59,194 +59,194 @@ string(1) "6"
|
||||||
string(1) "7"
|
string(1) "7"
|
||||||
string(1) "8"
|
string(1) "8"
|
||||||
string(1) "9"
|
string(1) "9"
|
||||||
string(2) "10"
|
string(1) "1"
|
||||||
string(2) "11"
|
string(1) "1"
|
||||||
string(2) "12"
|
string(1) "1"
|
||||||
string(2) "13"
|
string(1) "1"
|
||||||
string(2) "14"
|
string(1) "1"
|
||||||
string(2) "15"
|
string(1) "1"
|
||||||
string(2) "16"
|
string(1) "1"
|
||||||
string(2) "17"
|
string(1) "1"
|
||||||
string(2) "18"
|
string(1) "1"
|
||||||
string(2) "19"
|
string(1) "1"
|
||||||
string(2) "20"
|
string(1) "2"
|
||||||
string(2) "21"
|
string(1) "2"
|
||||||
string(2) "22"
|
string(1) "2"
|
||||||
string(2) "23"
|
string(1) "2"
|
||||||
string(2) "24"
|
string(1) "2"
|
||||||
string(2) "25"
|
string(1) "2"
|
||||||
string(2) "26"
|
string(1) "2"
|
||||||
string(2) "27"
|
string(1) "2"
|
||||||
string(2) "28"
|
string(1) "2"
|
||||||
string(2) "29"
|
string(1) "2"
|
||||||
string(2) "30"
|
string(1) "3"
|
||||||
string(2) "31"
|
string(1) "3"
|
||||||
string(2) "32"
|
string(1) "3"
|
||||||
string(2) "33"
|
string(1) "3"
|
||||||
string(2) "34"
|
string(1) "3"
|
||||||
string(2) "35"
|
string(1) "3"
|
||||||
string(2) "36"
|
string(1) "3"
|
||||||
string(2) "37"
|
string(1) "3"
|
||||||
string(2) "38"
|
string(1) "3"
|
||||||
string(2) "39"
|
string(1) "3"
|
||||||
string(2) "40"
|
string(1) "4"
|
||||||
string(2) "41"
|
string(1) "4"
|
||||||
string(2) "42"
|
string(1) "4"
|
||||||
string(2) "43"
|
string(1) "4"
|
||||||
string(2) "44"
|
string(1) "4"
|
||||||
string(2) "45"
|
string(1) "4"
|
||||||
string(2) "46"
|
string(1) "4"
|
||||||
string(2) "47"
|
string(1) "4"
|
||||||
string(2) "48"
|
string(1) "4"
|
||||||
string(2) "49"
|
string(1) "4"
|
||||||
string(2) "50"
|
string(1) "5"
|
||||||
string(2) "51"
|
string(1) "5"
|
||||||
string(2) "52"
|
string(1) "5"
|
||||||
string(2) "53"
|
string(1) "5"
|
||||||
string(2) "54"
|
string(1) "5"
|
||||||
string(2) "55"
|
string(1) "5"
|
||||||
string(2) "56"
|
string(1) "5"
|
||||||
string(2) "57"
|
string(1) "5"
|
||||||
string(2) "58"
|
string(1) "5"
|
||||||
string(2) "59"
|
string(1) "5"
|
||||||
string(2) "60"
|
string(1) "6"
|
||||||
string(2) "61"
|
string(1) "6"
|
||||||
string(2) "62"
|
string(1) "6"
|
||||||
string(2) "63"
|
string(1) "6"
|
||||||
string(2) "64"
|
string(1) "6"
|
||||||
string(2) "65"
|
string(1) "6"
|
||||||
string(2) "66"
|
string(1) "6"
|
||||||
string(2) "67"
|
string(1) "6"
|
||||||
string(2) "68"
|
string(1) "6"
|
||||||
string(2) "69"
|
string(1) "6"
|
||||||
string(2) "70"
|
string(1) "7"
|
||||||
string(2) "71"
|
string(1) "7"
|
||||||
string(2) "72"
|
string(1) "7"
|
||||||
string(2) "73"
|
string(1) "7"
|
||||||
string(2) "74"
|
string(1) "7"
|
||||||
string(2) "75"
|
string(1) "7"
|
||||||
string(2) "76"
|
string(1) "7"
|
||||||
string(2) "77"
|
string(1) "7"
|
||||||
string(2) "78"
|
string(1) "7"
|
||||||
string(2) "79"
|
string(1) "7"
|
||||||
string(2) "80"
|
string(1) "8"
|
||||||
string(2) "81"
|
string(1) "8"
|
||||||
string(2) "82"
|
string(1) "8"
|
||||||
string(2) "83"
|
string(1) "8"
|
||||||
string(2) "84"
|
string(1) "8"
|
||||||
string(2) "85"
|
string(1) "8"
|
||||||
string(2) "86"
|
string(1) "8"
|
||||||
string(2) "87"
|
string(1) "8"
|
||||||
string(2) "88"
|
string(1) "8"
|
||||||
string(2) "89"
|
string(1) "8"
|
||||||
string(2) "90"
|
string(1) "9"
|
||||||
string(2) "91"
|
string(1) "9"
|
||||||
string(2) "92"
|
string(1) "9"
|
||||||
string(2) "93"
|
string(1) "9"
|
||||||
string(2) "94"
|
string(1) "9"
|
||||||
string(2) "95"
|
string(1) "9"
|
||||||
string(2) "96"
|
string(1) "9"
|
||||||
string(2) "97"
|
string(1) "9"
|
||||||
string(2) "98"
|
string(1) "9"
|
||||||
string(2) "99"
|
string(1) "9"
|
||||||
string(3) "100"
|
string(1) "1"
|
||||||
string(3) "101"
|
string(1) "1"
|
||||||
string(3) "102"
|
string(1) "1"
|
||||||
string(3) "103"
|
string(1) "1"
|
||||||
string(3) "104"
|
string(1) "1"
|
||||||
string(3) "105"
|
string(1) "1"
|
||||||
string(3) "106"
|
string(1) "1"
|
||||||
string(3) "107"
|
string(1) "1"
|
||||||
string(3) "108"
|
string(1) "1"
|
||||||
string(3) "109"
|
string(1) "1"
|
||||||
string(3) "110"
|
string(1) "1"
|
||||||
string(3) "111"
|
string(1) "1"
|
||||||
string(3) "112"
|
string(1) "1"
|
||||||
string(3) "113"
|
string(1) "1"
|
||||||
string(3) "114"
|
string(1) "1"
|
||||||
string(3) "115"
|
string(1) "1"
|
||||||
string(3) "116"
|
string(1) "1"
|
||||||
string(3) "117"
|
string(1) "1"
|
||||||
string(3) "118"
|
string(1) "1"
|
||||||
string(3) "119"
|
string(1) "1"
|
||||||
string(3) "120"
|
string(1) "1"
|
||||||
string(3) "121"
|
string(1) "1"
|
||||||
string(3) "122"
|
string(1) "1"
|
||||||
string(3) "123"
|
string(1) "1"
|
||||||
string(3) "124"
|
string(1) "1"
|
||||||
string(3) "125"
|
string(1) "1"
|
||||||
string(3) "126"
|
string(1) "1"
|
||||||
string(3) "127"
|
string(1) "1"
|
||||||
string(3) "128"
|
string(1) "1"
|
||||||
string(3) "129"
|
string(1) "1"
|
||||||
string(3) "130"
|
string(1) "1"
|
||||||
string(3) "131"
|
string(1) "1"
|
||||||
string(3) "132"
|
string(1) "1"
|
||||||
string(3) "133"
|
string(1) "1"
|
||||||
string(3) "134"
|
string(1) "1"
|
||||||
string(3) "135"
|
string(1) "1"
|
||||||
string(3) "136"
|
string(1) "1"
|
||||||
string(3) "137"
|
string(1) "1"
|
||||||
string(3) "138"
|
string(1) "1"
|
||||||
string(3) "139"
|
string(1) "1"
|
||||||
string(3) "140"
|
string(1) "1"
|
||||||
string(3) "141"
|
string(1) "1"
|
||||||
string(3) "142"
|
string(1) "1"
|
||||||
string(3) "143"
|
string(1) "1"
|
||||||
string(3) "144"
|
string(1) "1"
|
||||||
string(3) "145"
|
string(1) "1"
|
||||||
string(3) "146"
|
string(1) "1"
|
||||||
string(3) "147"
|
string(1) "1"
|
||||||
string(3) "148"
|
string(1) "1"
|
||||||
string(3) "149"
|
string(1) "1"
|
||||||
string(3) "150"
|
string(1) "1"
|
||||||
string(3) "151"
|
string(1) "1"
|
||||||
string(3) "152"
|
string(1) "1"
|
||||||
string(3) "153"
|
string(1) "1"
|
||||||
string(3) "154"
|
string(1) "1"
|
||||||
string(3) "155"
|
string(1) "1"
|
||||||
string(3) "156"
|
string(1) "1"
|
||||||
string(3) "157"
|
string(1) "1"
|
||||||
string(3) "158"
|
string(1) "1"
|
||||||
string(3) "159"
|
string(1) "1"
|
||||||
string(3) "160"
|
string(1) "1"
|
||||||
string(3) "161"
|
string(1) "1"
|
||||||
string(3) "162"
|
string(1) "1"
|
||||||
string(3) "163"
|
string(1) "1"
|
||||||
string(3) "164"
|
string(1) "1"
|
||||||
string(3) "165"
|
string(1) "1"
|
||||||
string(3) "166"
|
string(1) "1"
|
||||||
string(3) "167"
|
string(1) "1"
|
||||||
string(3) "168"
|
string(1) "1"
|
||||||
string(3) "169"
|
string(1) "1"
|
||||||
string(3) "170"
|
string(1) "1"
|
||||||
string(3) "171"
|
string(1) "1"
|
||||||
string(3) "172"
|
string(1) "1"
|
||||||
string(3) "173"
|
string(1) "1"
|
||||||
string(3) "174"
|
string(1) "1"
|
||||||
string(3) "175"
|
string(1) "1"
|
||||||
string(3) "176"
|
string(1) "1"
|
||||||
string(3) "177"
|
string(1) "1"
|
||||||
string(3) "178"
|
string(1) "1"
|
||||||
string(3) "179"
|
string(1) "1"
|
||||||
string(3) "180"
|
string(1) "1"
|
||||||
string(3) "181"
|
string(1) "1"
|
||||||
string(3) "182"
|
string(1) "1"
|
||||||
string(3) "183"
|
string(1) "1"
|
||||||
string(3) "184"
|
string(1) "1"
|
||||||
string(3) "185"
|
string(1) "1"
|
||||||
string(3) "186"
|
string(1) "1"
|
||||||
string(3) "187"
|
string(1) "1"
|
||||||
string(3) "188"
|
string(1) "1"
|
||||||
string(3) "189"
|
string(1) "1"
|
||||||
string(3) "190"
|
string(1) "1"
|
||||||
string(3) "191"
|
string(1) "1"
|
||||||
string(3) "192"
|
string(1) "1"
|
||||||
string(3) "193"
|
string(1) "1"
|
||||||
string(3) "194"
|
string(1) "1"
|
||||||
string(3) "195"
|
string(1) "1"
|
||||||
string(3) "196"
|
string(1) "1"
|
||||||
string(3) "197"
|
string(1) "1"
|
||||||
string(3) "198"
|
string(1) "1"
|
||||||
string(3) "199"
|
string(1) "1"
|
||||||
Done
|
Done
|
||||||
|
|
|
||||||
96
ext/oci8/tests/bug72524.phpt
Normal file
96
ext/oci8/tests/bug72524.phpt
Normal file
|
|
@ -0,0 +1,96 @@
|
||||||
|
--TEST--
|
||||||
|
Bug #72524 (Binding null values triggers ORA-24816 error)
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
$target_dbs = array('oracledb' => true, 'timesten' => true); // test runs on these DBs
|
||||||
|
require(dirname(__FILE__).'/skipif.inc');
|
||||||
|
?>
|
||||||
|
--FILE--
|
||||||
|
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require(dirname(__FILE__).'/connect.inc');
|
||||||
|
|
||||||
|
// Initialize
|
||||||
|
|
||||||
|
$stmtarray = array(
|
||||||
|
"CREATE TABLE mytable (clob_col CLOB DEFAULT NULL, varchar2_col VARCHAR2(255) DEFAULT NULL)"
|
||||||
|
);
|
||||||
|
|
||||||
|
oci8_test_sql_execute($c, $stmtarray);
|
||||||
|
|
||||||
|
// Run test
|
||||||
|
|
||||||
|
$sql = "INSERT INTO mytable VALUES (:clob_col, :varchar2_col)";
|
||||||
|
|
||||||
|
echo "Test 1 - P1 Value: NULL P1 Length: Default P1 Type: Default P2 Value: NULL P2 Length: Default P2 Type: Default\n";
|
||||||
|
$stmt = oci_parse($c, $sql);
|
||||||
|
|
||||||
|
$clob = NULL;
|
||||||
|
$varchar2 = NULL;
|
||||||
|
oci_bind_by_name($stmt, ':clob_col', $clob);
|
||||||
|
oci_bind_by_name($stmt, ':varchar2_col', $varchar2);
|
||||||
|
|
||||||
|
var_dump(oci_execute($stmt));
|
||||||
|
|
||||||
|
echo "Test 2 - P1 Value: '' P1 Length: Default P1 Type: Default P2 Value: '' P2 Length: Default P2 Type: Default\n";
|
||||||
|
|
||||||
|
$clob = '';
|
||||||
|
$varchar2 = '';
|
||||||
|
oci_bind_by_name($stmt, ':clob_col', $clob);
|
||||||
|
oci_bind_by_name($stmt, ':varchar2_col', $varchar2);
|
||||||
|
|
||||||
|
var_dump(oci_execute($stmt));
|
||||||
|
|
||||||
|
echo "Test 3 - P1 Value: 'abc' P1 Length: 0 P1 Type: Default P2 Value: '' P2 Length: 0 P2 Type: Default\n";
|
||||||
|
$clob = 'abc';
|
||||||
|
$varchar2 = 'abc';
|
||||||
|
oci_bind_by_name($stmt, ':clob_col', $clob, 0);
|
||||||
|
oci_bind_by_name($stmt, ':varchar2_col', $varchar2, 0);
|
||||||
|
|
||||||
|
var_dump(oci_execute($stmt));
|
||||||
|
|
||||||
|
echo "Test 4 - P1 Value: NULL P1 Length: -1 P1 Type: SQLT_LNG P2 Value: NULL P2 Length: -1 P2 Type:Default\n";
|
||||||
|
$clob = NULL;
|
||||||
|
$varchar2 = NULL;
|
||||||
|
oci_bind_by_name($stmt, ':clob_col', $clob, -1, SQLT_LNG);
|
||||||
|
oci_bind_by_name($stmt, ':varchar2_col', $varchar2, -1, SQLT_LNG);
|
||||||
|
|
||||||
|
var_dump(oci_execute($stmt));
|
||||||
|
|
||||||
|
echo "Test 5 - P1 Value: NULL P1 Length: 0 P1 Type: SQLT_LNG P2 Value: NULL P2 Length: 0 P2 Type:Default\n";
|
||||||
|
$clob = NULL;
|
||||||
|
$varchar2 = NULL;
|
||||||
|
oci_bind_by_name($stmt, ':clob_col', $clob, 0, SQLT_LNG);
|
||||||
|
oci_bind_by_name($stmt, ':varchar2_col', $varchar2, 0, SQLT_LNG);
|
||||||
|
|
||||||
|
|
||||||
|
var_dump(oci_execute($stmt));
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
|
||||||
|
$stmtarray = array(
|
||||||
|
"DROP TABLE mytable"
|
||||||
|
);
|
||||||
|
|
||||||
|
oci8_test_sql_execute($c, $stmtarray);
|
||||||
|
|
||||||
|
?>
|
||||||
|
===DONE===
|
||||||
|
<?php exit(0); ?>
|
||||||
|
--EXPECTF--
|
||||||
|
Test 1 - P1 Value: NULL P1 Length: Default P1 Type: Default P2 Value: NULL P2 Length: Default P2 Type: Default
|
||||||
|
bool(true)
|
||||||
|
Test 2 - P1 Value: '' P1 Length: Default P1 Type: Default P2 Value: '' P2 Length: Default P2 Type: Default
|
||||||
|
bool(true)
|
||||||
|
Test 3 - P1 Value: 'abc' P1 Length: 0 P1 Type: Default P2 Value: '' P2 Length: 0 P2 Type: Default
|
||||||
|
bool(true)
|
||||||
|
Test 4 - P1 Value: NULL P1 Length: -1 P1 Type: SQLT_LNG P2 Value: NULL P2 Length: -1 P2 Type:Default
|
||||||
|
|
||||||
|
Warning: oci_execute(): ORA-24816: %s in %s on line %d
|
||||||
|
bool(false)
|
||||||
|
Test 5 - P1 Value: NULL P1 Length: 0 P1 Type: SQLT_LNG P2 Value: NULL P2 Length: 0 P2 Type:Default
|
||||||
|
|
||||||
|
Warning: oci_execute(): ORA-24816: %s in %s on line %d
|
||||||
|
bool(false)
|
||||||
|
===DONE===
|
||||||
Loading…
Add table
Add a link
Reference in a new issue