Update AbstractQuery.php

WebFiori · Dec 3, 2023 · b475f7d · b475f7d
1 parent 226f4b9
commit b475f7d
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/webfiori/database/AbstractQuery.php b/webfiori/database/AbstractQuery.php
@@ -633,7 +633,7 @@ public function on(string $leftCol, string $rightCol, $cond = '=', $joinWith = '
                 $table->getLeft()->addColumns([
                     $leftCol => ['type' => 'varchar']
                 ]);
-                $leftColObj = $table->getColByKey($leftCol);
+                $leftColObj = $table->getLeft()->getColByKey($leftCol);
             }
 
             $leftColObj->setWithTablePrefix(false);
@@ -649,7 +649,7 @@ public function on(string $leftCol, string $rightCol, $cond = '=', $joinWith = '
                 $table->getRight()->addColumns([
                     $rightCol => ['type' => 'varchar']
                 ]);
-                $rightColObj = $table->getColByKey($rightCol);
+                $rightColObj = $table->getRight()->getColByKey($rightCol);
             }
             $rightColObj->setWithTablePrefix(false);
             $rightColName = $rightColObj->getOwner()->getName().'.'.$rightColObj->getOldName();
@@ -1011,7 +1011,7 @@ public function table($tblName) {
         }
         $this->getSchema()->addTable($tableObj);
         $this->prevQueryObj = $this->copyQuery();
-        $this->resetBinding();
+        $this->prevQueryObj->resetBinding();
 
         if (strlen($this->query) != 0) {
             $this->setQuery($this->getQuery());
@@ -1054,9 +1054,6 @@ public function union(AbstractQuery $query, $all = false) {
             $uAll = $all === true;
             $unionStm = $uAll ? "\nunion all\n" : "\nunion\n";
             $this->setQuery($queries[$count - 2]['query'].$unionStm.$query->getQuery());
-
-            $this->setBindings($query->getBindings(), 'first');
-
             $whereExpr = $query->getTable()->getSelect()->getWhereExpr();
             if ($whereExpr !== null) {
                 $whereExpr->setValue('');