Skip to content
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

Jump to bottom

Fix foreign key constraint on moddb report_template_acls #1171

Merged
merged 3 commits into from
Dec 4, 2019
Merged

Fix foreign key constraint on moddb report_template_acls #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e27552
Fix foreign key constraint on moddb report_template_acls
jpwhite4 Nov 27, 2019
2c9a1fa
Update existing test artifacts
jpwhite4 Dec 2, 2019
eaf737c
Add explicit test for NO ACTION to CASCADE updates
jpwhite4 Dec 3, 2019
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
8 changes: 4 additions & 4 deletions classes/ETL/DbModel/ForeignKeyConstraint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,15 @@ public function compare(iEntity $cmp)
}

if ($this->on_delete != $cmp->on_delete
&& !in_array($this->on_delete, array(null, 'RESTRICT', 'NO ACTION'))
&& !in_array($cmp->on_delete, array(null, 'RESTRICT', 'NO ACTION'))
&& !(in_array($this->on_delete, array(null, 'RESTRICT', 'NO ACTION'))
&& in_array($cmp->on_delete, array(null, 'RESTRICT', 'NO ACTION')))
jtpalmer marked this conversation as resolved.
Show resolved Hide resolved
) {
return -2;
}

if ($this->on_update != $cmp->on_update
&& !in_array($this->on_update, array(null, 'RESTRICT', 'NO ACTION'))
&& !in_array($cmp->on_update, array(null, 'RESTRICT', 'NO ACTION'))
&& !(in_array($this->on_update, array(null, 'RESTRICT', 'NO ACTION'))
&& in_array($cmp->on_update, array(null, 'RESTRICT', 'NO ACTION')))
) {
return -3;
}
Expand Down
11 changes: 8 additions & 3 deletions classes/ETL/DbModel/Table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,7 @@ public function getAlterSql($destination, $includeSchema = true)
$alterList = array();
$changeList = array();
$triggerList = array();
$foreignKeyList = array();

// --------------------------------------------------------------------------------
// Process columns
Expand Down Expand Up @@ -954,8 +955,8 @@ public function getAlterSql($destination, $includeSchema = true)
if ( 0 == $destForeignKeyConstraint->compare($this->getForeignKeyConstraint($name)) ) {
continue;
}
$alterList[] = 'DROP FOREIGN KEY ' . $destForeignKeyConstraint->getName(true);
$alterList[] = 'ADD ' . $destForeignKeyConstraint->getSql($includeSchema);
$foreignKeyList[] = 'DROP FOREIGN KEY ' . $destForeignKeyConstraint->getName(true);
$foreignKeyList[] = 'ADD ' . $destForeignKeyConstraint->getSql($includeSchema);
}

// --------------------------------------------------------------------------------
Expand Down Expand Up @@ -998,7 +999,7 @@ public function getAlterSql($destination, $includeSchema = true)
// --------------------------------------------------------------------------------
// Put it all together

if ( 0 == count($alterList) && 0 == count($changeList) && 0 == count($triggerList) ) {
if ( 0 == count($alterList) && 0 == count($changeList) && 0 == count($triggerList) && 0 == count($foreignKeyList) ) {
return false;
}

Expand All @@ -1013,6 +1014,10 @@ public function getAlterSql($destination, $includeSchema = true)
$sqlList[] = sprintf("ALTER TABLE %s\n%s;", $tableName, implode(",\n", $changeList));
}

foreach ($foreignKeyList as $fkey) {
$sqlList[] = sprintf("ALTER TABLE %s\n%s;", $tableName, $fkey);
}

