From 686d09a5992f744d16887ae9d6beae9168e3f22e Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 12 Mar 2020 18:15:32 +0100
Subject: [PATCH] Fix dependency resolution

---
 DataStorage/Database/BuilderAbstract.php | 36 ------------------------
 DataStorage/Database/Query/Builder.php   |  9 +++++-
 2 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/DataStorage/Database/BuilderAbstract.php b/DataStorage/Database/BuilderAbstract.php
index 2d5601d5a..577671dff 100644
--- a/DataStorage/Database/BuilderAbstract.php
+++ b/DataStorage/Database/BuilderAbstract.php
@@ -51,14 +51,6 @@ abstract class BuilderAbstract
      */
     protected int $type = QueryType::NONE;
 
-    /**
-     * Prefix.
-     *
-     * @var string
-     * @since 1.0.0
-     */
-    protected string $prefix = '';
-
     /**
      * Raw.
      *
@@ -79,22 +71,6 @@ abstract class BuilderAbstract
         return $this->connection;
     }
 
-    /**
-     * Set table name prefix prefix
-     *
-     * @param string $prefix Table name prefix
-     *
-     * @return static
-     *
-     * @since 1.0.0
-     */
-    public function prefix(string $prefix) : self
-    {
-        $this->prefix = $prefix;
-
-        return $this;
-    }
-
     /**
      * Escape string value
      *
@@ -109,18 +85,6 @@ abstract class BuilderAbstract
         return $this->connection->con->quote($value);
     }
 
-    /**
-     * Get prefix.
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getPrefix() : string
-    {
-        return $this->prefix;
-    }
-
     /**
      * Get query type.
      *
diff --git a/DataStorage/Database/Query/Builder.php b/DataStorage/Database/Query/Builder.php
index d6a7a25be..53ea03fd8 100644
--- a/DataStorage/Database/Query/Builder.php
+++ b/DataStorage/Database/Query/Builder.php
@@ -403,6 +403,11 @@ class Builder extends BuilderAbstract
             }
         }
 
+        // add from to existing dependencies
+        foreach ($this->from as $table => $from) {
+            $dependencies[$table] = [];
+        }
+
         $resolved = DependencyResolver::resolve($dependencies);
 
         // cyclomatic dependencies
@@ -413,7 +418,9 @@ class Builder extends BuilderAbstract
         $temp        = $this->joins;
         $this->joins = [];
         foreach ($resolved as $table) {
-            $this->joins[$table] = $temp[$table];
+            if (isset($temp[$table])) {
+                $this->joins[$table] = $temp[$table];
+            }
         }
     }