adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing conflict resolution in 2e8498e1 re: pgsql

Browse source
This commit is contained in:
Rachman Chavik 2011-12-14 07:41:57 +07:00
parent d77f9aacde
commit 6505dd8e29
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,8 +308,9 @@ class Postgres extends DboSource {
} }
if ($this->execute('DELETE FROM ' . $this->fullTableName($table))) { if ($this->execute('DELETE FROM ' . $this->fullTableName($table))) {
$schema = $this->config['schema']; $schema = $this->config['schema'];
if (isset($this->_sequenceMap[$fullTable]) && $reset != true) { $table = $this->fullTableName($table, false, false);
foreach ($this->_sequenceMap[$fullTable] as $field => $sequence) { if (isset($this->_sequenceMap[$table]) && $reset != true) {
foreach ($this->_sequenceMap[$table] as $field => $sequence) {
$this->_execute("ALTER SEQUENCE \"{$schema}\".\"{$sequence}\" RESTART WITH 1"); $this->_execute("ALTER SEQUENCE \"{$schema}\".\"{$sequence}\" RESTART WITH 1");
} }
} }