Changeset 2994:c8206c9d865d

Timestamp:

04/20/15 11:08:22 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix #1913 : allow SQLite in installation wizard.
No simple way to upgrade SQLite database, so bypass upgrade during connection.

Files:

• admin/install/wizard.php (modified) (2 diffs)
• inc/dbschema/upgrade.php (modified) (1 diff)

admin/install/wizard.php

@@ -66 +66 @@
      try
      {
+          if ($DBDRIVER == 'sqlite') {
+               if (strpos($DBNAME, '/') === false) {
+                    $sqlite_db_directory = dirname(DC_RC_PATH).'/../db/';
+                    files::makeDir($sqlite_db_directory,true);
+
+                    # Can we write sqlite_db_directory ?
+                    if (!is_writable($sqlite_db_directory)) {
+                         throw new Exception(sprintf(__('Cannot write "%s" directory.'),path::real($sqlite_db_directory,false)));
+                    }
+                    $DBNAME = $sqlite_db_directory.$DBNAME;
+               }
+          }
+
           # Tries to connect to database
           try {
@@ -182 +195 @@
 '<form action="wizard.php" method="post">'.
 '<p><label class="required" for="DBDRIVER"><abbr title="'.__('Required field').'">*</abbr> '.__('Database type:').'</label> '.
-form::combo('DBDRIVER',array(__('MySQL (deprecated)')=>'mysql',__('MySQLi')=>'mysqli',__('PostgreSQL')=>'pgsql'),$DBDRIVER).'</p>'.
+    form::combo('DBDRIVER',array(__('MySQL (deprecated)')=>'mysql',__('MySQLi')=>'mysqli',__('PostgreSQL')=>'pgsql',__('SQLite')=>'sqlite'),$DBDRIVER).'</p>'.
 '<p><label for="DBHOST">'.__('Database Host Name:').'</label> '.
 form::field('DBHOST',30,255,html::escapeHTML($DBHOST)).'</p>'.

inc/dbschema/upgrade.php

@@ -26 +26 @@
           {
                if ($core->con->driver() == 'sqlite') {
-                    throw new Exception(__('SQLite Database Schema cannot be upgraded.'));
+                    return false; // Need to find a way to upgrade sqlite database
                }