Merge pull request #1212 from joaopaulofilho/master

correctly detects if there is a database and if there [are] any tables [created]
anchorcms · Jul 8, 2017 · 6f6e696 · 6f6e696
2 parents e32c5e5 + 74f80ae
commit 6f6e696
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/install/libraries/installer.php b/install/libraries/installer.php
@@ -20,19 +20,22 @@ public static function run()
 
         // check we have not already installed
         if (!static::$connection->instance()->query('SHOW DATABASES LIKE ' . static::$connection->instance()->quote($settings['database']['name']) . ';')->fetchColumn()) {
-
-         // create the database and use the database
-         static::$connection->instance()->query('CREATE DATABASE ' . substr(static::$connection->instance()->quote($settings['database']['name']),1,-1) . ';');
-         static::$connection->instance()->query('USE ' . substr(static::$connection->instance()->quote($settings['database']['name']),1,-1) . ';');
-
-         // install tables
-         static::schema($settings);
-
-         // insert metadata
-         static::metadata($settings);
-
-         // create user account
-         static::account($settings);
+            // create the database
+            static::$connection->instance()->query('CREATE DATABASE ' . substr(static::$connection->instance()->quote($settings['database']['name']),1,-1) . ';');
+        }
+
+        // use the database
+        static::$connection->instance()->query('USE ' . substr(static::$connection->instance()->quote($settings['database']['name']),1,-1) . ';');
+
+        if (!static::$connection->instance()->query('SHOW TABLES;')->fetchColumn()) {
+            // install tables
+            static::schema($settings);
+
+            // insert metadata
+            static::metadata($settings);
+
+            // create user account
+            static::account($settings);
         }
 
         // write database config