chore: remove deprecated methods (#178)

CHANGELOG.md

@@ -12,6 +12,9 @@ Changed
 - `Query\Builder::lock()` no longer throw an error and will be ignored instead (#156)
 - `Schema\Builder::getIndexListing()` `Schema\Grammar::compileIndexListing()` converted to `getIndexes()` and `compileIndexes()` to align with standard Laravel methods (#161)
 - Missing primary key will no longer be checked and will be checked on the server side instead (#177)
+- `Connection::runDdl()` and `Connection::runDdls()` has been removed. Use `Connection::runDdlBatch()` instead. (#178)
+- Trait `ManagesStaleReads` has been removed (which contained `cursorWithTimestampBound()` and `selectWithTimestampBound()`. Use `selectWithOptions()` instead). (#178)
+- `Blueprint::interleave()` and `IndexDefinition::interleave()` now throw an error instead of a deprecation. (#178)
 
 Fixed
 - `Schema\Grammar::compileAdd()` `Schema\Grammar::compileChange()` `Schema\Grammar::compileChange()` now create separate statements (#159)

src/Concerns/ManagesDataDefinitions.php

@@ -21,7 +21,6 @@
 use Google\Cloud\Spanner\Database;
 use RuntimeException;
 use function json_encode;
-use function trigger_deprecation;
 
 trait ManagesDataDefinitions
 {
@@ -30,28 +29,6 @@ trait ManagesDataDefinitions
      */
     abstract public function getSpannerDatabase(): Database;
 
-    /**
-     * @deprecated use runDdlBatch() instead
-     * @param string $ddl
-     * @return LongRunningOperation
-     */
-    public function runDdl(string $ddl): LongRunningOperation
-    {
-        trigger_deprecation('colopl/laravel-spanner', '5.2', 'runDdl() is deprecated. Use runDdlBatch() instead.');
-        return $this->getSpannerDatabase()->updateDdl($ddl);
-    }
-
-    /**
-     * @deprecated use runDdlBatch() instead
-     * @param string[] $ddls
-     * @return LongRunningOperation
-     */
-    public function runDdls(array $ddls): LongRunningOperation
-    {
-        trigger_deprecation('colopl/laravel-spanner', '5.2', 'runDdls() is deprecated. Use runDdlBatch() instead.');
-        return $this->getSpannerDatabase()->updateDdlBatch($ddls);
-    }
-
     /**
      * @param list<string> $statements
      * @return mixed

src/Connection.php

@@ -52,7 +52,6 @@ class Connection extends BaseConnection
         Concerns\ManagesPartitionedDml,
         Concerns\ManagesSessionPool,
         Concerns\ManagesTransactions,
-        Concerns\ManagesStaleReads,
         Concerns\MarksAsNotSupported;
 
     /**

src/Schema/Blueprint.php

@@ -21,6 +21,7 @@
 use Illuminate\Database\Schema\Blueprint as BaseBlueprint;
 use Illuminate\Database\Schema\ColumnDefinition;
 use Illuminate\Support\Fluent;
+use LogicException;
 
 /**
  * @method IndexDefinition index(string|string[] $columns, string|null $name = null)
@@ -219,8 +220,7 @@ public function timestampArray($column)
      */
     public function interleave(string $parentTableName)
     {
-        trigger_deprecation('colopl/laravel-spanner', '5.2', 'Blueprint::interleave() is deprecated. Use interleaveInParent() instead. This method will be removed in v7.');
-        return $this->interleaveInParent($parentTableName);
+        throw new LogicException('This method is not longer valid. Use interleaveInParent() instead.');
     }
 
     /**

src/Schema/IndexDefinition.php

@@ -3,6 +3,7 @@
 namespace Colopl\Spanner\Schema;
 
 use Illuminate\Support\Fluent;
+use LogicException;
 
 /**
  * @method $this interleaveIn(string $table)
@@ -19,7 +20,6 @@ class IndexDefinition extends Fluent
      */
     public function interleave(string $table)
     {
-        trigger_deprecation('colopl/laravel-spanner', '5.2', 'Blueprint::interleave() is deprecated. Use interleaveIn() instead. This method will be removed in v7.');
-        return $this->interleaveIn($table);
+        throw new LogicException('This method is not longer valid. Use interleaveIn() instead.');
     }
 }

tests/ConnectionTest.php

@@ -480,32 +480,32 @@ public function test_stale_reads(): void
         $this->assertNotEmpty($timestamp);
 
         $timestampBound = new StrongRead();
-        $row = $conn->selectOneWithTimestampBound("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound);
-        $this->assertNotEmpty($row);
-        $this->assertEquals($uuid, $row['userId']);
-        $this->assertEquals('first', $row['name']);
+        $rows = $conn->selectWithOptions("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound->transactionOptions());
+        $this->assertCount(1, $rows);
+        $this->assertSame($uuid, $rows[0]['userId']);
+        $this->assertSame('first', $rows[0]['name']);
 
         $oldDatetime = Carbon::instance($timestamp->get())->subSecond();
 
         $timestampBound = new ReadTimestamp($oldDatetime);
-        $row = $conn->selectOneWithTimestampBound("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound);
-        $this->assertEmpty($row);
+        $rows = $conn->selectWithOptions("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound->transactionOptions());
+        $this->assertEmpty($rows);
 
         $timestampBound = new ExactStaleness(10);
-        $row = $conn->selectOneWithTimestampBound("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound);
-        $this->assertEmpty($row);
+        $rows = $conn->selectWithOptions("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound->transactionOptions());
+        $this->assertEmpty($rows);
 
         $timestampBound = new MaxStaleness(10);
-        $row = $conn->selectOneWithTimestampBound("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound);
-        $this->assertNotEmpty($row);
-        $this->assertEquals($uuid, $row['userId']);
-        $this->assertEquals('first', $row['name']);
+        $rows = $conn->selectWithOptions("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound->transactionOptions());
+        $this->assertCount(1, $rows);
+        $this->assertSame($uuid, $rows[0]['userId']);
+        $this->assertSame('first', $rows[0]['name']);
 
         $timestampBound = new MinReadTimestamp($oldDatetime);
-        $row = $conn->selectOneWithTimestampBound("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound);
-        $this->assertNotEmpty($row);
-        $this->assertEquals($uuid, $row['userId']);
-        $this->assertEquals('first', $row['name']);
+        $rows = $conn->selectWithOptions("SELECT * FROM ${tableName} WHERE userID = ?", [$uuid], $timestampBound->transactionOptions());
+        $this->assertCount(1, $rows);
+        $this->assertSame($uuid, $rows[0]['userId']);
+        $this->assertSame('first', $rows[0]['name']);
     }
 
     public function testEventListenOrder(): void

tests/Schema/BlueprintTest.php

@@ -465,13 +465,11 @@ public function test_index_with_interleave(): void
         $conn = $this->getDefaultConnection();
         $blueprint = new Blueprint('UserItem', function (Blueprint $table) {
             $table->index(['userId', 'createdAt'])->interleaveIn('User');
-            $table->index(['userId', 'updatedAt'])->interleave('User');
         });
 
         $statements = $blueprint->toSql($conn, new Grammar());
         $this->assertSame([
                 'create index `useritem_userid_createdat_index` on `UserItem` (`userId`, `createdAt`), interleave in `User`',
-                'create index `useritem_userid_updatedat_index` on `UserItem` (`userId`, `updatedAt`), interleave in `User`',
             ],
             $statements
         );