Merge branch 'main' into database-null-issue

Author: csemazharul

.gitattributes

@@ -1,2 +1,7 @@
 .gitignore merge=ours
-* text eol=lf
+* text eol=lf
+
+/.vscode       export-ignore
+lefthook.yml export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore

composer.json

@@ -24,7 +24,8 @@
       ".gitignore",
       "lefthook.yml",
       ".php-cs-fixer.php",
-      "composer.lock"
+      "composer.lock",
+      "/.vscode"
     ]
   },
   "require": {

src/Blueprint.php

@@ -129,6 +129,13 @@ public function __call($method, $parameters)
         throw new RuntimeException("Undefined method [  {$method}  ] called on Blueprint");
     }
 
+    public function withPrefix($prefix)
+    {
+        $this->table = "{$prefix}{$this->table}";
+
+        return $this;
+    }
+
     public function build()
     {
         return $this->toSql();
@@ -730,7 +737,8 @@ private function addIndexQuery()
                 $query .= ' ADD ';
             }
 
-            $query .= (isset($indexColumn['type']) ? $indexColumn['type'] : null
+            $query .= (
+                isset($indexColumn['type']) ? $indexColumn['type'] : null
             ) . "INDEX {$indexColumn['name']}_INDEX ({$indexColumn['name']} ASC)";
         }
 
@@ -745,7 +753,7 @@ private function addUniqueIndexQuery()
 
         $query = '';
         foreach ($this->uniqueIndex as $key => $uniqueColumn) {
-            $query .= "\nUNIQUE INDEX {$uniqueColumn}_UNIQUE ({$uniqueColumn} ASC) VISIBLE,";
+            $query .= "\nUNIQUE INDEX {$uniqueColumn}_UNIQUE ({$uniqueColumn} ASC),";
         }
 
         return $query;

src/Model.php

