cvs: pear /MDB manager.php
| From: | Lukas Smith | Date: | Tue, 27 Aug 2002 09:22:01 +0000 |
| Subject: | cvs: pear /MDB manager.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-6007@lists.php.net to get a copy of this message | ||
lsmith Tue Aug 27 05:22:01 2002 EDT
Modified files:
/pear/MDB manager.php
Log:
decided to not force lowercase on database, table, field, index and sequence names afterall
(instead it will be documented to rather use lowercase because this creates issues with for example
mysql on windows)
Index: pear/MDB/manager.php
diff -u pear/MDB/manager.php:1.47 pear/MDB/manager.php:1.48
--- pear/MDB/manager.php:1.47 Mon Aug 26 09:35:12 2002
+++ pear/MDB/manager.php Tue Aug 27 05:22:00 2002
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@dybnet.de> |
// +----------------------------------------------------------------------+
//
-// $Id: manager.php,v 1.47 2002/08/26 13:35:12 lsmith Exp $
+// $Id: manager.php,v 1.48 2002/08/27 09:22:00 lsmith Exp $
//
require_once 'PEAR.php';
@@ -1626,7 +1626,7 @@
return ('it was not specified a valid database name');
}
$this->database_definition = array(
- 'name' => strtolower($database),
+ 'name' => $database,
'create' => 1,
'TABLES' => array()
);
@@ -1643,8 +1643,8 @@
$this->database_definition['TABLES'][$table_name] =
array('FIELDS' => array());
for($field = 0; $field < count($fields); $field++)
{
- $field_name = strtolower($fields[$field]);
- $definition = $this->database->getTableFieldDefinition($table_name,
$fields[$field]);
+ $field_name = $fields[$field];
+ $definition = $this->database->getTableFieldDefinition($table_name,
$field_name);
if (MDB::isError($definition)) {
return ($definition);
}
@@ -1707,7 +1707,7 @@
if (MDB::isError($indexes)) {
return($indexes);
}
-
if(!isset($this->database_definition['TABLES'][$table_name]['INDEXES'])) {
+ if(is_array($indexes) &&
!isset($this->database_definition['TABLES'][$table_name]['INDEXES'])) {
$this->database_definition['TABLES'][$table_name]['INDEXES']
= array();
}
for($index = 0, $index_cnt = count($indexes); $index < $index_cnt; $index++)
@@ -1717,14 +1717,14 @@
if (MDB::isError($definition)) {
return($definition);
}
- $this->database_definition['TABLES'][$table_name]['INDEXES']
= $definition;
+
$this->database_definition['TABLES'][$table_name]['INDEXES'][$index_name] =
$definition;
}
}
$sequences = $this->database->listSequences();
if (MDB::isError($sequences)) {
return ($sequences);
}
- if(!isset($this->database_definition['SEQUENCES'])) {
+ if(is_array($sequences) &&
!isset($this->database_definition['SEQUENCES'])) {
$this->database_definition['SEQUENCES'] = array();
}
for($sequence = 0; $sequence < count($sequences); $sequence++) {
@@ -1733,7 +1733,7 @@
if (MDB::isError($definition)) {
return($definition);
}
- $this->database_definition['SEQUENCES'] = $definition;
+ $this->database_definition['SEQUENCES'][$sequence_name] = $definition;
}
return(DB_OK);
}