From: Wez Furlong <wez@php.net>
Date: Fri, 21 May 2004 14:15:03 +0000 (+0000)
Subject: Update for placeholder flags
X-Git-Tag: RELEASE_0_1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64f0ec7bde2252ed09f95b6dee4cafb62149c7df;p=php

Update for placeholder flags
---

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index fb959f9992..6cb2dde99c 100755
--- 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 9ec4e0074d..b81736e9e3 100755
--- 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 c3480c1729..d6d42e7a26 100755
--- 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 99b1c64edf..95ceff294d 100644
--- 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;