Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Oracle DBO Updates #49

Closed
wants to merge 3 commits into from
Closed

Oracle DBO Updates #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe4c193
Added logic for use with defined schema in Oracle
benmurden Apr 5, 2011
f7f097b
Added tablePrefix to described sequences
benmurden Apr 6, 2011
61a511a
Fix lastInsertId in Oracle when persistModel is used
benmurden Apr 6, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 23 additions & 3 deletions cake/libs/model/datasources/dbo/dbo_oracle.php
View file
Open in desktop
Expand Up @@ -187,6 +187,9 @@ function connect() {
if (!empty($config['nls_comp'])) { if (!empty($config['nls_comp'])) {
$this->execute('ALTER SESSION SET NLS_COMP='.$config['nls_comp']); $this->execute('ALTER SESSION SET NLS_COMP='.$config['nls_comp']);
} }
if (!empty($config['schema'])) {
$this->execute('ALTER SESSION SET CURRENT_SCHEMA='.$config['schema']);
}
$this->execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'"); $this->execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
} else { } else {
$this->connected = false; $this->connected = false;
Expand Down Expand Up @@ -463,11 +466,17 @@ function createTrigger($table) {
* @access public * @access public
*/ */
function listSources() { function listSources() {
$config = $this->config;
$cache = parent::listSources(); $cache = parent::listSources();
if ($cache != null) { if ($cache != null) {
return $cache; return $cache;
} }
$sql = 'SELECT view_name AS name FROM all_views UNION SELECT table_name AS name FROM all_tables';
if (!empty($config['schema'])) {
$sql = 'SELECT view_name AS name FROM all_views WHERE owner = \'' . $config['schema'] . '\' UNION SELECT table_name AS name FROM all_tables WHERE owner = \'' . $config['schema'] . '\'';
} else {
$sql = 'SELECT view_name AS name FROM all_views UNION SELECT table_name AS name FROM all_tables';
}


if (!$this->execute($sql)) { if (!$this->execute($sql)) {
return false; return false;
Expand All @@ -494,7 +503,7 @@ function describe(&$model) {
if (!empty($model->sequence)) { if (!empty($model->sequence)) {
$this->_sequenceMap[$table] = $model->sequence; $this->_sequenceMap[$table] = $model->sequence;
} elseif (!empty($model->table)) { } elseif (!empty($model->table)) {
$this->_sequenceMap[$table] = $model->table . '_seq'; $this->_sequenceMap[$table] = $model->tablePrefix . $model->table . '_seq';
} }


$cache = parent::describe($model); $cache = parent::describe($model);
Expand Down Expand Up @@ -897,7 +906,18 @@ function value($data, $column = null, $safe = false) {
* @access public * @access public
*/ */
function lastInsertId($source) { function lastInsertId($source) {
$sequence = $this->_sequenceMap[$source]; if (empty($this->_sequenceMap[$source])) {

$model = ClassRegistry::init($source);

if (!empty($model->sequence)) {
$sequence = $model->sequence;
} elseif (!empty($model->table)) {
$sequence = $model->tablePrefix . $model->table . '_seq';
}
} else {
$sequence = $this->_sequenceMap[$source];
}
$sql = "SELECT $sequence.currval FROM dual"; $sql = "SELECT $sequence.currval FROM dual";


if (!$this->execute($sql)) { if (!$this->execute($sql)) {
Expand Down