update

Author: Fredrick Peter

README.md

@@ -119,7 +119,7 @@ Prior to installing `php-orm-database` get the [Composer](https://getcomposer.or
 **Step 1** — update your `composer.json`:
 ```composer.json
 "require": {
-    "peterson/database": "^4.3.4"
+    "peterson/database": "^4.3.5"
 }
 ```
 

src/Capsule/AppManager.php

@@ -58,7 +58,6 @@ public static function envDummy()
             PUSHER_SCHEME=https
             PUSHER_APP_CLUSTER=mt1
             
-            #©Copyright '. date('Y', time()) .'
             APP_DEVELOPER=
             APP_DEVELOPER_EMAIL=
         ');

src/Collections/Traits/RelatedTrait.php

@@ -21,7 +21,7 @@ trait RelatedTrait{
      */
     public function offsetExists($offset): bool
     {
-        return isset($this->items[$offset]);
+        return $this->__isset($offset);
     }
 
     /**
@@ -55,7 +55,7 @@ public function offsetSet($offset, $value): void
      */
     public function offsetUnset($offset): void
     {
-        unset($this->items[$offset]);
+        $this->__unset($offset);
     }
 
     /**
@@ -69,17 +69,6 @@ public function has($key)
         return array_key_exists($key, $this->items);
     }
 
-    /**
-     * Check if an item exists in the collection.
-     *
-     * @param  string  $key
-     * @return bool
-     */
-    public function __isset($key)
-    {
-        return isset($this->items[$key]);
-    }
-
     /**
      * Dynamically access collection items.
      *
@@ -103,6 +92,28 @@ public function __set($key, $value)
         $this->items[$key] = $value;
     }
 
+    /**
+     * Check if an item exists in the collection.
+     *
+     * @param  string  $key
+     * @return bool
+     */
+    public function __isset($key)
+    {
+        return isset($this->items[$key]);
+    }
+
+    /**
+     * Remove an item from items collection.
+     *
+     * @param  string  $key
+     * @return void
+     */
+    public function __unset($key)
+    {
+        unset($this->items[$key]);
+    }
+
     /**
      * return items collection as an array
      *

src/Schema/Builder.php

@@ -1334,7 +1334,13 @@ public function toSql()
      */
     public function get($limit = null)
     {
-        return $this->limit($limit)->getBuilder(true, false, __FUNCTION__);
+        // only allow get limit parameter
+        // if limit has not been set and if not empty
+        if(empty($this->limit) && !empty($limit)){
+            $this->limit($limit);
+        }
+
+        return $this->getBuilder(true, false, __FUNCTION__);
     }
 
     /**
@@ -1507,18 +1513,10 @@ public function updateOrIgnore(array $values)
     /**
      * Delete records from the database.
      *
-     * @param  mixed  $id
      * @return int
      */
-    public function delete($id = null)
+    public function delete()
     {
-        // If an ID is passed to the method, we will set the where clause to check the
-        // ID to let developers to simply and quickly remove a single row from this
-        // database without manually specifying the "where" clauses on the query.
-        if (! is_null($id)) {
-            $this->where($this->from.'.id', '=', $id);
-        }
-
         $this->applyBeforeQueryCallbacks();
 
         $sql = $this->compile()->compileDelete($this);
@@ -1535,16 +1533,19 @@ public function delete($id = null)
     }
 
     /**
-     * Destroy/Delete records from the database.
+     * Destroy records from the database.
+     * [performing where clause under the hood]
+     *
+     * @param mixed $id
      *
-     * @param string|int  $id
+     * @param string $column
      * [default column name is 'id']
      * 
      * @return int
      */
-    public function destroy(string|int $id)
+    public function destroy($id, $column = 'id')
     {
-        return $this->where('id', $id)->delete();
+        return $this->where($column, $id)->delete();
     }
 
     /**

src/Schema/Traits/BuilderTrait.php

@@ -1189,7 +1189,7 @@ protected function countBuilder($columns = ['*'], $close = true)
     {
         $this->applyBeforeQueryCallbacks();
         $this->selectRaw('count' . '(' . $this->columnize(Forge::wrap($columns)) . ') as aggregate');
-
+        
         $results = $this->statement(
             $this->compile()->compileSelect($this),
             $this->getBindings(),