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

Merge pull request #12653 from begnini/fix_describe_pgsql_function

Browse source 
limiting the regex to consume only words in default value in pgsql
This commit is contained in:
Mark Story 2018-10-21 02:30:44 +00:00 committed by GitHub
commit 2bdc04e53c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Datasource/Database/Postgres.php
View file

@ -251,7 +251,7 @@ class Postgres extends DboSource {
'default' => preg_replace( 'default' => preg_replace(
"/^'(.*)'$/", "/^'(.*)'$/",
"$1", "$1",
preg_replace('/::.*/', '', $c->default) preg_replace('/::[\w\s]+/', '', $c->default)
), ),
'length' => $length, 'length' => $length,
); );

20
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
View file

@ -1218,4 +1218,24 @@ class PostgresTest extends CakeTestCase {
$this->assertEquals('"col1" uuid', $result); $this->assertEquals('"col1" uuid', $result);
} }
/**
* Test that postgres describes default columns with functions correctly.
*
* @return void
*/
public function testDescribeFunctionDefault() {
$db = $this->Dbo;
$db->execute('CREATE TABLE test_function_default_describe (id integer PRIMARY KEY, year int default date_part(\'year\'::text, now()))');
$data = $db->describe('test_function_default_describe');
$expected = array(
'type' => 'integer',
'null' => true,
'default' => 'date_part(\'year\', now())',
'length' => null,
);
$this->assertSame($expected, $data['year']);
$db->execute('DROP TABLE test_function_default_describe');
}
} }