Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/BaseMigration.php
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ public function table(string $tableName, array $options = []): Table
/**
* Create a new ForeignKey object.
*
* @params string|string[] $columns Columns
* @param string|string[] $columns Columns
* @return \Migrations\Db\Table\ForeignKey
*/
public function foreignKey(string|array $columns): ForeignKey
Expand All @@ -442,7 +442,7 @@ public function foreignKey(string|array $columns): ForeignKey
/**
* Create a new Index object.
*
* @params string|string[] $columns Columns
* @param string|string[] $columns Columns
* @return \Migrations\Db\Table\Index
*/
public function index(string|array $columns): Index
Expand Down
7 changes: 4 additions & 3 deletions src/Db/Adapter/PostgresAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -944,10 +944,11 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $ta
$constraintName = $foreignKey->getName() ?: (
$parts['table'] . '_' . implode('_', $foreignKey->getColumns()) . '_fkey'
);
$columnList = implode(', ', array_map($this->quoteColumnName(...), $foreignKey->getColumns()));
$refColumnList = implode(', ', array_map($this->quoteColumnName(...), $foreignKey->getReferencedColumns()));
$def = ' CONSTRAINT ' . $this->quoteColumnName($constraintName) .
' FOREIGN KEY ("' . implode('", "', $foreignKey->getColumns()) . '")' .
" REFERENCES {$this->quoteTableName($foreignKey->getReferencedTable())} (\"" .
implode('", "', $foreignKey->getReferencedColumns()) . '")';
' FOREIGN KEY (' . $columnList . ')' .
' REFERENCES ' . $this->quoteTableName($foreignKey->getReferencedTable()) . ' (' . $refColumnList . ')';
if ($foreignKey->getOnDelete()) {
$def .= " ON DELETE {$foreignKey->getOnDelete()}";
}
Expand Down
38 changes: 19 additions & 19 deletions src/Db/Adapter/SqlserverAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ protected function getRenameTableInstructions(string $tableName, string $newTabl
{
$this->updateCreatedTableName($tableName, $newTableName);
$sql = sprintf(
"EXEC sp_rename '%s', '%s'",
$tableName,
$newTableName,
'EXEC sp_rename %s, %s',
$this->quoteString($tableName),
$this->quoteString($newTableName),
);

return new AlterInstructions([], [$sql]);
Expand Down Expand Up @@ -377,23 +377,21 @@ protected function getRenameColumnInstructions(string $tableName, string $column

$oldConstraintName = "DF_{$tableName}_{$columnName}";
$newConstraintName = "DF_{$tableName}_{$newColumnName}";
$sql = <<<SQL
IF (OBJECT_ID('$oldConstraintName', 'D') IS NOT NULL)
$sql = sprintf(
'IF (OBJECT_ID(%s, \'D\') IS NOT NULL)
BEGIN
EXECUTE sp_rename N'%s', N'%s', N'OBJECT'
END
SQL;
$instructions->addPostStep(sprintf(
$sql,
$oldConstraintName,
$newConstraintName,
));
EXECUTE sp_rename %s, %s, N\'OBJECT\'
END',
$this->quoteString($oldConstraintName),
$this->quoteString($oldConstraintName),
$this->quoteString($newConstraintName),
);
$instructions->addPostStep($sql);

$instructions->addPostStep(sprintf(
"EXECUTE sp_rename N'%s.%s', N'%s', 'COLUMN' ",
$tableName,
$columnName,
$newColumnName,
'EXECUTE sp_rename %s, %s, N\'COLUMN\'',
$this->quoteString($tableName . '.' . $columnName),
$this->quoteString($newColumnName),
));

return $instructions;
Expand Down Expand Up @@ -858,10 +856,12 @@ protected function getIndexSqlDefinition(Index $index, string $tableName): strin
protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $tableName): string
{
$constraintName = $foreignKey->getName() ?: $tableName . '_' . implode('_', $foreignKey->getColumns());
$columnList = implode(', ', array_map($this->quoteColumnName(...), $foreignKey->getColumns()));
$refColumnList = implode(', ', array_map($this->quoteColumnName(...), $foreignKey->getReferencedColumns()));

$def = ' CONSTRAINT ' . $this->quoteColumnName($constraintName);
$def .= ' FOREIGN KEY ("' . implode('", "', $foreignKey->getColumns()) . '")';
$def .= " REFERENCES {$this->quoteTableName($foreignKey->getReferencedTable())} (\"" . implode('", "', $foreignKey->getReferencedColumns()) . '")';
$def .= ' FOREIGN KEY (' . $columnList . ')';
$def .= ' REFERENCES ' . $this->quoteTableName($foreignKey->getReferencedTable()) . ' (' . $refColumnList . ')';
if ($foreignKey->getOnDelete()) {
$def .= " ON DELETE {$foreignKey->getOnDelete()}";
}
Expand Down
2 changes: 1 addition & 1 deletion src/View/Helper/MigrationHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ public function tableStatement(string $table, bool $reset = false): string
if (!isset($this->tableStatementStatus[$table])) {
$this->tableStatementStatus[$table] = true;

return '$this->table(\'' . $table . '\')';
return '$this->table(\'' . addslashes($table) . '\')';
}

return '';
Expand Down
2 changes: 1 addition & 1 deletion tests/test_app/config/AltSeeds/AnotherNumbersSeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Migrations\BaseSeed;

/**
* NumbersSeed seed.
* AnotherNumbersSeed seed.
*/
class AnotherNumbersSeed extends BaseSeed
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_app/config/AltSeeds/NumbersAltSeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Migrations\BaseSeed;

/**
* NumbersSeed seed.
* NumbersAltSeed seed.
*/
class NumbersAltSeed extends BaseSeed
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_app/config/BaseSeeds/MigrationSeedNumbers.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Migrations\BaseSeed;

/**
* NumbersSeed seed.
* MigrationSeedNumbers seed.
*/
class MigrationSeedNumbers extends BaseSeed
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_app/config/CallSeeds/DatabaseSeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Migrations\BaseSeed;

/**
* NumbersSeed seed.
* DatabaseSeed seed.
*/
class DatabaseSeed extends BaseSeed
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_app/config/CallSeeds/LettersSeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Migrations\BaseSeed;

/**
* NumbersSeed seed.
* LettersSeed seed.
*/
class LettersSeed extends BaseSeed
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_app/config/CallSeeds/NumbersCallSeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Migrations\BaseSeed;

/**
* NumbersSeed seed.
* NumbersCallSeed seed.
*/
class NumbersCallSeed extends BaseSeed
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_app/config/Seeds/StoresSeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Migrations\BaseSeed;

/**
* NumbersSeed seed.
* StoresSeed seed.
*/
class StoresSeed extends BaseSeed
{
Expand Down