diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-04-08 18:52:31 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-04-08 18:52:31 +0000 |
| commit | e5ebbacc9e951d1da82762daf67f993ee20e95cb (patch) | |
| tree | 05386c16efa4f22a219a92ac6832c1015d3c44a5 /lib/migrate.php | |
| parent | 5e314e8effb42b60d720de40fbf74591ae421534 (diff) | |
| download | nextcloud-server-e5ebbacc9e951d1da82762daf67f993ee20e95cb.tar.gz nextcloud-server-e5ebbacc9e951d1da82762daf67f993ee20e95cb.zip | |
Fix sqlite version detection
Diffstat (limited to 'lib/migrate.php')
| -rw-r--r-- | lib/migrate.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/migrate.php b/lib/migrate.php index 2730d26a74a..a8a5e581c3a 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' ); |