From afe99701572830a936011112dad430ecfc8b682c Mon Sep 17 00:00:00 2001 From: phishy Date: Mon, 29 Dec 2008 21:37:01 +0000 Subject: [PATCH] Fixes #5939 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7965 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/model/datasources/dbo/dbo_oracle.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php index 9118d6d10..d35b5900a 100644 --- a/cake/libs/model/datasources/dbo/dbo_oracle.php +++ b/cake/libs/model/datasources/dbo/dbo_oracle.php @@ -454,7 +454,6 @@ class DboOracle extends DboSource { while($r = $this->fetchRow()) { $sources[] = strtolower($r[0]['name']); } - parent::listSources($sources); return $sources; } /** @@ -835,7 +834,8 @@ class DboOracle extends DboSource { switch($column) { case 'date': - $data = date('Y-m-d H:i:s', strtotime($data)); + $date = new DateTime($data); + $data = $date->format('Y-m-d H:i:s'); $data = "TO_DATE('$data', 'YYYY-MM-DD HH24:MI:SS')"; break; case 'integer' : @@ -975,7 +975,7 @@ class DboOracle extends DboSource { $ins = array_chunk($ins, 1000); foreach ($ins as $i) { $q = str_replace('{$__cakeID__$}', join(', ', $i), $query); - $q = str_replace('= (', 'IN (', $q); + $q = str_replace('= (', 'IN (', $q); $res = $this->fetchAll($q, $model->cacheQueries, $model->alias); $fetch = array_merge($fetch, $res); } @@ -1019,7 +1019,7 @@ class DboOracle extends DboSource { $ins = array_chunk($ins, 1000); foreach ($ins as $i) { $q = str_replace('{$__cakeID__$}', '(' .join(', ', $i) .')', $query); - $q = str_replace('= (', 'IN (', $q); + $q = str_replace('= (', 'IN (', $q); $q = str_replace(' WHERE 1 = 1', '', $q);