MySQL is the only database which quotes identifiers primarily using backticks. Move...

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 7248bb9..6d4ba86 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1695,12 +1695,13 @@ abstract class DatabaseBase implements DatabaseType {
        }
 
        /**
-        * Quotes a string using `backticks` for things like database, table, and field
-        * names, other databases which use something other than backticks can replace
-        * this with something else
+        * Quotes an identifier using `backticks` or "double quotes" depending on the database type.
+        * MySQL uses `backticks` while basically everything else uses double quotes.
+        * Since MySQL is the odd one out here the double quotes are our generic
+        * and we implement backticks in DatabaseMysql.
         */      
        public function addIdentifierQuotes( $s ) {
-               return "`" . $this->strencode( $s ) . "`";
+               return '"' . str_replace( '"', '""', $s ) . '"';
        }
 
        /**

diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php
index f49ff8e..a3a6829 100644 (file)
--- a/includes/db/DatabaseIbm_db2.php
+++ b/includes/db/DatabaseIbm_db2.php
@@ -647,10 +647,6 @@ EOF;
                }
        }
 
-       public function addIdentifierQuotes( $s ) {
-               return '"' . str_replace( '"', '""', $s ) . '"';
-       }
-
        /**
         * Verifies that a DB2 column/field type is numeric
         *

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index b51f782..4f09069 100644 (file)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -997,10 +997,6 @@ class DatabaseMssql extends DatabaseBase {
                }
        }
 
-       function addIdentifierQuotes( $s ) {
-               return "'" . str_replace( "'", "''", $s ) . "'";
-       }
-
        function selectDB( $db ) {
                return ( $this->query( "SET DATABASE $db" ) !== false );
        }

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index bc41cb1..2b2c969 100644 (file)
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -322,6 +322,13 @@ class DatabaseMysql extends DatabaseBase {
                return $sQuoted;
        }
 
+       /**
+        * MySQL uses `backticks` for identifier quoting instead of the sql standard "double quotes".
+        */
+       public function addIdentifierQuotes( $s ) {
+               return "`" . $this->strencode( $s ) . "`";
+       }
+
        function ping() {
                $ping = mysql_ping( $this->mConn );
                if ( $ping ) {

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index b5d67dd..c5f6a3d 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1125,10 +1125,6 @@ class DatabaseOracle extends DatabaseBase {
                return "'" . $this->strencode( $s ) . "'";
        }
 
-       function addIdentifierQuotes( $s ) {
-               return '"' . str_replace( '"', '""', $s ) . '"';
-       }
-
        function selectRow( $table, $vars, $conds, $fname = 'DatabaseOracle::selectRow', $options = array(), $join_conds = array() ) {
                global $wgContLang;
 

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 55385f0..96f7eae 100644 (file)
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1300,10 +1300,6 @@ SQL;
                return "'" . pg_escape_string( $this->mConn, $s ) . "'";
        }
 
-       function addIdentifierQuotes( $s ) {
-               return '"' . str_replace( '"', '""', $s ) . '"';
-       }
-
        /**
         * Postgres specific version of replaceVars.
         * Calls the parent version in Database.php

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 6fb59f7..52637a2 100644 (file)
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -530,10 +530,6 @@ class DatabaseSqlite extends DatabaseBase {
                }
        }
 
-       function addIdentifierQuotes( $s ) {
-               return '"' . str_replace( '"', '""', $s ) . '"';
-       }
-
        function buildLike() {
                $params = func_get_args();
                if ( count( $params ) > 0 && is_array( $params[0] ) ) {