Skip to content

Commit

Permalink
Dev Fixed database upgrade errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@SamMousa
SamMousa committed Jan 26, 2015
1 parent fada7d8 commit f6c0603
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 67 deletions.
2 changes: 2 additions & 0 deletions application/core/db/MssqlSchema.php
View file
Expand Up @@ -21,6 +21,8 @@ public function __construct($conn) {
* Auto increment.
*/
$this->columnTypes['autoincrement'] = 'integer NOT NULL IDENTITY (1,1)';

$this->columnTypes['longbinary'] = 'varbinary(max)';
}

public function getColumnType($type)
Expand Down
2 changes: 2 additions & 0 deletions application/core/db/MysqlSchema.php
View file
Expand Up @@ -9,6 +9,8 @@ public function __construct($conn) {
* Auto increment.
*/
$this->columnTypes['autoincrement'] = 'int(11) NOT NULL AUTO_INCREMENT';

$this->columnTypes['longbinary'] = 'longblob';
}

public function createTable($table, $columns, $options = null) {
Expand Down
2 changes: 2 additions & 0 deletions application/core/db/PgsqlSchema.php
View file
Expand Up @@ -10,6 +10,8 @@ public function __construct($conn) {
* Auto increment.
*/
$this->columnTypes['autoincrement'] = 'serial';

$this->columnTypes['longbinary'] = 'bytea';
}

}
114 changes: 47 additions & 67 deletions application/helpers/update/updatedb_helper.php
View file
Expand Up @@ -26,8 +26,6 @@ function db_upgrade_all($iOldDBVersion) {
$sStandardTemplateRootDir = Yii::app()->getConfig('standardtemplaterootdir');
echo str_pad(gT('The LimeSurvey database is being upgraded').' ('.date('Y-m-d H:i:s').')',14096).".<br /><br />". gT('Please be patient...')."<br /><br />\n";

$sDBDriverName=setsDBDriverName();

$oDB = Yii::app()->getDb();
$oDB->schemaCachingDuration=0; // Deactivate schema caching
$oTransaction = $oDB->beginTransaction();
Expand Down Expand Up @@ -62,7 +60,7 @@ function db_upgrade_all($iOldDBVersion) {
if ($iOldDBVersion < 113) {
//Fixes the collation for the complete DB, tables and columns

if ($sDBDriverName=='mysql')
if (Yii::app()->db->driverName=='mysql')
{
$sDatabaseName=getDBConnectionStringProperty('dbname');
fixMySQLCollations();
Expand Down Expand Up @@ -201,7 +199,7 @@ function db_upgrade_all($iOldDBVersion) {
addColumn('{{answers}}','assessment_value',"integer NOT NULL default '0'");
addColumn('{{labels}}','assessment_value',"integer NOT NULL default '0'");
// copy any valid codes from code field to assessment field
switch ($sDBDriverName){
switch (Yii::app()->db->driverName){
case 'mysql':
case 'mysqli':
$oDB->createCommand("UPDATE {{answers}} SET assessment_value=CAST(`code` as SIGNED) where `code` REGEXP '^-?[0-9]+$'")->execute();
Expand Down Expand Up @@ -480,9 +478,9 @@ function db_upgrade_all($iOldDBVersion) {
alterColumn('{{assessments}}','minimum',"string(50)",false , '');
alterColumn('{{assessments}}','maximum',"string(50)",false , '');
// change the primary index to include language
if ($sDBDriverName=='mysql') // special treatment for mysql because this needs to be in one step since an AUTOINC field is involved
if (Yii::app()->db->driverName=='mysql') // special treatment for mysql because this needs to be in one step since an AUTOINC field is involved
{
$oDB->createCommand("ALTER TABLE {{assessments}} DROP PRIMARY KEY, ADD PRIMARY KEY (`id`, `language`)")->execute();
modifyPrimaryKey('{{assessments}}', array('id', 'language'));
}
else
{
Expand Down Expand Up @@ -762,7 +760,7 @@ function db_upgrade_all($iOldDBVersion) {
));

$oDB->createCommand()->dropTable('{{sessions}}');
if ($sDBDriverName=='mysql')
if (Yii::app()->db->driverName=='mysql')
{
$oDB->createCommand()->createTable('{{sessions}}',array(
'id' => 'string(32) NOT NULL',
Expand Down Expand Up @@ -947,7 +945,7 @@ function db_upgrade_all($iOldDBVersion) {



if ($sDBDriverName=='pgsql')
if (Yii::app()->db->driverName=='pgsql')
{
try{ setTransactionBookmark(); $oDB->createCommand("ALTER TABLE ONLY {{user_groups}} ADD PRIMARY KEY (ugid); ")->execute;} catch(Exception $e) { rollBackToTransactionBookmark(); };
try{ setTransactionBookmark(); $oDB->createCommand("ALTER TABLE ONLY {{users}} ADD PRIMARY KEY (uid); ")->execute;} catch(Exception $e) { rollBackToTransactionBookmark(); };
Expand Down Expand Up @@ -1142,11 +1140,16 @@ function db_upgrade_all($iOldDBVersion) {

if ($iOldDBVersion < 171)
{
dropColumn('{{sessions}}','data');
switch ($sDBDriverName){
try {
dropColumn('{{sessions}}','data');
}
catch (Exception $e) {

}
switch (Yii::app()->db->driverName){
case 'mysql':
case 'mysqli':
addColumn('{{sessions}}', 'data', 'LONGBLOB');
addColumn('{{sessions}}', 'data', 'longbinary');
break;
case 'sqlsrv':
case 'dblib':
Expand All @@ -1162,7 +1165,7 @@ function db_upgrade_all($iOldDBVersion) {
}
if ($iOldDBVersion < 172)
{
switch ($sDBDriverName){
switch (Yii::app()->db->driverName){
case 'pgsql':
// Special treatment for Postgres as it is too dumb to convert a string to a number without explicit being told to do so ... seriously?
alterColumn('{{permissions}}', 'entity_id', "INTEGER USING (entity_id::integer)", false);
Expand Down Expand Up @@ -1192,7 +1195,7 @@ function db_upgrade_all($iOldDBVersion) {
alterColumn('{{saved_control}}', 'email', "string(254)");
alterColumn('{{surveys}}', 'adminemail', "string(254)");
alterColumn('{{surveys}}', 'bounce_email', "string(254)");
switch ($sDBDriverName){
switch (Yii::app()->db->driverName){
case 'sqlsrv':
case 'dblib':
case 'mssql': dropUniqueKeyMSSQL('email','{{users}}');
Expand All @@ -1202,7 +1205,7 @@ function db_upgrade_all($iOldDBVersion) {
}
if ($iOldDBVersion < 175)
{
switch ($sDBDriverName){
switch (Yii::app()->db->driverName){
case 'pgsql':
// Special treatment for Postgres as it is too dumb to convert a boolean to a number without explicit being told to do so
alterColumn('{{plugins}}', 'active', "INTEGER USING (active::integer)", false);
Expand Down Expand Up @@ -1248,7 +1251,7 @@ function db_upgrade_all($iOldDBVersion) {
}
if ($iOldDBVersion < 178)
{
if ($sDBDriverName=='mysql' || $sDBDriverName=='mysqli')
if (Yii::app()->db->driverName=='mysql' || Yii::app()->db->driverName=='mysqli')
{
modifyPrimaryKey('questions', array('qid','language'));
}
Expand Down Expand Up @@ -1292,9 +1295,9 @@ function db_upgrade_all($iOldDBVersion) {

function upgradeTokenTables179()
{
$oSchema=$oDB->schema;
$sDBDriverName=setsDBDriverName();
if($sDBDriverName=='mssql' || $sDBDriverName=='mysql') $sSubstringCommand='substring'; else $sSubstringCommand='substr';
$oDB = Yii::app()->db;
$oSchema = Yii::app()->db->schema;
if(Yii::app()->db->driverName=='mssql' || Yii::app()->db->driverName=='mysql') $sSubstringCommand='substring'; else $sSubstringCommand='substr';

$surveyidresult = dbGetTablesLike("tokens%");
if ($surveyidresult)
Expand All @@ -1320,6 +1323,7 @@ function upgradeTokenTables179()

function upgradeSurveys177()
{
$oDB = Yii::app()->db;
$sSurveyQuery = "SELECT surveyls_attributecaptions,surveyls_survey_id,surveyls_language FROM {{surveys_languagesettings}}";
$oSurveyResult = $oDB->createCommand($sSurveyQuery)->queryAll();
$sSurveyLSUpdateQuery= "update {{surveys_languagesettings}} set surveyls_attributecaptions=:attributecaptions where surveyls_survey_id=:surveyid and surveyls_language=:language";
Expand Down Expand Up @@ -1352,6 +1356,7 @@ function upgradeSurveys177()
*/
function upgradeTokens176()
{
$oDB = Yii::app()->db;
$arSurveys = Survey::model()->findAll();
// Fix any active token tables
foreach ( $arSurveys as $arSurvey )
Expand Down Expand Up @@ -1411,7 +1416,7 @@ function upgradeCPDBAttributeDefaultNames173()
FROM {{participant_attribute_names_lang}}
group by attribute_id, attribute_name, lang
order by attribute_id";
$oResult = $oDB->createCommand($sQuery)->queryAll();
$oResult = Yii::app()->db->createCommand($sQuery)->queryAll();
foreach ( $oResult as $aAttribute )
{
$oDB->createCommand()->update('{{participant_attribute_names}}',array('defaultname'=>substr($aAttribute['attribute_name'],0,50)),"attribute_id={$aAttribute['attribute_id']}");
Expand Down Expand Up @@ -1804,8 +1809,7 @@ function upgradeTables143()
}
}
// Sanitize data
$sDBDriverName=$oDB->getDriverName();
if ($sDBDriverName=='pgsql')
if (Yii::app()->db->driverName=='pgsql')
{
modifyDatabase("","delete from {{answers}} USING {{questions}} WHERE {{answers}}.qid={{questions}}.qid AND {{questions}}.type in ('1','F','H','M','P','W','Z')"); echo $modifyoutput; flush();@ob_flush();
}
Expand Down Expand Up @@ -2064,11 +2068,7 @@ function alterLanguageCode($sOldLanguageCode,$sNewLanguageCode)

function addPrimaryKey($sTablename, $aColumns)
{
$sDBDriverName=$oDB->getDriverName();
if ($sDBDriverName=='mysqli' || $sDBDriverName=='mysql')
{
$oDB->createCommand("ALTER TABLE {{".$sTablename."}} ADD PRIMARY KEY (".implode(',',$aColumns).")")->execute();
}
return Yii::app()->db->createCommand()->addPrimaryKey('PRIMARY', $sTablename, $aColumns);
}

/**
Expand All @@ -2079,32 +2079,27 @@ function addPrimaryKey($sTablename, $aColumns)
*/
function modifyPrimaryKey($sTablename, $aColumns)
{
$oDB->createCommand("ALTER TABLE {{".$sTablename."}} DROP PRIMARY KEY, ADD PRIMARY KEY (".implode(',',$aColumns).")")->execute();
Yii::app()->db->createCommand("ALTER TABLE {{".$sTablename."}} DROP PRIMARY KEY, ADD PRIMARY KEY (".implode(',',$aColumns).")")->execute();
}

function dropPrimaryKey($sTablename)
{
$sDBDriverName=$oDB->getDriverName();
if ($sDBDriverName=='mysqli') $sDBDriverName='mysql';
if ($sDBDriverName=='sqlsrv' || $sDBDriverName=='dblib') $sDBDriverName='mssql';

global $modifyoutput;
switch ($sDBDriverName){
switch (Yii::app()->db->driverName){
case 'mysql':
$sQuery="ALTER TABLE {{".$sTablename."}} DROP PRIMARY KEY";
$oDB->createCommand($sQuery)->execute();
Yii::app()->db->createCommand($sQuery)->execute();
break;
case 'pgsql':
case 'mssql':
$pkquery = "SELECT CONSTRAINT_NAME "
."FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS "
."WHERE (TABLE_NAME = '{{{$sTablename}}}') AND (CONSTRAINT_TYPE = 'PRIMARY KEY')";

$primarykey = $oDB->createCommand($pkquery)->queryRow(false);
$primarykey = Yii::app()->db->createCommand($pkquery)->queryRow(false);
if ($primarykey!==false)
{
$sQuery="ALTER TABLE {{".$sTablename."}} DROP CONSTRAINT ".$primarykey[0];
$oDB->createCommand($sQuery)->execute();
Yii::app()->db->createCommand($sQuery)->execute();
}
break;
default: die('Unknown database type');
Expand All @@ -2116,7 +2111,7 @@ function dropPrimaryKey($sTablename)
function fixLanguageConsistencyAllSurveys()
{
$surveyidquery = "SELECT sid,additional_languages FROM ".dbQuoteID('{{surveys}}');
$surveyidresult = $oDB->createCommand($surveyidquery)->queryAll();
$surveyidresult = Yii::app()->db->createCommand($surveyidquery)->queryAll();
foreach ( $surveyidresult as $sv )
{
fixLanguageConsistency($sv['sid'],$sv['additional_languages']);
Expand All @@ -2125,10 +2120,10 @@ function fixLanguageConsistencyAllSurveys()

function alterColumn($sTable, $sColumn, $sFieldType, $bAllowNull=true, $sDefault='NULL')
{
$sDBDriverName=$oDB->getDriverName();
if ($sDBDriverName=='mysqli') $sDBDriverName='mysql';
if ($sDBDriverName=='sqlsrv' || $sDBDriverName=='dblib') $sDBDriverName='mssql';
switch ($sDBDriverName){
$oDB = Yii::app()->db;
if (Yii::app()->db->driverName=='mysqli') Yii::app()->db->driverName='mysql';
if (Yii::app()->db->driverName=='sqlsrv' || Yii::app()->db->driverName=='dblib') Yii::app()->db->driverName='mssql';
switch (Yii::app()->db->driverName){
case 'mysql':
$sType=$sFieldType;
if ($bAllowNull!=true)
Expand Down Expand Up @@ -2178,15 +2173,15 @@ function alterColumn($sTable, $sColumn, $sFieldType, $bAllowNull=true, $sDefault

function dropColumn($sTableName, $sColumnName)
{
$sDBDriverName=$oDB->getDriverName();
if ($sDBDriverName=='mysqli') $sDBDriverName='mysql';
if ($sDBDriverName=='sqlsrv' || $sDBDriverName=='dblib') $sDBDriverName='mssql';
Yii::app()->db->driverName= Yii::app()->db->getDriverName();
if (Yii::app()->db->driverName=='mysqli') Yii::app()->db->driverName='mysql';
if (Yii::app()->db->driverName=='sqlsrv' || Yii::app()->db->driverName=='dblib') Yii::app()->db->driverName='mssql';

if ($sDBDriverName=='mssql')
if (Yii::app()->db->driverName=='mssql')
{
dropDefaultValueMSSQL($sColumnName,$sTableName);
}
$oDB->createCommand()->dropColumn($sTableName,$sColumnName);
Yii::app()->db->createCommand()->dropColumn($sTableName,$sColumnName);
}


Expand All @@ -2195,25 +2190,23 @@ function dropColumn($sTableName, $sColumnName)

function addColumn($sTableName, $sColumn, $sType)
{
$oDB->createCommand()->addColumn($sTableName,$sColumn,$sType);
Yii::app()->db->createCommand()->addColumn($sTableName,$sColumn,$sType);
}


function setTransactionBookmark($sBookmark='limesurvey')
{
$sDBDriverName=$oDB->getDriverName();
if ($sDBDriverName=='pgsql')
if (Yii::app()->db->driverName=='pgsql')
{
$oDB->createCommand("SAVEPOINT {$sBookmark};")->execute();
Yii::app()->db->createCommand("SAVEPOINT {$sBookmark};")->execute();
}
}

function rollBackToTransactionBookmark($sBookmark='limesurvey')
{
$sDBDriverName=$oDB->getDriverName();
if ($sDBDriverName=='pgsql')
if (Yii::app()->db->driverName=='pgsql')
{
$oDB->createCommand("ROLLBACK TO SAVEPOINT {$sBookmark};")->execute();
Yii::app()->db->createCommand("ROLLBACK TO SAVEPOINT {$sBookmark};")->execute();
}
}

Expand All @@ -2231,7 +2224,7 @@ function dropDefaultValueMSSQL($fieldname, $tablename)
$defaultname = $oDB->createCommand($dfquery)->queryRow();
if ($defaultname!=false)
{
$oDB->createCommand("ALTER TABLE {$tablename} DROP CONSTRAINT {$defaultname['constraint_name']}")->execute();
Yii::app()->db->createCommand("ALTER TABLE {$tablename} DROP CONSTRAINT {$defaultname['constraint_name']}")->execute();
}
}

Expand All @@ -2253,19 +2246,6 @@ function dropUniqueKeyMSSQL($sFieldName, $sTableName)
}
}



/**
* Returns the name of the DB Driver - used for other functions that make db specific calls
*
*/
function setsDBDriverName() {
$sDBDriverName=$oDB->getDriverName();
if ($sDBDriverName=='mysqli') $sDBDriverName='mysql';
if ($sDBDriverName=='sqlsrv' || $sDBDriverName=='dblib') $sDBDriverName='mssql';
return $sDBDriverName;
}

function replaceTemplateJS(){
$usertemplaterootdir=Yii::app()->getConfig("usertemplaterootdir");

Expand Down

0 comments on commit f6c0603

Please sign in to comment.