summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zara <ondrej.zara@gmail.com>2013-10-31 18:19:56 +0100
committerOndrej Zara <ondrej.zara@gmail.com>2013-10-31 18:19:56 +0100
commit9733e55b851b40d0f4e7ef6b1dd70c752ab994ab (patch)
treea27fdb7be050659e8738767fef26612d911731f0
parentb8a1b43f90e89fb1159cfcf86c80dfeac35904fb (diff)
downloadwwwsqldesigner-9733e55b851b40d0f4e7ef6b1dd70c752ab994ab.zip
wwwsqldesigner-9733e55b851b40d0f4e7ef6b1dd70c752ab994ab.tar.gz
wwwsqldesigner-9733e55b851b40d0f4e7ef6b1dd70c752ab994ab.tar.bz2
fix for issues #175 and #176, thanks to Jeremy Stevens
-rw-r--r--backend/php-pdo/LayerMYSQL.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/backend/php-pdo/LayerMYSQL.php b/backend/php-pdo/LayerMYSQL.php
index 3be504a..a8af2e2 100644
--- a/backend/php-pdo/LayerMYSQL.php
+++ b/backend/php-pdo/LayerMYSQL.php
@@ -68,7 +68,7 @@ class LayerMYSQL extends AbstractLayer
$req = '
SELECT
'.self::protect('TABLE_NAME').' as '.self::protect('name').',
- '.self::protect('TABLE_COMMENT').' as '.self::protect('comment').',
+ '.self::protect('TABLE_COMMENT').' as '.self::protect('comment').'
FROM '.self::protect('TABLES').'
WHERE
'.self::protect('TABLE_SCHEMA').' = ?
@@ -148,7 +148,7 @@ class LayerMYSQL extends AbstractLayer
'.self::protect('TABLE_NAME').' as '.self::protect('table').',
'.self::protect('INDEX_NAME').' as '.self::protect('name').',
'.self::protect('INDEX_TYPE').' as '.self::protect('type').',
- '.self::protect('COLUMN_NAME').' as '.self::protect('column').'
+ '.self::protect('COLUMN_NAME').' as '.self::protect('column').',
'.self::protect('NON_UNIQUE').' as '.self::protect('non_unique').'
FROM '.self::protect('STATISTICS').'
WHERE
@@ -170,9 +170,12 @@ class LayerMYSQL extends AbstractLayer
self::$keys[$index['table']][$index['name']]['columns'][] = $index['column'];
}
- return self::$keys[$table['name']];
+ if (isset(self::$keys[$table['name']])) {
+ return self::$keys[$table['name']];
+ } else {
+ return array();
+ }
}
-
}
?>