Remove bogus scroll attribute.

Expose cursor constants to the script

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 9b2daf19bf98045f0292274effdc7373975e5350..37ec230803afbaa736f52cb0520f5a10a0ffe627 100755 (executable)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -234,7 +234,6 @@ PHP_MINIT_FUNCTION(pdo)
        REGISTER_LONG_CONSTANT("PDO_FETCH_INTO", (long)PDO_FETCH_INTO,  CONST_CS|CONST_PERSISTENT);
 
        REGISTER_LONG_CONSTANT("PDO_ATTR_AUTOCOMMIT",   (long)PDO_ATTR_AUTOCOMMIT,      CONST_CS|CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("PDO_ATTR_SCROLL",               (long)PDO_ATTR_SCROLL,          CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_ATTR_PREFETCH",             (long)PDO_ATTR_PREFETCH,        CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_ATTR_TIMEOUT",              (long)PDO_ATTR_TIMEOUT,         CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_ATTR_ERRMODE",              (long)PDO_ATTR_ERRMODE,         CONST_CS|CONST_PERSISTENT);
@@ -264,6 +263,9 @@ PHP_MINIT_FUNCTION(pdo)
        REGISTER_LONG_CONSTANT("PDO_FETCH_ORI_LAST", (long)PDO_FETCH_ORI_LAST, CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_FETCH_ORI_ABS", (long)PDO_FETCH_ORI_ABS, CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_FETCH_ORI_REL", (long)PDO_FETCH_ORI_REL, CONST_CS|CONST_PERSISTENT);
+       
+       REGISTER_LONG_CONSTANT("PDO_CURSOR_FWDONLY", (long)PDO_CURSOR_FWDONLY,CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("PDO_CURSOR_SCROLL", (long)PDO_CURSOR_SCROLL,CONST_CS|CONST_PERSISTENT);
 
 #if 0
        REGISTER_LONG_CONSTANT("PDO_ERR_CANT_MAP",                      (long)PDO_ERR_CANT_MAP,         CONST_CS|CONST_PERSISTENT);

diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index ed853f49ed6bb18737e4787aedcfc63a704c5792..cefa08ee60d6c51891f248b641093931a7773ad8 100755 (executable)
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
@@ -72,8 +72,7 @@ enum pdo_fetch_orientation {
 
 enum pdo_attribute_type {
        PDO_ATTR_AUTOCOMMIT,    /* use to turn on or off auto-commit mode */
-       PDO_ATTR_SCROLL,                /* ask for a scrollable cursor (when you prepare()) */
-       PDO_ATTR_PREFETCH,              /* configure the prefetch size for drivers that support it */
+       PDO_ATTR_PREFETCH,              /* configure the prefetch size for drivers that support it. Size is in KB */
        PDO_ATTR_TIMEOUT,               /* connection timeout in seconds */
        PDO_ATTR_ERRMODE,               /* control how errors are handled */
        PDO_ATTR_SERVER_VERSION,        /* database server version */