@@ -115,7 +115,6 @@ abstract class Model implements ArrayAccess, JsonSerializable
      */
     public function __construct($attributes = [])
     {
-        $this->prefix = Connection::getPrefix();
         if (!property_exists($this, 'table') || !$this->table) {
             $this->_tableWithoutPrefix = ltrim(
                 strtolower(
@@ -127,9 +126,17 @@ public function __construct($attributes = [])
                 ),
                 '_'
             ) . 's';
+        } else {
+            $this->_tableWithoutPrefix = $this->table;
+        }
+
+        $dbPrefix = Connection::wpPrefix();
+
+        if ($this->prefix === '') {
+            $dbPrefix = Connection::getPrefix();
         }
 
-        $this->table = $this->prefix . $this->_tableWithoutPrefix . $this->table;
+        $this->table = $dbPrefix . $this->prefix . $this->_tableWithoutPrefix;
 
         if (!isset($this->primaryKey)) {
             $this->primaryKey = 'id';
@@ -234,7 +241,8 @@ public function setAttribute($key, $value)
     {
         if (
             $this->_isExists
-            && (!isset($this->_original[$key])
+            && (
+                !isset($this->_original[$key])
                 || isset($this->_original[$key]) && $this->_original[$key] != $value
             )
         ) {
@@ -264,6 +272,11 @@ public function getTable()
         return $this->table;
     }
 
+    public function getPrefix()
+    {
+        return $this->prefix === '' ? Connection::getPrefix() : $this->prefix;
+    }
+
     public function getTableWithoutPrefix()
     {
         return $this->_tableWithoutPrefix;

src/QueryBuilder.php

@@ -10,15 +10,15 @@
 
 class QueryBuilder
 {
-    const UPDATE = 'Update';
+    public const UPDATE = 'Update';
 
-    const INSERT = 'Insert';
+    public const INSERT = 'Insert';
 
-    const DELETE = 'Delete';
+    public const DELETE = 'Delete';
 
-    const SELECT = 'Select';
+    public const SELECT = 'Select';
 
-    const TIME_FORMAT = 'Y-m-d H:i:s';
+    public const TIME_FORMAT = 'Y-m-d H:i:s';
 
     protected $table;
 
@@ -541,7 +541,7 @@ public function orHaving(...$params)
      */
     public function join($table, $firstColumn, $operator = null, $secondColumn = null, $type = 'INNER')
     {
-        $table    = Connection::getPrefix() . $table;
+        $table    = Connection::wpPrefix() . $this->_model->getPrefix() . $table;
         $hasAlias = preg_split('/ as /i', $table);
         if ($hasAlias && isset($hasAlias[1])) {
             $table = $hasAlias[0];
@@ -1339,9 +1339,10 @@ function ($value) {
 
             if (
                 !empty($ids)
-                && ($allRows = $this->newQuery()
-                    ->where($this->_model->getPrimaryKey(), $ids)
-                    ->get()
+                && (
+                    $allRows = $this->newQuery()
+                        ->where($this->_model->getPrimaryKey(), $ids)
+                        ->get()
                 )
             ) {
                 return $allRows;

src/Relations.php

@@ -98,6 +98,11 @@ public function newBelongsToMany($model, $foreignKey = null, $localKey = null)
         return $model->newQuery();
     }
 
+    /**
+     * Returns list of query of relations
+     *
+     * @return array<string, QueryBuilder>
+     */
     public function getRelations()
     {
         return $this->_relations;
@@ -146,21 +151,13 @@ private function retrieveRelateData(QueryBuilder $query)
                         . $parentQuery->select($relationKey['localKey'])->prepare()
                         . ') AS subquery )'
                 );
-                if ($relationQuery->getModel()->getRelateAs() == 'oneToOne') {
-                    $relatedModels = $relationQuery->first();
-                } else {
-                    $relatedModels = $relationQuery->get();
-                }
+
+                $relatedModels = $relationQuery->get();
 
                 if ($relatedModels) {
-                    if ($relatedModels instanceof Model) {
-                        $this->_relatedData[$relationName][$relatedModels->getAttribute($relationKey['foreignKey'])]
-                            = $relatedModels;
-                    } else {
-                        foreach ($relatedModels as $relatedModel) {
-                            $this->_relatedData[$relationName][$relatedModel->getAttribute($relationKey['foreignKey'])][]
-                                = $relatedModel;
-                        }
+                    foreach ($relatedModels as $relatedModel) {
+                        $this->_relatedData[$relationName][$relatedModel->getAttribute($relationKey['foreignKey'])][]
+                            = $relatedModel;
                     }
                 }
             }
@@ -178,6 +175,11 @@ private function setRelatedData(Model $model)
                 $data = isset(
                     $this->_relatedData[$relationName][$model->getAttribute($relationKey['localKey'])]
                 ) ? $this->_relatedData[$relationName][$model->getAttribute($relationKey['localKey'])] : null;
+
+                if ($relationQuery->getModel()->getRelateAs() === 'oneToOne' && is_countable($data) && \count($data)) {
+                    $data = $data[0];
+                }
+
                 $model->setAttribute($relationName, $data);
             }
         }

src/Schema.php

@@ -10,8 +10,21 @@
 
 class Schema
 {
+    public $prefix;
+
     public static function __callStatic($method, $parameters)
     {
+        return (new self())->{$method}(...$parameters);
+    }
+
+    public function __call($method, $parameters)
+    {
+        if ($method === 'withPrefix') {
+            $this->prefix = $parameters[0];
+
+            return $this;
+        }
+
         if (!method_exists(Blueprint::class, $method)) {
             throw new RuntimeException('Undefined method [' . $method . '] called on Schema class.');
         }
@@ -21,29 +34,29 @@ public static function __callStatic($method, $parameters)
         }
 
         if (\count($parameters) > 1 && $parameters[1] instanceof Closure) {
-            $blueprint = self::createBlueprint($parameters[0], $method, $parameters[1]);
+            $blueprint = $this->createBlueprint($parameters[0], $method, $parameters[1]);
             unset($parameters[0], $parameters[1]);
         } else {
-            $blueprint = self::createBlueprint($parameters[0], $method);
+            $blueprint = $this->createBlueprint($parameters[0], $method);
             unset($parameters[0]);
         }
 
         \call_user_func_array([$blueprint, $method], $parameters);
 
-        return self::build($blueprint);
+        return $this->build($blueprint);
     }
 
-    public static function createBlueprint($schema, $method, Closure $callback = null)
+    public function createBlueprint($schema, $method, Closure $callback = null)
     {
         return new Blueprint(
             $schema,
             $method,
-            Connection::getPrefix(),
+            $this->prefix === '' ? Connection::getPrefix() : $this->prefix,
             $callback
         );
     }
 
-    public static function build(Blueprint $blueprint)
+    public function build(Blueprint $blueprint)
     {
         return $blueprint->build();
     }