mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

- phpBB now uses a less ancient version of Oracle

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8317 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2008-01-09 00:21:29 +00:00
parent 7193d91e40
commit b9b46a8b45
6 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/db/db_tools.php
View File

@@ -129,15 +129,15 @@ class phpbb_db_tools
'TINT:' => 'number(%d)',
'USINT' => 'number(4)',
'BOOL' => 'number(1)',
'VCHAR' => 'varchar2(255)',
'VCHAR:' => 'varchar2(%d)',
'CHAR:' => 'char(%d)',
'XSTEXT' => 'varchar2(1000)',
'STEXT' => 'varchar2(3000)',
'VCHAR' => 'varchar2(255 char)',
'VCHAR:' => 'varchar2(%d char)',
'CHAR:' => 'char(%d char)',
'XSTEXT' => 'varchar2(1000 char)',
'STEXT' => 'varchar2(3000 char)',
'TEXT' => 'clob',
'MTEXT' => 'clob',
'XSTEXT_UNI'=> 'varchar2(300)',
'STEXT_UNI' => 'varchar2(765)',
'XSTEXT_UNI'=> 'varchar2(100 char)',
'STEXT_UNI' => 'varchar2(255 char)',
'TEXT_UNI' => 'clob',
'MTEXT_UNI' => 'clob',
'TIMESTAMP' => 'number(11)',
@@ -145,9 +145,9 @@ class phpbb_db_tools
'DECIMAL:' => 'number(%d, 2)',
'PDECIMAL' => 'number(6, 3)',
'PDECIMAL:' => 'number(%d, 3)',
'VCHAR_UNI' => 'varchar2(765)',
'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
'VCHAR_CI' => 'varchar2(255)',
'VCHAR_UNI' => 'varchar2(255 char)',
'VCHAR_UNI:'=> 'varchar2(%d char)',
'VCHAR_CI' => 'varchar2(255 char)',
'VARBINARY' => 'raw(255)',
),

2
phpBB/includes/db/oracle.php
View File

@@ -50,7 +50,7 @@ class dbal_oracle extends dbal
$connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database;
}
$this->db_connect_id = ($new_link) ? @oci_new_connect($this->user, $sqlpassword, $connect, 'UTF8') : (($this->persistency) ? @oci_pconnect($this->user, $sqlpassword, $connect, 'UTF8') : @oci_connect($this->user, $sqlpassword, $connect, 'UTF8'));
$this->db_connect_id = ($new_link) ? @oci_new_connect($this->user, $sqlpassword, $connect, 'AL32UTF8') : (($this->persistency) ? @oci_pconnect($this->user, $sqlpassword, $connect, 'AL32UTF8') : @oci_connect($this->user, $sqlpassword, $connect, 'AL32UTF8'));
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
}