diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-26 14:17:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-26 14:17:45 +0800 |
| commit | 9fa9da483129b53b35b2c2106c17f8a7a5b402f6 (patch) | |
| tree | 25feb4c0dbefdc46b7d85a60fc6cb5ef0c9df6c1 /ext/pdo/php_pdo_driver.h | |
| parent | 066c1d5451a33c652e23a59e6455dca331007919 (diff) | |
| download | php-git-9fa9da483129b53b35b2c2106c17f8a7a5b402f6.tar.gz | |
Finished persistent PDO implement
Diffstat (limited to 'ext/pdo/php_pdo_driver.h')
| -rw-r--r-- | ext/pdo/php_pdo_driver.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index 0326eaa5a1..4818bc6232 100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h @@ -24,9 +24,10 @@ #include "php_pdo.h" /* forward declarations */ -typedef struct _pdo_dbh_t pdo_dbh_t; -typedef struct _pdo_stmt_t pdo_stmt_t; -typedef struct _pdo_row_t pdo_row_t; +typedef struct _pdo_dbh_t pdo_dbh_t; +typedef struct _pdo_dbh_object_t pdo_dbh_object_t; +typedef struct _pdo_stmt_t pdo_stmt_t; +typedef struct _pdo_row_t pdo_row_t; struct pdo_bound_param_data; #ifdef PHP_WIN32 @@ -425,7 +426,6 @@ enum pdo_placeholder_support { PDO_PLACEHOLDER_POSITIONAL=2 }; -/* represents a connection to a database */ struct _pdo_dbh_t { /* driver specific methods */ struct pdo_dbh_methods *methods; @@ -501,7 +501,11 @@ struct _pdo_dbh_t { /* defaults for fetches */ enum pdo_fetch_type default_fetch_type; +}; +/* represents a connection to a database */ +struct _pdo_dbh_object_t { + pdo_dbh_t *inner; /* these items must appear in this order at the beginning of the struct so that this can be cast as a zend_object. we need this to allow the extending class to escape all the custom handlers @@ -510,11 +514,16 @@ struct _pdo_dbh_t { zend_object std; }; -static inline pdo_dbh_t *php_pdo_dbh_fetch_object(zend_object *obj) { - return (pdo_dbh_t *)((char*)(obj) - XtOffsetOf(pdo_dbh_t, std)); +static inline pdo_dbh_t *php_pdo_dbh_fetch_inner(zend_object *obj) { + return (pdo_dbh_t *)(((pdo_dbh_object_t *)((char*)(obj) - XtOffsetOf(pdo_dbh_object_t, std)))->inner); +} + +static inline pdo_dbh_object_t *php_pdo_dbh_fetch_object(zend_object *obj) { + return (pdo_dbh_object_t *)((char*)(obj) - XtOffsetOf(pdo_dbh_object_t, std)); } -#define Z_PDO_DBH_P(zv) php_pdo_dbh_fetch_object(Z_OBJ_P((zv))) +#define Z_PDO_DBH_P(zv) php_pdo_dbh_fetch_inner(Z_OBJ_P((zv))) +#define Z_PDO_OBJECT_P(zv) php_pdo_dbh_fetch_object(Z_OBJ_P((zv))) /* describes a column */ struct pdo_column_data { |