Merge pull request #39 from jason-napolitano/master

ORM Changes

Author: jason-napolitano

src/Entity.php

@@ -4,7 +4,8 @@
 
     use ReflectionClass;
     use ReflectionProperty;
-    use DatabaseFactory\Facades;
+	use DatabaseFactory\ORM;
+	use DatabaseFactory\Facades;
 
     /**
      * The base entity class
@@ -20,7 +21,8 @@
     class Entity
     {
         // ORM Plugins
-        use \DatabaseFactory\ORM\HasTable;
+        use ORM\HasTable;
+        use ORM\HasQuery;
 
         /**
          * ID of a record for updating

src/ORM/HasAll.php

@@ -17,9 +17,9 @@
      */
     trait HasAll
     {
-        public static function all(string $columns = '*'): Builder
+        public static function all(string $columns = '*')
         {
-            return Facades\DB::table(static::table())->select($columns);
+            return Facades\DB::table(static::table())->select($columns)->get();
         }
     }
 }

src/ORM/HasFind.php

@@ -17,9 +17,9 @@
      */
     trait HasFind
     {
-        public static function find(int $id, string $columns = '*'): Builder
+        public static function find(int|string $value, string $by = 'id', string $columns = '*')
         {
-            return Facades\DB::table(static::table())->select($columns)->where('id', '=', $id);
+            return Facades\DB::table(static::table())->select($columns)->where($by, '=', $value)->get();
         }
     }
 }

src/ORM/HasFirst.php

@@ -19,9 +19,9 @@
      */
     trait HasFirst
     {
-        public static function first(string $columns = '*'): Builder
+        public static function first(string $columns = '*')
         {
-            return Facades\DB::table(static::table())->select($columns)->orderBy('id', 'ASC')->limit(1);
+            return Facades\DB::table(static::table())->select($columns)->orderBy('id', 'ASC')->limit(1)->get();
         }
     }
 }

src/ORM/HasJoin.php

@@ -17,9 +17,9 @@
      */
     trait HasJoin
     {
-        public static function join(string $table, array $on, string $columns = '*'): Builder
+        public static function join(string $table, array $on, string $columns = '*')
         {
-            return Facades\DB::table(static::table())->join($table, $on, $columns);
+            return Facades\DB::table(static::table())->join($table, $on, $columns)->get();
         }
     }
 }

src/ORM/HasLast.php

@@ -19,9 +19,9 @@
      */
     trait HasLast
     {
-        public static function last(string $columns = '*'): Builder
+        public static function last(string $columns = '*')
         {
-            return Facades\DB::table(static::table())->select($columns)->orderBy('id', 'DESC')->limit(1);
+            return Facades\DB::table(static::table())->select($columns)->orderBy('id', 'DESC')->limit(1)->get();
         }
     }
 }

src/ORM/HasLike.php

@@ -17,9 +17,9 @@
      */
     trait HasLike
     {
-        public static function like(string $field, string $pattern, string $columns = '*'): Builder
+        public static function like(string $field, string $pattern, string $columns = '*')
         {
-            return Facades\DB::table(static::table())->select($columns)->like($field, $pattern);
+            return Facades\DB::table(static::table())->select($columns)->like($field, $pattern)->get();
         }
     }
 }

src/ORM/HasNot.php

@@ -18,9 +18,9 @@
      */
     trait HasNot
     {
-        public static function whereNot($key = null, $value = null, string $columns = '*'): Builder
+        public static function whereNot($key = null, $value = null, string $columns = '*')
         {
-            return Facades\DB::table(static::table())->select($columns)->whereNot($key, $value);
+            return Facades\DB::table(static::table())->select($columns)->whereNot($key, $value)->get();
         }
     }
 }

src/ORM/HasQuery.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace DatabaseFactory\ORM {
+	
+	use DatabaseFactory\Config;
+	use DatabaseFactory\Facades;
+	use DatabaseFactory\Builder;
+	
+	trait HasQuery
+	{
+		public static function query(string $config = Config::class): Builder
+		{
+			return Facades\DB::table(static::table(), $config);
+		}
+	}
+}

src/ORM/HasWhere.php

@@ -19,9 +19,9 @@
      */
     trait HasWhere
     {
-        public static function where($key, $is = null, $value = null, string $columns = '*'): Builder
+        public static function where($key, $is = null, $value = null, string $columns = '*')
         {
-            return Facades\DB::table(static::table())->select($columns)->where($key, $is, $value);
+            return Facades\DB::table(static::table())->select($columns)->where($key, $is, $value)->get();
         }
     }
 }