remove the rest of the backticks from sql queries; replace with TQUOT const which is driver dependent

2 files changed, 9 insertions, 1 deletions

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index 852dc16af..36353354c 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -72,6 +72,7 @@ class DBA {
 
 		define('NULL_DATE', self::$dba->get_null_date());
 		define('ACTIVE_DBTYPE', self::$dbtype);
+		define('TQUOT', self::$dba->get_table_quote());
 		return self::$dba;
 	}
 
@@ -88,6 +89,7 @@ abstract class dba_driver {
 	const INSTALL_SCRIPT='install/schema_mysql.sql';
 	const NULL_DATE = '0001-01-01 00:00:00';
 	const UTC_NOW = 'UTC_TIMESTAMP()';
+	const TQUOT = "`";
 
 	protected $db;
 	protected $pdo = array();
@@ -157,6 +159,11 @@ abstract class dba_driver {
 		return static::INSTALL_SCRIPT;
 	}
 
+	function get_table_quote() {
+		return static::TQUOT;
+	}
+
+
 	function utcnow() {
 		return static::UTC_NOW;
 	}
@@ -313,7 +320,7 @@ function db_concat($fld, $sep) {
  * queries return true if the command was successful or false if it wasn't.
  *
  * Example:
- *  $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
+ *  $r = q("SELECT * FROM %s WHERE `uid` = %d",
  *         'user', 1);
  *
  * @param string $sql The SQL query to execute
diff --git a/include/dba/dba_postgres.php b/include/dba/dba_postgres.php
index 03b29d703..ae3e5a76f 100644
--- a/include/dba/dba_postgres.php
+++ b/include/dba/dba_postgres.php
@@ -7,6 +7,7 @@ class dba_postgres extends dba_driver {
 	const INSTALL_SCRIPT='install/schema_postgres.sql';
 	const NULL_DATE = '0001-01-01 00:00:00';
 	const UTC_NOW = "now() at time zone 'UTC'";
+	const TQUOT = '"';
 	
 	function connect($server,$port,$user,$pass,$db) {
 		if(!$port) $port = 5432;