From bdf0b5efc7beae4d2f56f8c84da8f6266441876c Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Fri, 26 Nov 2010 02:37:28 +0000 Subject: [PATCH] revert r77271 since it was an expensive fix to a non-existant problem. --- includes/db/Database.php | 10 +--------- includes/db/DatabaseSqlite.php | 9 --------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index 94b95fe8c9..26d4d2b7d0 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -596,14 +596,6 @@ abstract class DatabaseBase implements DatabaseType { return !preg_match( '/^(?:SELECT|BEGIN|COMMIT|SET|SHOW|\(SELECT)\b/i', $sql ); } - /** - * Database specific translations like MySQL's UNIX_TIMESTAMP() to - * something the DB can use. - */ - function translateSQLFunctions( $vars ) { - return $vars; - } - /** * Usually aborts on failure. If errors are explicitly ignored, returns success. * @@ -658,7 +650,7 @@ abstract class DatabaseBase implements DatabaseType { } else { $userName = ''; } - $commentedSql = $this->translateSQLFunctions( preg_replace( '/\s/', " /* $fname $userName */ ", $sql, 1 ) ); + $commentedSql = preg_replace( '/\s/', " /* $fname $userName */ ", $sql, 1 ); # } else { # $commentedSql = $sql; # } diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php index 3eb978ac02..e29e1a48ff 100644 --- a/includes/db/DatabaseSqlite.php +++ b/includes/db/DatabaseSqlite.php @@ -363,15 +363,6 @@ class DatabaseSqlite extends DatabaseBase { return parent::makeSelectOptions( $options ); } - /** - * Database specific translations like MySQL's UNIX_TIMESTAMP() to - * something the DB can use. - */ - function translateSQLFunctions( $vars ) { - return preg_replace( '/UNIX_TIMESTAMP\(([^()]+)\)/', 'strftime("%s",\1)', $vars ); - } - - /** * Based on generic method (parent) with some prior SQLite-sepcific adjustments */ -- 2.20.1