Dev: moved Database creation to yii completely

LimeSurvey · Oct 2, 2017 · f2ebcac · f2ebcac
1 parent d22f0f2
commit f2ebcac
Show file tree

Hide file tree

Showing 3 changed files with 958 additions and 51 deletions.
diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -487,7 +487,7 @@ function stepCreateDb()
         if ($bCreateDB) //Database has been successfully created
         {
             $sDsn = self::_getDsn($sDatabaseType, $sDatabaseLocation, $sDatabasePort, $sDatabaseName, $sDatabaseUser, $sDatabasePwd);
-            $this->connection = new CDbConnection($sDsn, $sDatabaseUser, $sDatabasePwd);
+            $this->connection = new DbConnection($sDsn, $sDatabaseUser, $sDatabasePwd);
 
             Yii::app()->session['populatedatabase'] = true;
             Yii::app()->session['databaseexist'] = true;
@@ -574,7 +574,7 @@ function stepPopulateDb()
         }
 
         //checking DB Connection
-        $aErrors = self::_setup_tables(dirname(APPPATH).'/installer/sql/create-'.$sql_file.'.sql');
+        $aErrors = self::_setup_tables(dirname(APPPATH).'/installer/php/create-database.php');
         if ($aErrors === false)
         {
             $model->addError('dblocation', gT('Try again! Connection with database failed. Reason: ').implode(', ', $aErrors));
@@ -965,8 +965,10 @@ function _setup_tables($sFileName, $aDbConfig = array(), $sDatabasePrefix = '')
         } catch(Exception $e) {
             return array($e->getMessage());
         }
-
-        return $this->_executeSQLFile($sFileName, $sDatabasePrefix);
+        require_once($sFileName);
+        return createDatabase($this->connection);
+        //return $this->_executeSQLFile($sFileName, $sDatabasePrefix);
+        //return $this->_runDatabaseInstaller($sFileName, $sDatabasePrefix);
     }
 
     /**
@@ -1298,7 +1300,7 @@ function _dbConnect($aDbConfig = array(), $aData = array())
         }
         try
         {
-            $this->connection = new CDbConnection($sDsn, $sDatabaseUser, $sDatabasePwd);
+            $this->connection = new DbConnection($sDsn, $sDatabaseUser, $sDatabasePwd);
             if($sDatabaseType!='sqlsrv' && $sDatabaseType!='dblib')
             {
                 $this->connection->emulatePrepare = true;
@@ -1359,7 +1361,7 @@ private function dbTest($aDbConfig = array(), $aData = array())
                 else
                 {
                     // Use same exception than Yii ? unclear
-                    throw new CDbException('CDbConnection failed to open the DB connection.',(int)$e->getCode(),$e->errorInfo);
+                    throw new DbConnection('CDbConnection failed to open the DB connection.',(int)$e->getCode(),$e->errorInfo);
                 }
             }
             $testPdo = null;