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

Correctly generate bigint primary keys in sqlite.

Browse source 
generate bigint primary keys correctly. Autoincrement cannot be set as
it only works with INTEGER columns[1]. I decided to use some string
manipulations as the entire SQL generation bits are a bit janky and I've
already re-written them for 3.0.

[1] https://www.sqlite.org/autoinc.html

Closes #GH-1552
This commit is contained in:
mark_story 2013-08-27 18:11:04 -04:00
parent 1777c4fdd2
commit c1ae41da51
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/Cake/Model/Datasource/Database/Sqlite.php
View file

@ -407,10 +407,19 @@ class Sqlite extends DboSource {
return null; return null;
} }
if (isset($column['key']) && $column['key'] === 'primary' && $type === 'integer') { $isPrimary = (isset($column['key']) && $column['key'] === 'primary');
if ($isPrimary && $type === 'integer') {
return $this->name($name) . ' ' . $this->columns['primary_key']['name']; return $this->name($name) . ' ' . $this->columns['primary_key']['name'];
} }
return parent::buildColumn($column); $out = parent::buildColumn($column);
if ($isPrimary && $type === 'biginteger') {
$replacement = 'PRIMARY KEY';
if ($column['null'] === false) {
$replacement = 'NOT NULL ' . $replacement;
}
return str_replace($this->columns['primary_key']['name'], $replacement, $out);
}
return $out;
} }
/** /**

11
lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
View file

@ -264,6 +264,17 @@ class SqliteTest extends CakeTestCase {
$result = $this->Dbo->buildColumn($data); $result = $this->Dbo->buildColumn($data);
$expected = '"huge" bigint(20) NOT NULL'; $expected = '"huge" bigint(20) NOT NULL';
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$data = array(
'name' => 'id',
'type' => 'biginteger',
'length' => 20,
'null' => false,
'key' => 'primary',
);
$result = $this->Dbo->buildColumn($data);
$expected = '"id" bigint(20) NOT NULL PRIMARY KEY';
$this->assertEquals($expected, $result);
} }
/** /**