summaryrefslogtreecommitdiff
path: root/program/lib/MDB2/Driver/Manager
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-03-12 08:13:59 +0000
committeralecpl <alec@alec.pl>2010-03-12 08:13:59 +0000
commit7244b4500e2b685cee5e9c4746a87f12acb56297 (patch)
tree7649eb06e5ae60b8de741256add44cd74443d47b /program/lib/MDB2/Driver/Manager
parentbc404ffd41c3411510a022ae5b0c9f2bfe8f5db1 (diff)
- Merge changes from MDB2's trunk
Diffstat (limited to 'program/lib/MDB2/Driver/Manager')
-rw-r--r--program/lib/MDB2/Driver/Manager/mssql.php46
-rw-r--r--program/lib/MDB2/Driver/Manager/mysql.php54
-rw-r--r--program/lib/MDB2/Driver/Manager/mysqli.php54
-rw-r--r--program/lib/MDB2/Driver/Manager/pgsql.php42
-rw-r--r--program/lib/MDB2/Driver/Manager/sqlite.php52
-rw-r--r--program/lib/MDB2/Driver/Manager/sqlsrv.php54
6 files changed, 151 insertions, 151 deletions
diff --git a/program/lib/MDB2/Driver/Manager/mssql.php b/program/lib/MDB2/Driver/Manager/mssql.php
index 16e1bbe38..22a40543a 100644
--- a/program/lib/MDB2/Driver/Manager/mssql.php
+++ b/program/lib/MDB2/Driver/Manager/mssql.php
@@ -44,7 +44,7 @@
// | Lorenzo Alberton <l.alberton@quipo.it> |
// +----------------------------------------------------------------------+
//
-// $Id: mssql.php 292715 2009-12-28 14:06:34Z quipo $
+// $Id: mssql.php 295587 2010-02-28 17:16:38Z quipo $
//
require_once 'MDB2/Driver/Manager/Common.php';
@@ -74,7 +74,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function createDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -106,7 +106,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function alterDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -138,7 +138,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function dropDatabase($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -245,7 +245,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function truncateTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -275,7 +275,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function vacuum($table = null, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -385,7 +385,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function alterTable($name, $changes, $check)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -546,7 +546,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function _dropConflictingIndices($table, $fields)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -592,7 +592,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function _dropConflictingConstraints($table, $fields)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -647,7 +647,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function _getTableFieldDefaultConstraint($table, $field)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -673,7 +673,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listTables()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
@@ -710,7 +710,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listTableFields($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -742,7 +742,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listTableIndexes($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -790,7 +790,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listDatabases()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -816,7 +816,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listUsers()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -842,7 +842,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listFunctions()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -883,7 +883,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listTableTriggers($table = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -924,7 +924,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listViews()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -967,7 +967,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function dropIndex($table, $name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -990,7 +990,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listTableConstraints($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1033,7 +1033,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function createSequence($seq_name, $start = 1)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1079,7 +1079,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function dropSequence($seq_name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1099,7 +1099,7 @@ class MDB2_Driver_Manager_mssql extends MDB2_Driver_Manager_Common
*/
function listSequences()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
diff --git a/program/lib/MDB2/Driver/Manager/mysql.php b/program/lib/MDB2/Driver/Manager/mysql.php
index 2fb15aac1..a7afa76e1 100644
--- a/program/lib/MDB2/Driver/Manager/mysql.php
+++ b/program/lib/MDB2/Driver/Manager/mysql.php
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id: mysql.php 292715 2009-12-28 14:06:34Z quipo $
+// $Id: mysql.php 295587 2010-02-28 17:16:38Z quipo $
//
require_once 'MDB2/Driver/Manager/Common.php';
@@ -71,7 +71,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function createDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -101,7 +101,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function alterDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -128,7 +128,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function dropDatabase($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -204,7 +204,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function createTable($name, $fields, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -285,7 +285,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function dropTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -321,7 +321,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function truncateTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -349,7 +349,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function vacuum($table = null, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -474,7 +474,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function alterTable($name, $changes, $check)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -575,7 +575,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listDatabases()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -601,7 +601,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listUsers()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -620,7 +620,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listFunctions()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -653,7 +653,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listTableTriggers($table = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -685,7 +685,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listTables($database = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -725,7 +725,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listViews($database = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -759,7 +759,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listTableFields($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -815,7 +815,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function createIndex($table, $name, $definition)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -848,7 +848,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function dropIndex($table, $name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -870,7 +870,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listTableIndexes($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -934,7 +934,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function createConstraint($table, $name, $definition)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1008,7 +1008,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function dropConstraint($table, $name, $primary = false)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1058,7 +1058,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function _createFKTriggers($table, $foreign_keys)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1204,7 +1204,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function _dropFKTriggers($table, $fkname, $referenced_table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1238,7 +1238,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listTableConstraints($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1313,7 +1313,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function createSequence($seq_name, $start = 1, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1386,7 +1386,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function dropSequence($seq_name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1407,7 +1407,7 @@ class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
*/
function listSequences($database = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
diff --git a/program/lib/MDB2/Driver/Manager/mysqli.php b/program/lib/MDB2/Driver/Manager/mysqli.php
index d08544988..f01747aa7 100644
--- a/program/lib/MDB2/Driver/Manager/mysqli.php
+++ b/program/lib/MDB2/Driver/Manager/mysqli.php
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id: mysqli.php 292715 2009-12-28 14:06:34Z quipo $
+// $Id: mysqli.php 295587 2010-02-28 17:16:38Z quipo $
//
require_once 'MDB2/Driver/Manager/Common.php';
@@ -71,7 +71,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function createDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -101,7 +101,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function alterDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -128,7 +128,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function dropDatabase($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -204,7 +204,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function createTable($name, $fields, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -285,7 +285,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function dropTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -321,7 +321,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function truncateTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -349,7 +349,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function vacuum($table = null, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -474,7 +474,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function alterTable($name, $changes, $check)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -575,7 +575,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listDatabases()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -601,7 +601,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listUsers()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -620,7 +620,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listFunctions()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -653,7 +653,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listTableTriggers($table = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -685,7 +685,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listTables($database = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -725,7 +725,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listViews($database = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -759,7 +759,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listTableFields($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -815,7 +815,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function createIndex($table, $name, $definition)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -848,7 +848,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function dropIndex($table, $name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -870,7 +870,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listTableIndexes($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -934,7 +934,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function createConstraint($table, $name, $definition)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1008,7 +1008,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function dropConstraint($table, $name, $primary = false)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1058,7 +1058,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function _createFKTriggers($table, $foreign_keys)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1204,7 +1204,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function _dropFKTriggers($table, $fkname, $referenced_table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1238,7 +1238,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listTableConstraints($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1313,7 +1313,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function createSequence($seq_name, $start = 1, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1386,7 +1386,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function dropSequence($seq_name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1407,7 +1407,7 @@ class MDB2_Driver_Manager_mysqli extends MDB2_Driver_Manager_Common
*/
function listSequences($database = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
diff --git a/program/lib/MDB2/Driver/Manager/pgsql.php b/program/lib/MDB2/Driver/Manager/pgsql.php
index 913a58db0..7d356277b 100644
--- a/program/lib/MDB2/Driver/Manager/pgsql.php
+++ b/program/lib/MDB2/Driver/Manager/pgsql.php
@@ -42,7 +42,7 @@
// | Author: Paul Cooper <pgc@ucecom.com> |
// +----------------------------------------------------------------------+
//
-// $Id: pgsql.php 292715 2009-12-28 14:06:34Z quipo $
+// $Id: pgsql.php 295587 2010-02-28 17:16:38Z quipo $
require_once 'MDB2/Driver/Manager/Common.php';
@@ -68,7 +68,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function createDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -95,7 +95,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function alterDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -122,7 +122,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function dropDatabase($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -181,7 +181,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function truncateTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -209,7 +209,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function vacuum($table = null, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -326,7 +326,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function alterTable($name, $changes, $check)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -441,7 +441,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listDatabases()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -474,7 +474,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listUsers()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -501,7 +501,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listViews()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -532,7 +532,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listTableViews($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -560,7 +560,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listFunctions()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -599,7 +599,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listTableTriggers($table = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -633,7 +633,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listTables()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -680,7 +680,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listTableFields($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -716,7 +716,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listTableIndexes($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -769,7 +769,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function dropConstraint($table, $name, $primary = false)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -817,7 +817,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listTableConstraints($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -882,7 +882,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function createSequence($seq_name, $start = 1)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -904,7 +904,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function dropSequence($seq_name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -924,7 +924,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
*/
function listSequences()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
diff --git a/program/lib/MDB2/Driver/Manager/sqlite.php b/program/lib/MDB2/Driver/Manager/sqlite.php
index ba0d162c5..aa01caf32 100644
--- a/program/lib/MDB2/Driver/Manager/sqlite.php
+++ b/program/lib/MDB2/Driver/Manager/sqlite.php
@@ -43,7 +43,7 @@
// | Lorenzo Alberton <l.alberton@quipo.it> |
// +----------------------------------------------------------------------+
//
-// $Id: sqlite.php 292715 2009-12-28 14:06:34Z quipo $
+// $Id: sqlite.php 295587 2010-02-28 17:16:38Z quipo $
//
require_once 'MDB2/Driver/Manager/Common.php';
@@ -71,7 +71,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function createDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -107,7 +107,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function dropDatabase($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -174,7 +174,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function _getCreateTableQuery($name, $fields, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -236,7 +236,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
}
// create triggers to enforce FOREIGN KEY constraints
if (!empty($options['foreign_keys'])) {
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -384,7 +384,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function dropTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -427,7 +427,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function vacuum($table = null, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -534,7 +534,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function alterTable($name, $changes, $check, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -687,7 +687,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
$query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
$query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
$query.=' VALUES (?'.str_repeat(', ?', (count($select_fields) - 1)).')';
- $stmt =& $db->prepare($query, null, MDB2_PREPARE_MANIP);
+ $stmt = $db->prepare($query, null, MDB2_PREPARE_MANIP);
if (PEAR::isError($stmt)) {
return $stmt;
}
@@ -712,7 +712,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listDatabases()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -732,7 +732,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listUsers()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -752,7 +752,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listViews()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -780,7 +780,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listTableViews($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -816,7 +816,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listTables()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -850,7 +850,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listTableFields($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -898,7 +898,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listTableTriggers($table = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -958,7 +958,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function createIndex($table, $name, $definition)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -998,7 +998,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function dropIndex($table, $name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1019,7 +1019,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listTableIndexes($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1080,7 +1080,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function createConstraint($table, $name, $definition)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1133,7 +1133,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
return $this->alterTable($table, array(), false, array('primary' => null));
}
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1170,7 +1170,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function _dropFKTriggers($table, $fkname, $referenced_table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1204,7 +1204,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listTableConstraints($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1274,7 +1274,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function createSequence($seq_name, $start = 1)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1315,7 +1315,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function dropSequence($seq_name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1335,7 +1335,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
*/
function listSequences()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
diff --git a/program/lib/MDB2/Driver/Manager/sqlsrv.php b/program/lib/MDB2/Driver/Manager/sqlsrv.php
index d0cac98c7..256e000af 100644
--- a/program/lib/MDB2/Driver/Manager/sqlsrv.php
+++ b/program/lib/MDB2/Driver/Manager/sqlsrv.php
@@ -71,7 +71,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function createDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -103,7 +103,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function alterDatabase($name, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -135,7 +135,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function dropDatabase($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -156,7 +156,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function dropTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -262,7 +262,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function truncateTable($name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -292,7 +292,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function vacuum($table = null, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -402,7 +402,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function alterTable($name, $changes, $check)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -563,7 +563,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function _dropConflictingIndices($table, $fields)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -609,7 +609,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function _dropConflictingConstraints($table, $fields)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -664,7 +664,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function _getTableFieldDefaultConstraint($table, $field)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -690,7 +690,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listTables()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
@@ -727,7 +727,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listTableFields($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -759,7 +759,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listTableIndexes($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -807,7 +807,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listDatabases()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -833,7 +833,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listUsers()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -859,7 +859,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listFunctions()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -900,7 +900,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listTableTriggers($table = null)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -941,7 +941,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listViews()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -984,7 +984,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function dropIndex($table, $name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1007,7 +1007,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listTableConstraints($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1052,7 +1052,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function _getCreateTableQuery($name, $fields, $options = array())
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1097,7 +1097,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function createSequence($seq_name, $start = 1)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1143,7 +1143,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function dropSequence($seq_name)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1163,7 +1163,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function listSequences()
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1217,7 +1217,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function getTableStatus($table)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1239,7 +1239,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
function checkTable($tableName)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
@@ -1345,7 +1345,7 @@ class MDB2_Driver_Manager_sqlsrv extends MDB2_Driver_Manager_Common
*/
function createConstraint($table, $name, $definition)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}