update

Author: Fredrick Peter

README.md

@@ -1006,27 +1006,25 @@ Migration runned successfully on `2023_04_19_1681860618_user_wallet`
 <details><summary>Read more...</summary>
 
 - Be careful as this will execute and drop all files table `located in the migration`
-
+- [optional param] `bool` to force delete of tables
 ```
 Migration::drop();
 
 or
-migration()->drop();
+migration()->drop(true);
 ```
 </details>
 
 ### Drop Table
 <details><summary>Read more...</summary>
 
 - Takes one param as `string` $table_name
-
 ```
 use Tamedevelopers\Database\Migrations\Schema;
 
 Schema::dropTable('table_name');
 
 or 
-
 schema()->dropTable('table_name');
 ```
 </details>
@@ -1042,7 +1040,6 @@ use Tamedevelopers\Database\Migrations\Schema;
 Schema::dropColumn('table_name', 'column_name');
 
 or 
-
 schema()->dropColumn('table_name', 'column_name');
 ```
 </details>

src/Connectors/Traits/ConnectorTrait.php

@@ -27,7 +27,6 @@ protected static function createConnector($driver = 'mysql')
             default  => throw new Exception("Unsupported driver [{$driver}]."),
         };
     }
-   
 
     /**
      * Check if Model Class is in use
@@ -46,19 +45,16 @@ protected static function isModelExtended()
     }
 
     /**
-     * Convert Model Class to table camel case
+     * Convert Model Class to table tabelPluralization name
      * 
      * @return string|null
      */
-    protected static function tabelCamelCase()
+    protected static function tabelPluralization()
     {
         // check if child class is instance of Tamedevelopers\Database\Model
         if(self::isModelExtended()){
-            // Convert camel case to snake case
-            $snakeCase = Str::snakeCase(get_called_class());
-
             return Str::pluralize(
-                strtolower($snakeCase)
+                Str::snake(get_called_class())
             );
         }
     }

src/DatabaseManager.php

@@ -48,7 +48,7 @@ public static function connection($name = null, $default = [])
      * @param  bool $useDefault
      * @return void
      */
-    private static function prepareValues($name = null, $default = [], $useDefault)
+    private static function prepareValues($name = null, $default = [], $useDefault = false)
     {
         // when only one data is passed 
         // now we just check if data is an array

src/Migrations/Traits/MigrationTrait.php

@@ -5,6 +5,7 @@
 namespace Tamedevelopers\Database\Migrations\Traits;
 
 use Tamedevelopers\Support\Env;
+use Tamedevelopers\Support\Str;
 
 /**
  * 
@@ -27,7 +28,7 @@ trait MigrationTrait{
     private static function runMigration($table_name, $type = null) 
     {
         // table name
-        $case_table = self::toSnakeCase($table_name);
+        $case_table = Str::snake($table_name);
 
         // Date convert
         $fileName = sprintf( "%s_%s_%s", date('Y_m_d'), substr((string) time(), 4), "{$case_table}.php" );
@@ -154,26 +155,6 @@ private static function initStatic()
         self::$migrations   = self::$database . "migrations/";
         self::$seeders      = self::$database . "seeders/";
     }
-    
-    /**
-     * drop database column
-     * @param string $input
-     *
-     * @return string 
-     * - String toSnakeCase
-     */
-    private static function toSnakeCase($input)
-    {
-        $output = preg_replace_callback(
-            '/[A-Z]/',
-            function ($match) {
-                return '_' . strtolower($match[0]);
-            },
-            $input
-        );
-
-        return ltrim($output, '_');
-    }
 
     /**
      * Getting all files in directory

src/Migrations/Traits/SchemaConfigurationTrait.php

@@ -376,19 +376,19 @@ protected function getUnsigned($type)
      * 
      * @return string
      */
-    protected function generix_name($name = null)
+    protected function genericIdentifier($name = null)
     {
         $column = $this->columns[count($this->columns) - 1];
         $unique = (new Exception)->getTrace()[1]['function'] ?? '__';
 
         // for foreign keys
         if($column['type'] == 'foreign'){
             $name = "{$this->tableName}_{$column['name']}_{$column['type']}";
-        }else{
+        } else{
             // create unique name
-            if(is_null($name)){
+            if(empty($name)){
                 $name = "{$this->tableName}_{$column['name']}_{$unique}";
-            }else{
+            } else{
                 $name = "{$this->tableName}_{$name}";
             }
         }

src/Migrations/Traits/SchemaTrait.php

@@ -453,11 +453,11 @@ public function timestamps()
     {
         return $this->addColumn('created_at', 'timestamps', [
                         'nullable'  => true,
-                        'index'     => $this->generix_name('created_at_index')
+                        'index'     => $this->genericIdentifier('created_at_index')
                     ])
                     ->addColumn('updated_at', 'timestamps', [
                         'nullable'  => true,
-                        'index'     => $this->generix_name('updated_at_index')
+                        'index'     => $this->genericIdentifier('updated_at_index')
                     ]);
     }
 

src/Migrations/Traits/SchemeCollectionTrait.php

@@ -81,7 +81,7 @@ public function primary($name, ?bool $autoIncrement = true, ?bool $unsigned = tr
      */
     public function index($name = null)
     {
-        $this->columns[count($this->columns) - 1]['index'] = $this->generix_name($name);
+        $this->columns[count($this->columns) - 1]['index'] = $this->genericIdentifier($name);
 
         return $this;
     }
@@ -94,7 +94,7 @@ public function index($name = null)
      */
     public function unique($name = null)
     {
-        $this->columns[count($this->columns) - 1]['unique'] = $this->generix_name($name);
+        $this->columns[count($this->columns) - 1]['unique'] = $this->genericIdentifier($name);
 
         return $this;
     }
@@ -132,40 +132,49 @@ public function foreignId($column)
      * @param string $column
      * - [optional] Default is `id`
      * 
+     * @param string|null $indexName
+     * 
      * @return $this
      */
-    public function constrained($table = null, $column = 'id')
+    public function constrained($table = null, $column = 'id', $indexName = null)
     {
         // we try to use defined table name, if no name is given to the method
-        $tableName = explode('_', $this->tableName);
+        if(empty($table)){
+            $table = explode('_', $this->tableName)[0] ?? '';
+        }
 
-        return $this->references($column)->on($table ?? $tableName[0] ?? '');
+        return $this->references($column, $indexName)->on($table);
     }
 
     /**
      * Creating Constraints Property
-     * @param string $referencedColumn 
+     * 
+     * @param string $columns 
      * <code> - Parent Table References Column name </code>
      * 
+     * @param string|null $indexName
+     * 
      * @return $this
      */
-    public function references($referencedColumn)
+    public function references($columns, $indexName = null)
     {
-        $this->columns[count($this->columns) - 1]['references'] = $referencedColumn;
-        $this->columns[count($this->columns) - 1]['generix'] = $this->generix_name($referencedColumn);
+        $this->columns[count($this->columns) - 1]['references'] = $columns;
+        $this->columns[count($this->columns) - 1]['generix'] = $this->genericIdentifier($indexName ?? $columns);
+
         return $this;
     }
 
     /**
      * Creating Constraints Property
-     * @param string $referencedTable 
+     * 
+     * @param string $table 
      * - Table name you're referencing to
      * 
      * @return $this
      */
-    public function on($referencedTable)
+    public function on($table)
     {
-        $this->columns[count($this->columns) - 1]['on'] = $referencedTable;
+        $this->columns[count($this->columns) - 1]['on'] = $table;
         return $this;
     }
 

src/Model.php

@@ -78,7 +78,7 @@ private static function initTableWithConnector()
         // and convert model class name to table name
         // using pluralization method
         if(empty($table)){
-            $table = self::tabelCamelCase();
+            $table = self::tabelPluralization();
         }
 
         return (new Connector)->table($table);