Skip to content

Update more deprecated method usage #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markstory merged 1 commit into from
Mar 11, 2025
Merged

Update more deprecated method usage #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 32 additions & 15 deletions tests/TestCase/Db/Adapter/MysqlAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Migrations\Db\Literal;
use Migrations\Db\Table;
use Migrations\Db\Table\Column;
use Migrations\Db\Table\ForeignKey;
use PDO;
use PDOException;
use PHPUnit\Framework\Attributes\DataProvider;
Expand Down Expand Up @@ -1679,21 +1680,22 @@ public function testDropForeignKeyWithIdenticalMultipleColumns()
->save();

$table = new Table('table', [], $this->adapter);
$keyOne = (new ForeignKey())
->setName('ref_table_fk_1')
->setColumns(['ref_table_id', 'ref_table_field1'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id', 'field1']);
$keyTwo = (new ForeignKey())
->setName('ref_table_fk_2')
->setColumns(['ref_table_id', 'ref_table_field1'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id', 'field1']);

$table
->addColumn('ref_table_id', 'integer', ['signed' => false])
->addColumn('ref_table_field1', 'string', ['limit' => 8])
->addForeignKeyWithName(
'ref_table_fk_1',
['ref_table_id', 'ref_table_field1'],
'ref_table',
['id', 'field1'],
)
->addForeignKeyWithName(
'ref_table_fk_2',
['ref_table_id', 'ref_table_field1'],
'ref_table',
['id', 'field1']
)
->addForeignKey($keyOne)
->addForeignKey($keyTwo)
->save();

$this->assertTrue($this->adapter->hasForeignKey($table->getName(), ['ref_table_id', 'ref_table_field1']));
Expand Down Expand Up @@ -1770,9 +1772,14 @@ public function testDropForeignKeyByName()
$refTable->save();

$table = new Table('table', [], $this->adapter);
$key = (new ForeignKey())
->setName('my_constraint')
->setColumns(['ref_table_id'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id']);
$table
->addColumn('ref_table_id', 'integer', ['signed' => false])
->addForeignKeyWithName('my_constraint', ['ref_table_id'], 'ref_table', ['id'])
->addForeignKey($key)
->save();

$this->adapter->dropForeignKey($table->getName(), [], 'my_constraint');
Expand Down Expand Up @@ -1865,9 +1872,14 @@ public function testHasNamedForeignKey()
$refTable->addColumn('field1', 'string')->save();

$table = new Table('table', [], $this->adapter);
$key = (new ForeignKey())
->setName('my_constraint')
->setColumns(['ref_table_id'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id']);
$table
->addColumn('ref_table_id', 'integer', ['signed' => false])
->addForeignKeyWithName('my_constraint', ['ref_table_id'], 'ref_table', ['id'])
->addForeignKey($key)
->save();

$this->assertTrue($this->adapter->hasForeignKey($table->getName(), ['ref_table_id'], 'my_constraint'));
Expand All @@ -1883,9 +1895,14 @@ public function testHasForeignKeyWithConstraintForTableWithSignedPK()
$refTable->addColumn('field1', 'string')->save();

$table = new Table('table', [], $this->adapter);
$key = (new ForeignKey())
->setName('my_constraint')
->setColumns(['ref_table_id'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id']);
$table
->addColumn('ref_table_id', 'integer')
->addForeignKeyWithName('my_constraint', ['ref_table_id'], 'ref_table', ['id'])
->addForeignKey($key)
->save();

$this->assertTrue($this->adapter->hasForeignKey($table->getName(), ['ref_table_id'], 'my_constraint'));
Expand Down
32 changes: 19 additions & 13 deletions tests/TestCase/Db/Adapter/SqliteAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,21 +1462,22 @@ public function testDropForeignKeyWithIdenticalMultipleColumns()
->save();

$table = new Table('table', [], $this->adapter);
$keyOne = (new ForeignKey())
->setName('ref_table_fk_1')
->setColumns(['ref_table_id', 'ref_table_field1'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id', 'field1']);
$keyTwo = (new ForeignKey())
->setName('ref_table_fk_2')
->setColumns(['ref_table_id', 'ref_table_field1'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id', 'field1']);

$table
->addColumn('ref_table_id', 'integer', ['signed' => false])
->addColumn('ref_table_field1', 'string')
->addForeignKeyWithName(
'ref_table_fk_1',
['ref_table_id', 'ref_table_field1'],
'ref_table',
['id', 'field1'],
)
->addForeignKeyWithName(
'ref_table_fk_2',
['ref_table_id', 'ref_table_field1'],
'ref_table',
['id', 'field1']
)
->addForeignKey($keyOne)
->addForeignKey($keyTwo)
->save();

$this->assertTrue($this->adapter->hasForeignKey($table->getName(), ['ref_table_id', 'ref_table_field1']));
Expand Down Expand Up @@ -1556,9 +1557,14 @@ public function testDropForeignKeyByName()
$refTable->save();

$table = new Table('table', [], $this->adapter);
$key = (new ForeignKey())
->setName('my_constraint')
->setColumns(['ref_table_id'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id']);
$table
->addColumn('ref_table_id', 'integer', ['signed' => false])
->addForeignKeyWithName('my_constraint', ['ref_table_id'], 'ref_table', ['id'])
->addForeignKey($key)
->save();

$this->adapter->dropForeignKey($table->getName(), [], 'my_constraint');
Expand Down
40 changes: 25 additions & 15 deletions tests/TestCase/Db/Adapter/SqlserverAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ public function testAddForeignKey()
$fk->setReferencedTable($refTable->getTable())
->setColumns(['ref_table_id'])
->setReferencedColumns(['id'])
->setConstraint('fk1');
->setName('fk1');

$this->adapter->addForeignKey($table->getTable(), $fk);
$this->assertTrue($this->adapter->hasForeignKey($table->getName(), ['ref_table_id'], 'fk1'));
Expand Down Expand Up @@ -932,21 +932,21 @@ public function testDropForeignKeyWithIdenticalMultipleColumns()
->save();

$table = new Table('table', [], $this->adapter);
$keyOne = (new ForeignKey())
->setName('ref_table_fk_1')
->setColumns(['ref_table_id', 'ref_table_field1'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id', 'field1']);
$keyTwo = (new ForeignKey())
->setName('ref_table_fk_2')
->setColumns(['ref_table_id', 'ref_table_field1'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id', 'field1']);
$table
->addColumn('ref_table_id', 'integer', ['signed' => false])
->addColumn('ref_table_field1', 'string')
->addForeignKeyWithName(
'ref_table_fk_1',
['ref_table_id', 'ref_table_field1'],
'ref_table',
['id', 'field1'],
)
->addForeignKeyWithName(
'ref_table_fk_2',
['ref_table_id', 'ref_table_field1'],
'ref_table',
['id', 'field1']
)
->addForeignKey($keyOne)
->addForeignKey($keyTwo)
->save();

$this->assertTrue($this->adapter->hasForeignKey($table->getName(), ['ref_table_id', 'ref_table_field1']));
Expand Down Expand Up @@ -1030,9 +1030,14 @@ public function testDropForeignKeyByName()
$refTable->save();

$table = new Table('table', [], $this->adapter);
$key = (new ForeignKey())
->setName('my_constraint')
->setColumns(['ref_table_id'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id']);
$table
->addColumn('ref_table_id', 'integer', ['signed' => false])
->addForeignKeyWithName('my_constraint', ['ref_table_id'], 'ref_table', ['id'])
->addForeignKey($key)
->save();

$this->adapter->dropForeignKey($table->getName(), [], 'my_constraint');
Expand Down Expand Up @@ -1080,9 +1085,14 @@ public function testHasNamedForeignKey()
$refTable->save();

$table = new Table('table', [], $this->adapter);
$key = (new ForeignKey())
->setName('my_constraint')
->setColumns(['ref_table_id'])
->setReferencedTable('ref_table')
->setReferencedColumns(['id']);
$table
->addColumn('ref_table_id', 'integer')
->addForeignKeyWithName('my_constraint', ['ref_table_id'], 'ref_table', ['id'])
->addForeignKey($key)
->save();

$this->assertTrue($this->adapter->hasForeignKey($table->getName(), ['ref_table_id'], 'my_constraint'));
Expand Down
Loading