From b7ac751b1078ebacb077b86e34c65b8964640f6b Mon Sep 17 00:00:00 2001 From: Brian Rogers Date: Tue, 27 Sep 2022 11:54:02 -0600 Subject: [PATCH] moving back to auto-incrementing IDs because of performance --- src/app/Models/Address.php | 8 -------- src/app/Models/PersonalAccessToken.php | 17 ----------------- src/app/Models/User.php | 2 -- .../0000_00_00_000000_create_users_table.php | 2 +- .../0001_00_00_000000_create_sessions_table.php | 2 +- ...1000_00_00_000000_create_addresses_table.php | 4 ++-- ...0_00_00_000001_create_address_user_table.php | 15 +++++---------- 7 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 src/app/Models/PersonalAccessToken.php diff --git a/src/app/Models/Address.php b/src/app/Models/Address.php index 2263472..c84af50 100644 --- a/src/app/Models/Address.php +++ b/src/app/Models/Address.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Models\Traits\FormattedAddressTrait; -use App\Models\Traits\HasUidTrait; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -14,18 +13,11 @@ class Address extends Model { use FormattedAddressTrait; use HasFactory; - use HasUidTrait; use Prunable; /** @var string */ protected $table = 'addresses'; - /** @var string */ - protected $keyType = 'string'; - - /** @var bool */ - public $incrementing = false; - /** @var array */ protected $fillable = [ 'addressable_type', diff --git a/src/app/Models/PersonalAccessToken.php b/src/app/Models/PersonalAccessToken.php deleted file mode 100644 index 52c95ec..0000000 --- a/src/app/Models/PersonalAccessToken.php +++ /dev/null @@ -1,17 +0,0 @@ -string('id', 64)->primary(); + $table->id(); $table->string('name'); $table->string('surname'); $table->string('email')->unique(); diff --git a/src/database/migrations/0001_00_00_000000_create_sessions_table.php b/src/database/migrations/0001_00_00_000000_create_sessions_table.php index dc6307f..d781ab8 100644 --- a/src/database/migrations/0001_00_00_000000_create_sessions_table.php +++ b/src/database/migrations/0001_00_00_000000_create_sessions_table.php @@ -15,7 +15,7 @@ return new class extends Migration { Schema::create('sessions', function (Blueprint $table) { $table->string('id')->primary(); - $table->string('user_id', 64)->nullable()->index(); + $table->foreignId('user_id')->nullable()->index(); $table->string('ip_address', 45)->nullable(); $table->text('user_agent')->nullable()->index(); $table->text('payload'); diff --git a/src/database/migrations/1000_00_00_000000_create_addresses_table.php b/src/database/migrations/1000_00_00_000000_create_addresses_table.php index 42e0552..2f391fb 100644 --- a/src/database/migrations/1000_00_00_000000_create_addresses_table.php +++ b/src/database/migrations/1000_00_00_000000_create_addresses_table.php @@ -14,8 +14,8 @@ return new class extends Migration public function up() { Schema::create('addresses', function (Blueprint $table) { - $table->string('id', 64)->primary(); - $table->uuidMorphs('addressable'); + $table->id(); + $table->morphs('addressable'); $table->string('street'); $table->string('unit')->nullable(); $table->string('city'); diff --git a/src/database/migrations/1000_00_00_000001_create_address_user_table.php b/src/database/migrations/1000_00_00_000001_create_address_user_table.php index 49afa0c..a9d105d 100644 --- a/src/database/migrations/1000_00_00_000001_create_address_user_table.php +++ b/src/database/migrations/1000_00_00_000001_create_address_user_table.php @@ -14,16 +14,11 @@ return new class extends Migration public function up() { Schema::create('address_user', function (Blueprint $table) { - $table->string('address_id', 64); - $table->string('user_id', 64); - - $table->foreign('address_id') - ->references('id')->on('addresss') - ->cascadeOnUpdate()->cascadeOnDelete(); - - $table->foreign('user_id') - ->references('id')->on('users') - ->cascadeOnUpdate()->cascadeOnDelete(); + $table->id(); + $table->foreignId('address_id')->constrained()->cascadeOnUpdate()->cascadeOnDelete(); + $table->foreignId('user_id')->constrained()->cascadeOnUpdate()->cascadeOnDelete(); + $table->timestamp('created_at')->useCurrent(); + $table->timestamp('updated_at')->nullable()->useCurrentOnUpdate(); }); }