adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Generated SQL should not contain multi-column primary keys

Browse source 
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.

Fixes #3069
This commit is contained in:
mark_story 2012-07-27 22:31:49 -04:00
parent 99813e97b3
commit 27e2132a13
2 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/Cake/Model/Datasource/DboSource.php
View file

@ -2953,11 +2953,24 @@ class DboSource extends DataSource {
$primary = null; $primary = null;
$table = $this->fullTableName($curTable); $table = $this->fullTableName($curTable);
$primaryCount = 0;
foreach ($columns as $col) {
if (isset($col['key']) && $col['key'] === 'primary') {
$primaryCount++;
}
}
foreach ($columns as $name => $col) { foreach ($columns as $name => $col) {
if (is_string($col)) { if (is_string($col)) {
$col = array('type' => $col); $col = array('type' => $col);
} }
if (isset($col['key']) && $col['key'] === 'primary') { $isPrimary = isset($col['key']) && $col['key'] === 'primary';
// Multi-column primary keys are not supported.
if ($isPrimary && $primaryCount > 1) {
unset($col['key']);
$isPrimary = false;
}
if ($isPrimary) {
$primary = $name; $primary = $name;
} }
if ($name !== 'indexes' && $name !== 'tableParameters') { if ($name !== 'indexes' && $name !== 'tableParameters') {

39
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
View file

@ -838,6 +838,45 @@ class MysqlTest extends CakeTestCase {
$this->assertEquals('Test Comment', $result['other_col']['comment']); $this->assertEquals('Test Comment', $result['other_col']['comment']);
} }
/**
* Test that two columns with key => primary doesn't create invalid sql.
*
* @return void
*/
public function testTwoColumnsWithPrimaryKey() {
$schema = new CakeSchema(array(
'connection' => 'test',
'roles_users' => array(
'role_id' => array(
'type' => 'integer',
'null' => false,
'default' => null,
'key' => 'primary'
),
'user_id' => array(
'type' => 'integer',
'null' => false,
'default' => null,
'key' => 'primary'
),
'indexes' => array(
'user_role_index' => array(
'column' => array('role_id', 'user_id'),
'unique' => 1
),
'user_index' => array(
'column' => 'user_id',
'unique' => 0
)
),
)
));
$result = $this->Dbo->createSchema($schema);
$this->assertContains('`role_id` int(11) NOT NULL,', $result);
$this->assertContains('`user_id` int(11) NOT NULL,', $result);
}
/** /**
* Tests that listSources method sends the correct query and parses the result accordingly * Tests that listSources method sends the correct query and parses the result accordingly
* @return void * @return void