cvs: pear /MDB2/MDB2/Driver/Datatype oci8.php
| From: | Lukas Smith | Date: | Wed, 15 Feb 2006 19:05:49 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver/Datatype oci8.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-38265@lists.php.net to get a copy of this message | ||
lsmith Wed Feb 15 19:05:49 2006 UTC
Modified files:
/pear/MDB2/MDB2/Driver/Datatype oci8.php
Log:
- cleanups
http://cvs.php.net/viewcvs.cgi/pear/MDB2/MDB2/Driver/Datatype/oci8.php?r1=1.40&r2=1.41&diff_format=u
Index: pear/MDB2/MDB2/Driver/Datatype/oci8.php
diff -u pear/MDB2/MDB2/Driver/Datatype/oci8.php:1.40 pear/MDB2/MDB2/Driver/Datatype/oci8.php:1.41
--- pear/MDB2/MDB2/Driver/Datatype/oci8.php:1.40 Wed Feb 15 16:24:18 2006
+++ pear/MDB2/MDB2/Driver/Datatype/oci8.php Wed Feb 15 19:05:49 2006
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
-// $Id: oci8.php,v 1.40 2006/02/15 16:24:18 justinpatrin Exp $
+// $Id: oci8.php,v 1.41 2006/02/15 19:05:49 lsmith Exp $
require_once 'MDB2/Driver/Datatype/Common.php';
@@ -291,20 +291,11 @@
function mapNativeDatatype($field)
{
$db_type = strtolower($field['type']);
- //?
- $db_type = strtok($db_type, '(), ');
- if ($db_type == 'national') {
- $db_type = strtok('(), ');
- }
- if (array_key_exists('data_length', $field)) {
- $length = $field['data_length'];
- $decimal = '';
- } else {
- $length = strtok('(), ');
- $decimal = strtok('(), ');
- }
$type = array();
- $unsigned = null;
+ $length = $unsigned = null;
+ if (array_key_exists('length', $field)) {
+ $length = $field['length'];
+ }
switch ($db_type) {
case 'integer':
case 'pls_integer':
@@ -316,7 +307,6 @@
$type = array_reverse($type);
}
}
- $unsigned = preg_match('/ unsigned/i', $db_type);
break;
case 'varchar':
case 'varchar2':
@@ -332,7 +322,6 @@
break;
case 'float':
$type[] = 'float';
- $unsigned = preg_match('/ unsigned/i', $db_type);
break;
case 'number':
if (strpos($length, ',') === false) {
@@ -340,7 +329,6 @@
} else {
$type[] = 'decimal';
}
- $unsigned = preg_match('/ unsigned/i', $db_type);
break;
case 'long':
if ($decimal == 'binary') {