Commit f5f3b0d2 authored by doctrine's avatar doctrine

Support for uppercase columns

parent bcf9ca78
...@@ -509,11 +509,7 @@ class Doctrine_Query extends Doctrine_Access { ...@@ -509,11 +509,7 @@ class Doctrine_Query extends Doctrine_Access {
*/ */
public function parseData(PDOStatement $stmt) { public function parseData(PDOStatement $stmt) {
$array = array(); $array = array();
$keys = array();
foreach(array_keys($this->tables) as $key) {
$k = strtolower($key);
$keys[$k] = $key;
}
while($data = $stmt->fetch(PDO::FETCH_ASSOC)): while($data = $stmt->fetch(PDO::FETCH_ASSOC)):
/** /**
* parse the data into two-dimensional array * parse the data into two-dimensional array
...@@ -522,7 +518,7 @@ class Doctrine_Query extends Doctrine_Access { ...@@ -522,7 +518,7 @@ class Doctrine_Query extends Doctrine_Access {
$e = explode("__",$key); $e = explode("__",$key);
if(count($e) > 1) { if(count($e) > 1) {
$data[$keys[$e[0]]][$e[1]] = $value; $data[$e[0]][$e[1]] = $value;
} else { } else {
$data[0][$e[0]] = $value; $data[0][$e[0]] = $value;
} }
......
...@@ -82,7 +82,7 @@ abstract class Doctrine_Session extends Doctrine_Configurable implements Countab ...@@ -82,7 +82,7 @@ abstract class Doctrine_Session extends Doctrine_Configurable implements Countab
$this->setParent($manager); $this->setParent($manager);
$this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); $this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
switch($this->getAttribute(Doctrine::ATTR_CACHE)): switch($this->getAttribute(Doctrine::ATTR_CACHE)):
......
...@@ -272,6 +272,32 @@ class ORM_TestItem extends Doctrine_Record { ...@@ -272,6 +272,32 @@ class ORM_TestItem extends Doctrine_Record {
$this->hasOne("ORM_TestEntry", "ORM_TestEntry.itemID"); $this->hasOne("ORM_TestEntry", "ORM_TestEntry.itemID");
} }
} }
class ORM_AccessControl extends Doctrine_Record {
public function setTableDefinition() {
$this->hasColumn("name", "string", 255);
}
public function setUp() {
$this->hasMany("ORM_AccessGroup as accessGroups", "ORM_AccessControlsGroups.accessGroupID");
}
}
class ORM_AccessGroup extends Doctrine_Record {
public function setTableDefinition() {
$this->hasColumn("name", "string", 255);
}
public function setUp() {
$this->hasMany("ORM_AccessControl as accessControls", "ORM_AccessControlsGroups.accessControlID");
}
}
class ORM_AccessControlsGroups extends Doctrine_Record {
public function setTableDefinition() {
$this->hasColumn("accessControlID", "integer", 11);
$this->hasColumn("accessGroupID", "integer", 11);
$this->setPrimaryKey(array("accessControlID", "accessGroupID"));
}
}
class Log_Entry extends Doctrine_Record { class Log_Entry extends Doctrine_Record {
public function setTableDefinition() { public function setTableDefinition() {
$this->hasColumn("stamp", "timestamp"); $this->hasColumn("stamp", "timestamp");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment