summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchriskl2004-07-19 03:01:53 +0000
committerchriskl2004-07-19 03:01:53 +0000
commit2adabfe3a1acad0f88e06e1b316196fbf6b853a1 (patch)
treeee12b65fbc72455da54199ac552afda2f323733a
parent6e4b562c3d3ca56a9ff1e0f5eca999bd6bbe06d8 (diff)
fix tracking of backend platform. needed so that it doesn't think 7.5 running on windows has tablespaces
-rw-r--r--BUGS3
-rw-r--r--HISTORY1
-rw-r--r--classes/database/ADODB_base.php5
-rwxr-xr-xclasses/database/Postgres.php4
-rwxr-xr-xclasses/database/Postgres75.php7
-rw-r--r--libraries/errorhandler.inc.php4
-rw-r--r--libraries/lib.inc.php3
7 files changed, 14 insertions, 13 deletions
diff --git a/BUGS b/BUGS
index b2179bce..93d5b565 100644
--- a/BUGS
+++ b/BUGS
@@ -30,7 +30,6 @@ NEEDS TESTING
* rename function in 7.2 and below doesn't come back to the correct function
* Fix SQL window parent update to not update any random window
* Show owner on privileges screen?
- http://devilock.mine.nu/textarea_tab.html
-* fix test for MINGW backend
+* Allows tabs in textareas on IE: http://devilock.mine.nu/textarea_tab.html
* add help links everywhere. fix formatting of help links.
* Deal with named parameters that have ',' in the type name
diff --git a/HISTORY b/HISTORY
index 4011a23a..0b89e1d5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -13,6 +13,7 @@ Features
* Allow setting schema search path in SQL window
* Allow filtering find results by object type
* Show function arguments in find results
+* Support 7.5's named function arguments
Translations
* Arabic from Zaki
diff --git a/classes/database/ADODB_base.php b/classes/database/ADODB_base.php
index a9152484..1a232d59 100644
--- a/classes/database/ADODB_base.php
+++ b/classes/database/ADODB_base.php
@@ -3,7 +3,7 @@
/*
* Parent class of all ADODB objects.
*
- * $Id: ADODB_base.php,v 1.18 2004/07/13 09:00:40 chriskl Exp $
+ * $Id: ADODB_base.php,v 1.19 2004/07/19 03:01:53 chriskl Exp $
*/
include_once('./libraries/errorhandler.inc.php');
@@ -12,6 +12,9 @@ include_once('./libraries/adodb/adodb.inc.php');
class ADODB_base {
var $conn;
+
+ // The backend platform. Set to UNKNOWN by default.
+ var $platform = 'UNKNOWN';
/**
* Base constructor
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 8acf068e..2c4244db 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4,7 +4,7 @@
* A class that implements the DB interface for Postgres
* Note: This class uses ADODB and returns RecordSets.
*
- * $Id: Postgres.php,v 1.240 2004/07/16 16:01:06 soranzo Exp $
+ * $Id: Postgres.php,v 1.241 2004/07/19 03:01:53 chriskl Exp $
*/
// @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -2652,7 +2652,7 @@ class Postgres extends BaseDB {
return $this->selectSet($sql);
}
-
+
/**
* Determines whether or not a user is a super user
* @param $username The username of the user
diff --git a/classes/database/Postgres75.php b/classes/database/Postgres75.php
index 353e7eea..d7328fce 100755
--- a/classes/database/Postgres75.php
+++ b/classes/database/Postgres75.php
@@ -3,7 +3,7 @@
/**
* PostgreSQL 7.5 support
*
- * $Id: Postgres75.php,v 1.14 2004/07/13 09:00:40 chriskl Exp $
+ * $Id: Postgres75.php,v 1.15 2004/07/19 03:01:54 chriskl Exp $
*/
include_once('./classes/database/Postgres74.php');
@@ -443,10 +443,7 @@ class Postgres75 extends Postgres74 {
}
function hasAlterColumnType() { return true; }
- function hasTablespaces() {
- $platform = $this->getPlatform();
- return $platform != 'MINGW';
- }
+ function hasTablespaces() { return $this->platform != 'MINGW'; }
function hasSignals() { return true; }
function hasNamedParams() { return true; }
diff --git a/libraries/errorhandler.inc.php b/libraries/errorhandler.inc.php
index 0a8b1054..2e7b1d0e 100644
--- a/libraries/errorhandler.inc.php
+++ b/libraries/errorhandler.inc.php
@@ -3,7 +3,7 @@
/**
* Overrides default ADODB error handler to provide nicer error handling.
*
- * $Id: errorhandler.inc.php,v 1.15 2004/06/18 14:47:21 soranzo Exp $
+ * $Id: errorhandler.inc.php,v 1.16 2004/07/19 03:01:54 chriskl Exp $
*/
define('ADODB_ERROR_HANDLER','Error_Handler');
@@ -27,7 +27,7 @@ function Error_Handler($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
case 'EXECUTE':
$sql = $p1;
$inputparams = $p2;
-
+
$s = "<p><b>{$lang['strsqlerror']}</b><br />" . $misc->printVal($errmsg) . "</p>
<p><b>{$lang['strinstatement']}</b><br />" . $misc->printVal($sql) . "</p>
";
diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 072185c8..865b9a4c 100644
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
/**
* Function library read in upon startup
*
- * $Id: lib.inc.php,v 1.82 2004/07/12 01:35:46 chriskl Exp $
+ * $Id: lib.inc.php,v 1.83 2004/07/19 03:01:54 chriskl Exp $
*/
// Set error reporting level to max
@@ -157,6 +157,7 @@
// connection.
require_once('./classes/database/' . $_type . '.php');
$data = new $_type($_connection->conn);
+ $data->platform = $_connection->platform;
// If schema is defined and database supports schemas, then set the
// schema explicitly.