Imporved JOIN parsing and building.

Some keywords may appear in conditions.

1 files changed, 14 insertions, 21 deletions

diff --git a/src/Utils/Misc.php b/src/Utils/Misc.php
index e0fbb95..9d3dfa9 100644
--- a/src/Utils/Misc.php
+++ b/src/Utils/Misc.php
@@ -33,8 +33,8 @@ class Misc
     public static function getAliases($statement, $database)
     {
         if (!($statement instanceof SelectStatement)
-            || (empty($statement->from))
             || (empty($statement->expr))
+            || (empty($statement->from))
         ) {
             return array();
         }
@@ -43,28 +43,21 @@ class Misc
 
         $tables = array();
 
-        if ((!empty($statement->join->expr->table))
-            && (!empty($statement->join->expr->alias))
-        ) {
-            $thisDb = empty($statement->join->expr->database) ?
-                $database : $statement->join->expr->database;
-
-            $retval = array(
-                $thisDb => array(
-                    'alias' => null,
-                    'tables' => array(
-                        $statement->join->expr->table => array(
-                            'alias' => $statement->join->expr->alias,
-                            'columns' => array(),
-                        ),
-                    ),
-                ),
-            );
-
-            $tables[$thisDb][$statement->join->expr->alias] = $statement->join->expr->table;
+        /**
+         * Expressions that may contain aliases.
+         * These are extracted from `FROM` and `JOIN` keywords.
+         * @var Expression[]
+         */
+        $expressions = $statement->from;
+
+        // Adding expressions from JOIN.
+        if (!empty($statement->join)) {
+            foreach ($statement->join as $join) {
+                $expressions[] = $join->expr;
+            }
         }
 
-        foreach ($statement->from as $expr) {
+        foreach ($expressions as $expr) {
             if (empty($expr->table)) {
                 continue;
             }