Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixing conflict resolution in 2e8498e re: pgsql

  • Loading branch information...
commit 6505dd8e2922bb59f68390641d86d8bef64c1725 1 parent d77f9aa
@rchavik rchavik authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 lib/Cake/Model/Datasource/Database/Postgres.php
View
5 lib/Cake/Model/Datasource/Database/Postgres.php
@@ -308,8 +308,9 @@ public function truncate($table, $reset = false) {
}
if ($this->execute('DELETE FROM ' . $this->fullTableName($table))) {
$schema = $this->config['schema'];
- if (isset($this->_sequenceMap[$fullTable]) && $reset != true) {
- foreach ($this->_sequenceMap[$fullTable] as $field => $sequence) {
+ $table = $this->fullTableName($table, false, false);
+ if (isset($this->_sequenceMap[$table]) && $reset != true) {
+ foreach ($this->_sequenceMap[$table] as $field => $sequence) {
$this->_execute("ALTER SEQUENCE \"{$schema}\".\"{$sequence}\" RESTART WITH 1");
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.