Update for placeholder flags

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index fb959f99921567b6a89203bd4b9d3ef54f18a5ef..6cb2dde99ce821d05c147a527387dd3b20614cae 100755 (executable)
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -299,9 +299,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 
        dbh->methods = &mysql_methods;
        dbh->alloc_own_columns = 1;
-       dbh->supports_placeholders = 1;
-       dbh->emulate_prepare = 1;
-       dbh->placeholders_can_be_strings = 1;
+       dbh->supports_placeholders = 0;
        dbh->max_escaped_char_length = 2;
 
        ret = 1;

diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index 9ec4e0074d20e074400697759c3508de145e3b55..b81736e9e354eec655008993b3bb7ba4bddaf047 100755 (executable)
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -433,8 +433,7 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC
        
        dbh->methods = &oci_methods;
        dbh->alloc_own_columns = 1;
-       dbh->supports_placeholders = 1;
-       dbh->placeholders_can_be_strings = 1;
+       dbh->supports_placeholders = PDO_PLACEHOLDER_NAMED;
        dbh->native_case = PDO_CASE_UPPER;
 
        ret = 1;

diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index c3480c1729011397b1455ca08a38e6c904a2500b..d6d42e7a26cfd2f6f297fe461e1a9297eecf334d 100755 (executable)
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
@@ -94,7 +94,7 @@ static int odbc_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, p
        return 1;
 }
 
-static int odbc_handle_doer(pdo_dbh_t *dbh, const char *sql TSRMLS_DC)
+static int odbc_handle_doer(pdo_dbh_t *dbh, const char *sql, long sql_len TSRMLS_DC)
 {
        pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data;
 
@@ -223,11 +223,11 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_D
                return 0;
        }
 
-       /* TODO: if we want to play nicely, we should check to see if the driver supports ODBC v3 or not */
+       /* TODO: if we want to play nicely, we should check to see if the driver really supports ODBC v3 or not */
 
        dbh->methods = &odbc_methods;
        dbh->alloc_own_columns = 1;
-       dbh->supports_placeholders = 1;
+       dbh->supports_placeholders = PDO_PLACEHOLDER_POSITIONAL;
        
        return 1;
 }

diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index 99b1c64edff33c9210d2974d959b335d4bb05807..95ceff294de64650158adc82512087a1066021e8 100644 (file)
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -277,9 +277,7 @@ static int pdo_pgsql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 
        dbh->methods = &pgsql_methods;
        dbh->alloc_own_columns = 1;
-       dbh->supports_placeholders = 1;
-       dbh->emulate_prepare = 1;
-       dbh->placeholders_can_be_strings = 1;
+       dbh->supports_placeholders = PDO_PLACEHOLDER_NONE;
        dbh->max_escaped_char_length = 2;
 
        ret = 1;