diff --git a/src/commands/MigrationCommand.php b/src/commands/MigrationCommand.php index a58e071..9fd851b 100644 --- a/src/commands/MigrationCommand.php +++ b/src/commands/MigrationCommand.php @@ -92,7 +92,6 @@ protected function createMigration() $app = app(); $migrationFiles = [ $this->laravel->path."/../database/migrations/*_setup_countries_table.php" => 'countries::generators.migration', - $this->laravel->path."/../database/migrations/*_charify_countries_table.php" => 'countries::generators.char_migration', ]; $seconds = 0; diff --git a/src/views/generators/char_migration.blade.php b/src/views/generators/char_migration.blade.php deleted file mode 100644 index 065d989..0000000 --- a/src/views/generators/char_migration.blade.php +++ /dev/null @@ -1,38 +0,0 @@ -use Illuminate\Database\Migrations\Migration; - -class CharifyCountriesTable extends Migration { - - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::table(\Config::get('countries.table_name'), function($table) - { - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY country_code CHAR(3) NOT NULL DEFAULT ''"); - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY iso_3166_2 CHAR(2) NOT NULL DEFAULT ''"); - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY iso_3166_3 CHAR(3) NOT NULL DEFAULT ''"); - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY region_code CHAR(3) NOT NULL DEFAULT ''"); - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY sub_region_code CHAR(3) NOT NULL DEFAULT ''"); - }); - } - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table(\Config::get('countries.table_name'), function($table) - { - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY country_code VARCHAR(3) NOT NULL DEFAULT ''"); - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY iso_3166_2 VARCHAR(2) NOT NULL DEFAULT ''"); - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY iso_3166_3 VARCHAR(3) NOT NULL DEFAULT ''"); - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY region_code VARCHAR(3) NOT NULL DEFAULT ''"); - DB::statement("ALTER TABLE " . DB::getTablePrefix() . \Config::get('countries.table_name') . " MODIFY sub_region_code VARCHAR(3) NOT NULL DEFAULT ''"); - }); - } - -} diff --git a/src/views/generators/migration.blade.php b/src/views/generators/migration.blade.php index c0b1b65..2e3e980 100644 --- a/src/views/generators/migration.blade.php +++ b/src/views/generators/migration.blade.php @@ -15,18 +15,18 @@ public function up() $table->integer('id')->unsigned()->index(); $table->string('capital', 255)->nullable(); $table->string('citizenship', 255)->nullable(); - $table->string('country_code', 3)->default(''); + $table->char('country_code', 3)->default(''); $table->string('currency', 255)->nullable(); $table->string('currency_code', 255)->nullable(); $table->string('currency_sub_unit', 255)->nullable(); $table->string('currency_symbol', 3)->nullable(); $table->integer('currency_decimals')->nullable(); $table->string('full_name', 255)->nullable(); - $table->string('iso_3166_2', 2)->default(''); - $table->string('iso_3166_3', 3)->default(''); + $table->char('iso_3166_2', 2)->default(''); + $table->char('iso_3166_3', 3)->default(''); $table->string('name', 255)->default(''); - $table->string('region_code', 3)->default(''); - $table->string('sub_region_code', 3)->default(''); + $table->char('region_code', 3)->default(''); + $table->char('sub_region_code', 3)->default(''); $table->boolean('eea')->default(0); $table->string('calling_code', 3)->nullable(); $table->string('flag', 6)->nullable();