From e5ebbacc9e951d1da82762daf67f993ee20e95cb Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 8 Apr 2012 18:52:31 +0000
Subject: [PATCH] Fix sqlite version detection
---
lib/migrate.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/migrate.php b/lib/migrate.php
index 2730d26a74..a8a5e581c3 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -496,10 +496,14 @@ class OC_Migrate{
$datadir = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
// DB type
- if( !is_callable( 'sqlite_open' ) || !class_exists( 'SQLite3' ) ){
+ if( class_exists( 'SQLite3' ) ){
+ $dbtype = 'sqlite3';
+ } else if( is_callable( 'sqlite_open' ) ){
+ $dbtype = 'sqlite';
+ } else {
OC_Log::write( 'migration', 'SQLite not found', OC_Log::ERROR );
return false;
- }
+ }
// Prepare options array
$options = array(
@@ -510,7 +514,7 @@ class OC_Migrate{
'quote_identifier' => true
);
$dsn = array(
- 'phptype' => 'sqlite3',
+ 'phptype' => $dbtype,
'database' => self::$dbpath,
'mode' => '0644'
);
--
GitLab