rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DB::columnList() now returns details

Browse Source
This commit is contained in:
Sergey Tsalkov
2021-06-15 21:39:19 -07:00
parent 38545ddb3a
commit dab71efacd
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
db.class.php
View File

@@ -363,7 +363,19 @@ class MeekroDB {
} }
public function columnList($table) { public function columnList($table) {
return $this->queryOneColumn('Field', "SHOW COLUMNS FROM %b", $table); $data = $this->query("SHOW COLUMNS FROM %b", $table);
$columns = [];
foreach ($data as $row) {
$columns[$row['Field']] = [
'type' => $row['Type'],
'null' => $row['Null'],
'key' => $row['Type'],
'default' => $row['Default'],
'extra' => $row['Extra']
];
}
return $columns;
} }
public function tableList($db = null) { public function tableList($db = null) {

12
simpletest/BasicTest.php
View File

@@ -161,10 +161,12 @@ class BasicTest extends SimpleTest {
$results = DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend"); $results = DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
$this->assert(count($results) === 3); $this->assert(count($results) === 3);
$columnlist = DB::columnList('accounts'); $columnList = DB::columnList('accounts');
$this->assert(count($columnlist) === 8); $columnKeys = array_keys($columnList);
$this->assert($columnlist[0] === 'id'); $this->assert(count($columnList) === 8);
$this->assert($columnlist[5] === 'height'); $this->assert($columnList['id']['type'] == 'int(11)');
$this->assert($columnList['height']['type'] == 'double');
$this->assert($columnKeys[5] == 'height');
$tablelist = DB::tableList(); $tablelist = DB::tableList();
$this->assert(count($tablelist) === 3); $this->assert(count($tablelist) === 3);
@@ -283,7 +285,7 @@ class BasicTest extends SimpleTest {
$columns = DB::columnList('store data'); $columns = DB::columnList('store data');
$this->assert(count($columns) === 2); $this->assert(count($columns) === 2);
$this->assert($columns[1] === 'picture'); $this->assert($columns['picture']['type'] === 'blob');
$smile = file_get_contents(__DIR__ . '/smile1.jpg'); $smile = file_get_contents(__DIR__ . '/smile1.jpg');

10
simpletest/ObjectTest.php
View File

@@ -117,10 +117,12 @@ class ObjectTest extends SimpleTest {
$results = $this->mdb->query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend"); $results = $this->mdb->query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
$this->assert(count($results) === 2); $this->assert(count($results) === 2);
$columnlist = $this->mdb->columnList('accounts'); $columnList = $this->mdb->columnList('accounts');
$this->assert(count($columnlist) === 6); $columnKeys = array_keys($columnList);
$this->assert($columnlist[0] === 'id'); $this->assert(count($columnList) === 6);
$this->assert($columnlist[4] === 'height'); $this->assert($columnList['id']['type'] == 'int(11)');
$this->assert($columnList['height']['type'] == 'double');
$this->assert($columnKeys[4] == 'height');
$tablelist = $this->mdb->tableList(); $tablelist = $this->mdb->tableList();
$this->assert(count($tablelist) === 1); $this->assert(count($tablelist) === 1);