if ( 0 != count($triggerList) ) {
foreach ( $triggerList as $trigger ) {
$sqlList[] = $trigger;
Expand Down
3 changes: 2 additions & 1 deletion configuration/etl/etl_tables.d/acls/report_template_acls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"referenced_table": "acls",
"referenced_columns": [
"acl_id"
]
],
"on_delete": "CASCADE"
}
]
}
Expand Down
8 changes: 5 additions & 3 deletions tests/artifacts/xdmod/etlv2/dbmodel/output/alter_table-charset.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ ALTER TABLE `test_db_model`
CHARSET = utf8mb4,
COLLATE = utf8mb4_general_ci,
DROP INDEX `fk_instance`,
ADD INDEX `fk_instance` USING BTREE (`instance_id`, `inferred`),
DROP FOREIGN KEY `con_col1`,
ADD CONSTRAINT `con_col1` FOREIGN KEY (`col1`) REFERENCES `db_test_model2` (`col4`);
ADD INDEX `fk_instance` USING BTREE (`instance_id`, `inferred`);
ALTER TABLE `test_db_model`
CHANGE COLUMN `col1` `col1` varchar(32) CHARSET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'mydefault' ,
CHANGE COLUMN `instance_id` `instance_id` int(11) NULL DEFAULT -1 ;
ALTER TABLE `test_db_model`
DROP FOREIGN KEY `con_col1`;
ALTER TABLE `test_db_model`
ADD CONSTRAINT `con_col1` FOREIGN KEY (`col1`) REFERENCES `db_test_model2` (`col4`);
8 changes: 5 additions & 3 deletions tests/artifacts/xdmod/etlv2/dbmodel/output/alter_table_manually-charset.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ ADD COLUMN `new_column2` char(64) CHARSET utf8mb4 COLLATE utf8mb4_general_ci NUL
ADD INDEX `index_new_column` (`new_column`),
DROP INDEX `fk_instance`,
ADD INDEX `fk_instance` USING BTREE (`instance_id`, `inferred`),
ADD CONSTRAINT `fk_new_column` FOREIGN KEY (`new_column`) REFERENCES `other_table` (`other_column`),
DROP FOREIGN KEY `con_col1`,
ADD CONSTRAINT `con_col1` FOREIGN KEY (`col1`) REFERENCES `db_test_model2` (`col4`);
ADD CONSTRAINT `fk_new_column` FOREIGN KEY (`new_column`) REFERENCES `other_table` (`other_column`);
ALTER TABLE `test_db_model`
CHANGE COLUMN `col1` `col1` varchar(32) CHARSET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'mydefault' ,
CHANGE COLUMN `instance_id` `instance_id` int(11) NULL DEFAULT -1 ;
ALTER TABLE `test_db_model`
DROP FOREIGN KEY `con_col1`;
ALTER TABLE `test_db_model`
ADD CONSTRAINT `con_col1` FOREIGN KEY (`col1`) REFERENCES `db_test_model2` (`col4`);
CREATE TRIGGER `before_ins` BEFORE INSERT ON `jobfact` FOR EACH ROW
BEGIN DELETE FROM jobfactstatus WHERE job_id = NEW.job_id; END
6 changes: 6 additions & 0 deletions tests/ci/validate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,10 @@ then
exitcode=1
fi

if ! mysqldump -d moddb report_template_acls | grep -q "ON DELETE CASCADE"
then
echo "Missing/incorrect foreign key constraint on report_template_acls table"
exitcode=1
fi

exit $exitcode
32 changes: 32 additions & 0 deletions tests/unit/lib/ETL/DbModel/DbModelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,38 @@ public function testCreateSql()

}

/**
* Confirm foreign key contraint changes work.
*/
public function testAlterTableContraints()
{
$config = self::TEST_ARTIFACT_INPUT_PATH . '/table_def-charset.json';

$origTable = new Table($config, '`', self::$logger);
$fkconfig = (object) array(
'columns' => array('new_column'),
'referenced_table' => 'other_table',
'referenced_columns' => array('other_column'),
'on_delete' => 'NO ACTION'
);
$origTable->addForeignKeyConstraint($fkconfig);

$targetTable = new Table($config, '`', self::$logger);
$fkconfig1 = (object) array(
'columns' => array('new_column'),
'referenced_table' => 'other_table',
'referenced_columns' => array('other_column'),
'on_delete' => 'CASCADE'
);
$targetTable->addForeignKeyConstraint($fkconfig1);

$sql = $origTable->getAlterSql($targetTable);

$this->assertCount(2, $sql);
$this->assertEquals("ALTER TABLE `test_db_model`\nDROP FOREIGN KEY `fk_new_column`;", trim($sql[0]));
$this->assertEquals("ALTER TABLE `test_db_model`\nADD CONSTRAINT `fk_new_column` FOREIGN KEY (`new_column`) REFERENCES `other_table` (`other_column`) ON DELETE CASCADE;", trim($sql[1]));
}

/**
* Test comparing 2 tables and the ALTER TABLE statement needed to go from one to the other.
* Also manually add elements and verify the ALTER TABLE statement generated.
Expand Down