Commit de5ca086 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Database.php: changed getTableDefinition() from PDO to sql

parent 3ac5ffb6
...@@ -162,15 +162,7 @@ class Database { ...@@ -162,15 +162,7 @@ class Database {
* @return array column definition of table as returned by SHOW FIELDS FROM as associative array. * @return array column definition of table as returned by SHOW FIELDS FROM as associative array.
*/ */
public function getTableDefinition($table) { public function getTableDefinition($table) {
$statement = $this->pdo->query("SHOW FIELDS FROM `$table`"); return $this->sql("SHOW FIELDS FROM `$table`");
return $statement->fetchAll(\PDO::FETCH_ASSOC);
}
/**
* @return mixed
*/
public function getLastInsertId() {
return $this->pdo->lastInsertId();
} }
/** /**
...@@ -293,4 +285,11 @@ class Database { ...@@ -293,4 +285,11 @@ class Database {
return $this->stmt->fetch(\PDO::FETCH_ASSOC); return $this->stmt->fetch(\PDO::FETCH_ASSOC);
} }
/**
* @return mixed
*/
public function getLastInsertId() {
return $this->pdo->lastInsertId();
}
} }
\ No newline at end of file
DROP TABLE IF EXISTS Person; DROP TABLE IF EXISTS Person;
CREATE TABLE person ( CREATE TABLE Person (
id BIGINT AUTO_INCREMENT PRIMARY KEY, id BIGINT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(128), name VARCHAR(128),
firstname VARCHAR(128), firstname VARCHAR(128),
gender ENUM('', 'male', 'female') NOT NULL DEFAULT '', gender ENUM('', 'male', 'female') NOT NULL DEFAULT 'male',
groups SET('', 'a', 'b', 'c') NOT NULL DEFAULT '' groups SET('', 'a', 'b', 'c') NOT NULL DEFAULT ''
); );
...@@ -14,8 +14,8 @@ INSERT INTO Person (id, name, firstname, gender, groups) VALUES ...@@ -14,8 +14,8 @@ INSERT INTO Person (id, name, firstname, gender, groups) VALUES
(NULL, 'Smith', 'Jane', 'female', 'a,c'); (NULL, 'Smith', 'Jane', 'female', 'a,c');
DROP TABLE IF EXISTS address; DROP TABLE IF EXISTS Address;
CREATE TABLE address ( CREATE TABLE Address (
id BIGINT AUTO_INCREMENT PRIMARY KEY, id BIGINT AUTO_INCREMENT PRIMARY KEY,
person_id BIGINT, person_id BIGINT,
street VARCHAR(128), street VARCHAR(128),
...@@ -24,8 +24,8 @@ CREATE TABLE address ( ...@@ -24,8 +24,8 @@ CREATE TABLE address (
gr_id_typ BIGINT gr_id_typ BIGINT
); );
DROP TABLE IF EXISTS gruppe; DROP TABLE IF EXISTS Gruppe;
CREATE TABLE gruppe ( CREATE TABLE Gruppe (
id BIGINT AUTO_INCREMENT PRIMARY KEY, id BIGINT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(255), name VARCHAR(255),
value VARCHAR(255), value VARCHAR(255),
......
...@@ -171,12 +171,12 @@ class DatabaseTest extends AbstractDatabaseTest { ...@@ -171,12 +171,12 @@ class DatabaseTest extends AbstractDatabaseTest {
* *
*/ */
public function testGetSetValueList() { public function testGetSetValueList() {
$valueList = $this->db->getEnumSetValueList('person', 'gender'); $valueList = $this->db->getEnumSetValueList('Person', 'gender');
$expected = [0 => '', 1 => 'male', 2 => 'female']; $expected = [0 => '', 1 => 'male', 2 => 'female'];
$this->assertEquals($expected, $valueList); $this->assertEquals($expected, $valueList);
$expected = [0 => '', 1 => 'a', 2 => 'b', 3 => 'c']; $expected = [0 => '', 1 => 'a', 2 => 'b', 3 => 'c'];
$valueList = $this->db->getEnumSetValueList('person', 'groups'); $valueList = $this->db->getEnumSetValueList('Person', 'groups');
$this->assertEquals($expected, $valueList); $this->assertEquals($expected, $valueList);
} }
......
Supports Markdown
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