Move insertIfNotExist to Connection wrapper

Real implementation is in DB\Adapter* classes

diff --git a/lib/db.php b/lib/db.php
index 0ad8a9b35d8c0a282fa4984b534a58cfedcedd69..1f62326eea38ba6d90fd34578136cde2e806931a 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -389,58 +389,7 @@ class OC_DB {
         */
        public static function insertIfNotExist($table, $input) {
                self::connect();
-               $table = self::$connection->replaceTablePrefix( $table );
-
-               if(is_null(self::$type)) {
-                       self::$type=OC_Config::getValue( "dbtype", "sqlite" );
-               }
-               $type = self::$type;
-
-               $query = '';
-               $inserts = array_values($input);
-               // differences in escaping of table names ('`' for mysql) and getting the current timestamp
-               if( $type == 'sqlite' || $type == 'sqlite3' ) {
-                       // NOTE: For SQLite we have to use this clumsy approach
-                       // otherwise all fieldnames used must have a unique key.
-                       $query = 'SELECT * FROM `' . $table . '` WHERE ';
-                       foreach($input as $key => $value) {
-                               $query .= '`' . $key . '` = ? AND ';
-                       }
-                       $query = substr($query, 0, strlen($query) - 5);
-                       try {
-                               $result = self::executeAudited($query, $inserts);
-                       } catch(DatabaseException $e) {
-                               OC_Template::printExceptionErrorPage( $e );
-                       }
-
-                       if((int)$result->numRows() === 0) {
-                               $query = 'INSERT INTO `' . $table . '` (`'
-                                       . implode('`,`', array_keys($input)) . '`) VALUES('
-                                       . str_repeat('?,', count($input)-1).'? ' . ')';
-                       } else {
-                               return 0; //no rows updated
-                       }
-               } elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') {
-                       $query = 'INSERT INTO `' .$table . '` (`'
-                               . implode('`,`', array_keys($input)) . '`) SELECT '
-                               . str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
-                               . 'FROM `' . $table . '` WHERE ';
-
-                       foreach($input as $key => $value) {
-                               $query .= '`' . $key . '` = ? AND ';
-                       }
-                       $query = substr($query, 0, strlen($query) - 5);
-                       $query .= ' HAVING COUNT(*) = 0';
-                       $inserts = array_merge($inserts, $inserts);
-               }
-
-               try {
-                       $result = self::executeAudited($query, $inserts);
-               } catch(\Doctrine\DBAL\DBALException $e) {
-                       OC_Template::printExceptionErrorPage( $e );
-               }
-
-               return $result;
+               return self::$connection->insertIfNotExist($table, $input);
        }
 
        /**

diff --git a/lib/db/adapter.php b/lib/db/adapter.php
index 3b83853289a4c4d0ba2af640d9423de1b666a283..3b9503311916f04c9e069780022e95cdf0abe7a5 100644 (file)
--- a/lib/db/adapter.php
+++ b/lib/db/adapter.php
@@ -22,4 +22,32 @@ class Adapter {
        public function fixupStatement($statement) {
                return $statement;
        }
+
+       public function insertIfNotExist($table, $input) {
+               $query = 'INSERT INTO `' .$table . '` (`'
+                       . implode('`,`', array_keys($input)) . '`) SELECT '
+                       . str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
+                       . 'FROM `' . $table . '` WHERE ';
+
+               foreach($input as $key => $value) {
+                       $query .= '`' . $key . '` = ? AND ';
+               }
+               $query = substr($query, 0, strlen($query) - 5);
+               $query .= ' HAVING COUNT(*) = 0';
+               $inserts = array_values($input);
+               $inserts = array_merge($inserts, $inserts);
+
+               try {
+                       $statement = $this->conn->prepare($query);
+                       $result = $statement->execute($inserts);
+               } catch(\Doctrine\DBAL\DBALException $e) {
+                       $entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+                       $entry .= 'Offending command was: ' . $query.'<br />';
+                       OC_Log::write('core', $entry, OC_Log::FATAL);
+                       error_log('DB error: ' . $entry);
+                       OC_Template::printErrorPage( $entry );
+               }
+
+               return $result;
+       }
 }

diff --git a/lib/db/adaptersqlite.php b/lib/db/adaptersqlite.php
index f0057ab489fc0879ad17434b66adfb2a82dec10a..252fd94b0c03218366e80ee9ade373bfcf50adb5 100644 (file)
--- a/lib/db/adaptersqlite.php
+++ b/lib/db/adaptersqlite.php
@@ -16,4 +16,45 @@ class AdapterSqlite extends Adapter {
                $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement );
                return $statement;
        }
+
+       public function insertIfNotExist($table, $input) {
+               // NOTE: For SQLite we have to use this clumsy approach
+               // otherwise all fieldnames used must have a unique key.
+               $query = 'SELECT COUNT(*) FROM `' . $table . '` WHERE ';
+               foreach($input as $key => $value) {
+                       $query .= '`' . $key . '` = ? AND ';
+               }
+               $query = substr($query, 0, strlen($query) - 5);
+               try {
+                       $stmt = $this->conn->prepare($query);
+                       $result = $stmt->execute(array($input));
+               } catch(\Doctrine\DBAL\DBALException $e) {
+                       $entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+                       $entry .= 'Offending command was: ' . $query . '<br />';
+                       OC_Log::write('core', $entry, OC_Log::FATAL);
+                       error_log('DB error: '.$entry);
+                       OC_Template::printErrorPage( $entry );
+               }
+
+               if ($stmt->fetchColumn() === 0) {
+                       $query = 'INSERT INTO `' . $table . '` (`'
+                               . implode('`,`', array_keys($input)) . '`) VALUES('
+                               . str_repeat('?,', count($input)-1).'? ' . ')';
+               } else {
+                       return 0; //no rows updated
+               }
+
+               try {
+                       $statement = $this->conn->prepare($query);
+                       $result = $statement->execute(array_values($input));
+               } catch(\Doctrine\DBAL\DBALException $e) {
+                       $entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+                       $entry .= 'Offending command was: ' . $query.'<br />';
+                       OC_Log::write('core', $entry, OC_Log::FATAL);
+                       error_log('DB error: ' . $entry);
+                       OC_Template::printErrorPage( $entry );
+               }
+
+               return $result;
+       }
 }

diff --git a/lib/db/connection.php b/lib/db/connection.php
index 8442efc47c9f9c251e152490b3a649d86f871d65..e18062d78f3ed2b7b0aabdb42e75afffeb2a67b3 100644 (file)
--- a/lib/db/connection.php
+++ b/lib/db/connection.php
@@ -138,8 +138,18 @@ class Connection extends \Doctrine\DBAL\Connection {
                return parent::lastInsertId($seqName);
        }
 
+       /**
+        * @brief Insert a row if a matching row doesn't exists.
+        * @param string $table. The table to insert into in the form '*PREFIX*tableName'
+        * @param array $input. An array of fieldname/value pairs
+        * @returns bool The return value from execute()
+        */
+       public function insertIfNotExist($table, $input) {
+               return $this->adapter->insertIfNotExist($table, $input);
+       }
+
        // internal use
-       public function replaceTablePrefix($statement) {
+       protected function replaceTablePrefix($statement) {
                return str_replace( '*PREFIX*', $this->table_prefix, $statement );
        }