wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

throw an error that looks like mysql errors.. :-S

Browse Source
This commit is contained in:
Brenda Wallace 2010-03-10 21:25:44 +13:00
parent 47034553fe
commit c4ee2b20be
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pgsqlschema.php
View File

@ -1,3 +1,4 @@
<?php <?php
/** /**
* StatusNet, the distributed open-source microblogging tool * StatusNet, the distributed open-source microblogging tool
@ -61,7 +62,8 @@ class PgsqlSchema extends Schema
public function getTableDef($name) public function getTableDef($name)
{ {
$res = $this->conn->query("select *, column_default as default, is_nullable as Null, udt_name as Type, column_name AS Field from INFORMATION_SCHEMA.COLUMNS where table_name = '$name'"); $res = $this->conn->query("SELECT *, column_default as default, is_nullable as Null,
udt_name as Type, column_name AS Field from INFORMATION_SCHEMA.COLUMNS where table_name = '$name'");
if (PEAR::isError($res)) { if (PEAR::isError($res)) {
throw new Exception($res->getMessage()); throw new Exception($res->getMessage());
@ -72,6 +74,9 @@ class PgsqlSchema extends Schema
$td->name = $name; $td->name = $name;
$td->columns = array(); $td->columns = array();
if ($res->numRows() == 0 ) {
throw new Exception('no such table'); //pretend to be the msyql error. yeah, this sucks.
}
$row = array(); $row = array();
while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) { while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
@ -359,6 +364,7 @@ class PgsqlSchema extends Schema
try { try {
$td = $this->getTableDef($tableName); $td = $this->getTableDef($tableName);
} catch (Exception $e) { } catch (Exception $e) {
if (preg_match('/no such table/', $e->getMessage())) { if (preg_match('/no such table/', $e->getMessage())) {
return $this->createTable($tableName, $columns); return $this->createTable($tableName, $columns);