Revert model DB connection customization (#1412)

laravel · Feb 22, 2021 · fb95081 · fb95081
1 parent 3e10037
commit fb95081
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 214 deletions.
diff --git a/config/passport.php b/config/passport.php
@@ -46,21 +46,4 @@
         'secret' => env('PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Passport Storage Driver
-    |--------------------------------------------------------------------------
-    |
-    | This configuration value allows you to customize the storage options
-    | for Passport, such as the database connection that should be used
-    | by Passport's internal database models which store tokens, etc.
-    |
-    */
-
-    'storage' => [
-        'database' => [
-            'connection' => env('DB_CONNECTION', 'mysql'),
-        ],
-    ],
-
 ];
diff --git a/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php
@@ -6,31 +6,14 @@
 
 class CreateOauthAuthCodesTable extends Migration
 {
-    /**
-     * The database schema.
-     *
-     * @var \Illuminate\Database\Schema\Builder
-     */
-    protected $schema;
-
-    /**
-     * Create a new migration instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->schema = Schema::connection($this->getConnection());
-    }
-
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
-        $this->schema->create('oauth_auth_codes', function (Blueprint $table) {
+        Schema::create('oauth_auth_codes', function (Blueprint $table) {
             $table->string('id', 100)->primary();
             $table->unsignedBigInteger('user_id')->index();
             $table->unsignedBigInteger('client_id');
@@ -47,16 +30,6 @@ public function up()
      */
     public function down()
     {
-        $this->schema->dropIfExists('oauth_auth_codes');
-    }
-
-    /**
-     * Get the migration connection name.
-     *
-     * @return string|null
-     */
-    public function getConnection()
-    {
-        return config('passport.storage.database.connection');
+        Schema::dropIfExists('oauth_auth_codes');
     }
 }
diff --git a/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php
@@ -6,31 +6,14 @@
 
 class CreateOauthAccessTokensTable extends Migration
 {
-    /**
-     * The database schema.
-     *
-     * @var \Illuminate\Database\Schema\Builder
-     */
-    protected $schema;
-
-    /**
-     * Create a new migration instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->schema = Schema::connection($this->getConnection());
-    }
-
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
-        $this->schema->create('oauth_access_tokens', function (Blueprint $table) {
+        Schema::create('oauth_access_tokens', function (Blueprint $table) {
             $table->string('id', 100)->primary();
             $table->unsignedBigInteger('user_id')->nullable()->index();
             $table->unsignedBigInteger('client_id');
@@ -49,16 +32,6 @@ public function up()
      */
     public function down()
     {
-        $this->schema->dropIfExists('oauth_access_tokens');
-    }
-
-    /**
-     * Get the migration connection name.
-     *
-     * @return string|null
-     */
-    public function getConnection()
-    {
-        return config('passport.storage.database.connection');
+        Schema::dropIfExists('oauth_access_tokens');
     }
 }
diff --git a/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php
@@ -6,31 +6,14 @@
 
 class CreateOauthRefreshTokensTable extends Migration
 {
-    /**
-     * The database schema.
-     *
-     * @var \Illuminate\Database\Schema\Builder
-     */
-    protected $schema;
-
-    /**
-     * Create a new migration instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->schema = Schema::connection($this->getConnection());
-    }
-
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
-        $this->schema->create('oauth_refresh_tokens', function (Blueprint $table) {
+        Schema::create('oauth_refresh_tokens', function (Blueprint $table) {
             $table->string('id', 100)->primary();
             $table->string('access_token_id', 100)->index();
             $table->boolean('revoked');
@@ -45,16 +28,6 @@ public function up()
      */
     public function down()
     {
-        $this->schema->dropIfExists('oauth_refresh_tokens');
-    }
-
-    /**
-     * Get the migration connection name.
-     *
-     * @return string|null
-     */
-    public function getConnection()
-    {
-        return config('passport.storage.database.connection');
+        Schema::dropIfExists('oauth_refresh_tokens');
     }
 }
diff --git a/database/migrations/2016_06_01_000004_create_oauth_clients_table.php b/database/migrations/2016_06_01_000004_create_oauth_clients_table.php
@@ -6,41 +6,14 @@
 
 class CreateOauthClientsTable extends Migration
 {
-    /**
-     * The database schema.
-     *
-     * @var \Illuminate\Database\Schema\Builder
-     */
-    protected $schema;
-
-    /**
-     * Create a new migration instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->schema = Schema::connection($this->getConnection());
-    }
-
-    /**
-     * Get the migration connection name.
-     *
-     * @return string|null
-     */
-    public function getConnection()
-    {
-        return config('passport.storage.database.connection');
-    }
-
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
-        $this->schema->create('oauth_clients', function (Blueprint $table) {
+        Schema::create('oauth_clients', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->unsignedBigInteger('user_id')->nullable()->index();
             $table->string('name');
@@ -61,6 +34,6 @@ public function up()
      */
     public function down()
     {
-        $this->schema->dropIfExists('oauth_clients');
+        Schema::dropIfExists('oauth_clients');
     }
 }
diff --git a/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php
@@ -6,31 +6,14 @@
 
 class CreateOauthPersonalAccessClientsTable extends Migration
 {
-    /**
-     * The database schema.
-     *
-     * @var \Illuminate\Database\Schema\Builder
-     */
-    protected $schema;
-
-    /**
-     * Create a new migration instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->schema = Schema::connection($this->getConnection());
-    }
-
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
-        $this->schema->create('oauth_personal_access_clients', function (Blueprint $table) {
+        Schema::create('oauth_personal_access_clients', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->unsignedBigInteger('client_id');
             $table->timestamps();
@@ -44,16 +27,6 @@ public function up()
      */
     public function down()
     {
-        $this->schema->dropIfExists('oauth_personal_access_clients');
-    }
-
-    /**
-     * Get the migration connection name.
-     *
-     * @return string|null
-     */
-    public function getConnection()
-    {
-        return config('passport.storage.database.connection');
+        Schema::dropIfExists('oauth_personal_access_clients');
     }
 }
diff --git a/src/AuthCode.php b/src/AuthCode.php
@@ -68,14 +68,4 @@ public function client()
     {
         return $this->belongsTo(Passport::clientModel());
     }
-
-    /**
-     * Get the current connection name for the model.
-     *
-     * @return string|null
-     */
-    public function getConnectionName()
-    {
-        return config('passport.storage.database.connection') ?? $this->connection;
-    }
 }
diff --git a/src/Client.php b/src/Client.php
@@ -184,16 +184,6 @@ public function getIncrementing()
         return Passport::clientUuids() ? false : $this->incrementing;
     }
 
-    /**
-     * Get the current connection name for the model.
-     *
-     * @return string|null
-     */
-    public function getConnectionName()
-    {
-        return config('passport.storage.database.connection') ?? $this->connection;
-    }
-
     /**
      * Create a new factory instance for the model.
      *

diff --git a/src/PersonalAccessClient.php b/src/PersonalAccessClient.php
@@ -29,14 +29,4 @@ public function client()
     {
         return $this->belongsTo(Passport::clientModel());
     }
-
-    /**
-     * Get the current connection name for the model.
-     *
-     * @return string|null
-     */
-    public function getConnectionName()
-    {
-        return config('passport.storage.database.connection') ?? $this->connection;
-    }
 }
diff --git a/src/RefreshToken.php b/src/RefreshToken.php
@@ -88,14 +88,4 @@ public function transient()
     {
         return false;
     }
-
-    /**
-     * Get the current connection name for the model.
-     *
-     * @return string|null
-     */
-    public function getConnectionName()
-    {
-        return config('passport.storage.database.connection') ?? $this->connection;
-    }
 }
diff --git a/src/Token.php b/src/Token.php
@@ -160,14 +160,4 @@ public function transient()
     {
         return false;
     }
-
-    /**
-     * Get the current connection name for the model.
-     *
-     * @return string|null
-     */
-    public function getConnectionName()
-    {
-        return config('passport.storage.database.connection') ?? $this->connection;
-    }
 }
diff --git a/tests/Feature/PassportTestCase.php b/tests/Feature/PassportTestCase.php
@@ -44,8 +44,6 @@ protected function getEnvironmentSetUp($app)
 
         $app['config']->set('database.default', 'testbench');
 
-        $app['config']->set('passport.storage.database.connection', 'testbench');
-
         $app['config']->set('database.connections.testbench', [
             'driver'   => 'sqlite',
             'database' => ':memory:',