Merge branch '5.x' into 5.x-update-changelog

bowphp · Sep 17, 2023 · c706108 · c706108
2 parents 1f4396c + 1107ca6
commit c706108
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/Database/Database.php b/src/Database/Database.php
@@ -383,7 +383,7 @@ public static function rollback(): void
      * Starting the start of a transaction wrapper on top of the callback
      *
      * @param callable $callback
-     * @return void
+     * @return mixed
      */
     public static function transaction(callable $callback): mixed
     {

diff --git a/src/Support/helpers.php b/src/Support/helpers.php
@@ -157,6 +157,7 @@ function view(string $template, int|array $data = [], int $code = 200)
      * @param  string $name
      * @param  string $connexion
      * @return Bow\Database\QueryBuilder
+     * @deprecated
      */
     function table(string $name, string $connexion = null)
     {
@@ -182,6 +183,24 @@ function get_last_insert_id(string $name = null)
     }
 }
 
+if (!function_exists('db_table')) {
+    /**
+     * Table alias of DB::table
+     *
+     * @param  string $name
+     * @param  string $connexion
+     * @return Bow\Database\QueryBuilder
+     */
+    function db_table(string $name, string $connexion = null)
+    {
+        if (is_string($connexion)) {
+            db($connexion);
+        }
+
+        return DB::table($name);
+    }
+}
+
 if (!function_exists('db_select')) {
     /**
      * Launches SELECT SQL Queries
@@ -1454,7 +1473,7 @@ function db_seed(string $name, array $data = []): mixed
             }
         }
 
-        $filename = rtrim(config('app.seeder_path'), '/') . '/' . $name . '_seeder.php';
+        $filename = rtrim(config('app.seeder_path'), '/') . '/' . $name . '.php';
 
         if (!file_exists($filename)) {
             throw new \ErrorException('[' . $name . '] seeder file not found');