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

Fix IBM DB2 implementation / ibm_db2 driver #447

Merged
merged 22 commits into from
Dec 20, 2013
Merged

Fix IBM DB2 implementation / ibm_db2 driver #447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0614770
optimize table indexes introspection in DB2
deeky666 Dec 16, 2013
6e6c435
fix table foreign key constraints introspection in DB2
deeky666 Dec 16, 2013
dd0d886
add initial BLOB type support in DB2
deeky666 Dec 16, 2013
4986650
fix truncate table SQL in DB2
deeky666 Dec 16, 2013
9f1bb32
fix current time, date and timestamp SQL in DB2
deeky666 Dec 16, 2013
597e69c
add date arithmetic expressions in DB2
deeky666 Dec 16, 2013
814a980
fix bit operator expressions in DB2
deeky666 Dec 16, 2013
daf4f16
fix portability connection in DB2
deeky666 Dec 16, 2013
46c9506
fix default values in DB2
deeky666 Dec 16, 2013
3dae2a5
fix renaming columns in DB2
deeky666 Dec 16, 2013
e6f9667
fix autoincrement column introspection in DB2
deeky666 Dec 16, 2013
1316c8b
fix empty to null portability in DB2
deeky666 Dec 16, 2013
590b13b
fix required table reorganization after table alteration in DB2
deeky666 Dec 16, 2013
75af6d3
add class and object fetch modes support in DB2
deeky666 Dec 16, 2013
11e462e
add property case compatibility for class fetch mode in DB2
deeky666 Dec 16, 2013
16dbf74
fix CS
deeky666 Dec 16, 2013
fa9bb2d
remove unused use statements
deeky666 Dec 17, 2013
6f1f3fa
fix drop database statement in DB2
deeky666 Dec 17, 2013
531d8a6
fix rename table statement in DB2
deeky666 Dec 17, 2013
1151fc8
remove unnecessary method overrides in DB2
deeky666 Dec 17, 2013
c8518c1
add DB2 platform unit tests
deeky666 Dec 17, 2013
db2e0f3
drop pdo_ibm driver support
deeky666 Dec 17, 2013
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
Prev Previous commit
Next Next commit
fix table foreign key constraints introspection in DB2
  • Loading branch information
@deeky666
deeky666 committed Dec 16, 2013
commit 6e6c4353891975fb90d16890b80a674b2e389221
27 changes: 25 additions & 2 deletions lib/Doctrine/DBAL/Platforms/DB2Platform.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,31 @@ public function getListTableIndexesSQL($table, $currentDatabase = null)
*/
public function getListTableForeignKeysSQL($table)
{
return "SELECT TBNAME, RELNAME, REFTBNAME, DELETERULE, UPDATERULE, FKCOLNAMES, PKCOLNAMES ".
"FROM SYSIBM.SYSRELS WHERE TBNAME = UPPER('".$table."')";
return "SELECT fkcol.COLNAME AS local_column,
fk.REFTABNAME AS foreign_table,
pkcol.COLNAME AS foreign_column,
fk.CONSTNAME AS index_name,
CASE
WHEN fk.UPDATERULE = 'R' THEN 'RESTRICT'
ELSE NULL
END AS on_update,
CASE
WHEN fk.DELETERULE = 'C' THEN 'CASCADE'
WHEN fk.DELETERULE = 'N' THEN 'SET NULL'
WHEN fk.DELETERULE = 'R' THEN 'RESTRICT'
ELSE NULL
END AS on_delete
FROM SYSCAT.REFERENCES AS fk
JOIN SYSCAT.KEYCOLUSE AS fkcol
ON fk.CONSTNAME = fkcol.CONSTNAME
AND fk.TABSCHEMA = fkcol.TABSCHEMA
AND fk.TABNAME = fkcol.TABNAME
JOIN SYSCAT.KEYCOLUSE AS pkcol
ON fk.REFKEYNAME = pkcol.CONSTNAME
AND fk.REFTABSCHEMA = pkcol.TABSCHEMA
AND fk.REFTABNAME = pkcol.TABNAME
WHERE fk.TABNAME = UPPER('" . $table . "')
ORDER BY fkcol.COLSEQ ASC";
}

/**
Expand Down
48 changes: 35 additions & 13 deletions lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,23 +133,45 @@ protected function _getPortableTableIndexesList($tableIndexRows, $tableName = nu
*/
protected function _getPortableTableForeignKeyDefinition($tableForeignKey)
{
$tableForeignKey = array_change_key_case($tableForeignKey, CASE_LOWER);

$tableForeignKey['deleterule'] = $this->_getPortableForeignKeyRuleDef($tableForeignKey['deleterule']);
$tableForeignKey['updaterule'] = $this->_getPortableForeignKeyRuleDef($tableForeignKey['updaterule']);

return new ForeignKeyConstraint(
array_map('trim', (array)$tableForeignKey['fkcolnames']),
$tableForeignKey['reftbname'],
array_map('trim', (array)$tableForeignKey['pkcolnames']),
$tableForeignKey['relname'],
array(
'onUpdate' => $tableForeignKey['updaterule'],
'onDelete' => $tableForeignKey['deleterule'],
)
$tableForeignKey['local_columns'],
$tableForeignKey['foreign_table'],
$tableForeignKey['foreign_columns'],
$tableForeignKey['name'],
$tableForeignKey['options']
);
}

/**
* {@inheritdoc}
*/
protected function _getPortableTableForeignKeysList($tableForeignKeys)
{
$foreignKeys = array();

foreach ($tableForeignKeys as $tableForeignKey) {
$tableForeignKey = array_change_key_case($tableForeignKey, \CASE_LOWER);

if (!isset($foreignKeys[$tableForeignKey['index_name']])) {
$foreignKeys[$tableForeignKey['index_name']] = array(
'local_columns' => array($tableForeignKey['local_column']),
'foreign_table' => $tableForeignKey['foreign_table'],
'foreign_columns' => array($tableForeignKey['foreign_column']),
'name' => $tableForeignKey['index_name'],
'options' => array(
'onUpdate' => $tableForeignKey['on_update'],
'onDelete' => $tableForeignKey['on_delete'],
)
);
} else {
$foreignKeys[$tableForeignKey['index_name']]['local_columns'][] = $tableForeignKey['local_column'];
$foreignKeys[$tableForeignKey['index_name']]['foreign_columns'][] = $tableForeignKey['foreign_column'];
}
}

return parent::_getPortableTableForeignKeysList($foreignKeys);
}

/**
* {@inheritdoc}
*/
Expand Down