- Patch #337926 by Damien Tournoud: clean-up lower case handling.

1 files changed, 5 insertions, 15 deletions

diff --git a/includes/database/sqlite/database.inc b/includes/database/sqlite/database.inc
index 02e73321e..f8b41eb31 100644
--- a/includes/database/sqlite/database.inc
+++ b/includes/database/sqlite/database.inc
@@ -18,20 +18,14 @@ include_once DRUPAL_ROOT . '/includes/database/prefetch.inc';
  */
 class DatabaseConnection_sqlite extends DatabaseConnection {
 
-  /**
-   * Indicates that this connection supports transactions.
-   *
-   * @var bool
-   */
-  protected $transactionSupport = TRUE;
-
   public function __construct(Array $connection_options = array()) {
     // We don't need a specific PDOStatement class here, we simulate it below.
-    $this->statementClass = 'PDOStatement';
-    $this->transactionSupport = isset($connection_options['transactions']) ? $connection_options['transactions'] : TRUE;
+    $this->statementClass = NULL;
 
-    $dns = 'sqlite:'. $connection_options['database'];
-    parent::__construct($dns, '', '', array(
+    // This driver defaults to transaction support, except if explicitly passed FALSE.
+    $this->transactionSupport = !isset($connection_options['transactions']) || $connection_options['transactions'] === FALSE;
+
+    parent::__construct('sqlite:'. $connection_options['database'], '', '', array(
       // Force column names to lower case.
       PDO::ATTR_CASE => PDO::CASE_LOWER,
     ));
@@ -141,10 +135,6 @@ class DatabaseConnection_sqlite extends DatabaseConnection {
     return 'sqlite';
   }
 
-  public function supportsTransactions() {
-    return $this->transactionSupport;
-  }
-
   public function mapConditionOperator($operator) {
     // We don't want to override any of the defaults.
     return NULL;