diff options
| -rw-r--r-- | adodb.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-ibase.inc.php | 25 | ||||
| -rw-r--r-- | drivers/adodb-postgres7.inc.php | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/adodb.inc.php b/adodb.inc.php index ac7f1971..6d9ae010 100644 --- a/adodb.inc.php +++ b/adodb.inc.php @@ -4512,7 +4512,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 global $ADODB_NEWCONNECTION, $ADODB_LASTDB; if (!defined('ADODB_ASSOC_CASE')) { - define('ADODB_ASSOC_CASE',2); + define('ADODB_ASSOC_CASE', ADODB_ASSOC_CASE_NATIVE); } $errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false; if (($at = strpos($db,'://')) !== FALSE) { diff --git a/drivers/adodb-ibase.inc.php b/drivers/adodb-ibase.inc.php index da8332e3..8ffa843b 100644 --- a/drivers/adodb-ibase.inc.php +++ b/drivers/adodb-ibase.inc.php @@ -777,20 +777,21 @@ class ADORecordset_ibase extends ADORecordSet $fld = new ADOFieldObject; $ibf = ibase_field_info($this->_queryID,$fieldOffset); + $name = empty($ibf['alias']) ? $ibf['name'] : $ibf['alias']; + switch (ADODB_ASSOC_CASE) { - case 2: // the default - $fld->name = ($ibf['alias']); - if (empty($fld->name)) $fld->name = ($ibf['name']); - break; - case 0: - $fld->name = strtoupper($ibf['alias']); - if (empty($fld->name)) $fld->name = strtoupper($ibf['name']); - break; - case 1: - $fld->name = strtolower($ibf['alias']); - if (empty($fld->name)) $fld->name = strtolower($ibf['name']); - break; + case ADODB_ASSOC_CASE_UPPER: + $fld->name = strtoupper($name); + break; + case ADODB_ASSOC_CASE_LOWER: + $fld->name = strtolower($name); + break; + case ADODB_ASSOC_CASE_NATIVE: + default: + $fld->name = $name; + break; } + $fld->type = $ibf['type']; $fld->max_length = $ibf['length']; diff --git a/drivers/adodb-postgres7.inc.php b/drivers/adodb-postgres7.inc.php index bc37582e..5a975797 100644 --- a/drivers/adodb-postgres7.inc.php +++ b/drivers/adodb-postgres7.inc.php @@ -96,7 +96,7 @@ class ADODB_postgres7 extends ADODB_postgres64 { function __construct() { parent::__construct(); - if (ADODB_ASSOC_CASE !== 2) { + if (ADODB_ASSOC_CASE !== ADODB_ASSOC_CASE_NATIVE) { $this->rsPrefix .= 'assoc_'; } $this->_bindInputArray = PHP_VERSION >= 5.1; |