Fixed issue #9592: Unable to run survey when using database sessions …

…with Postgres Dev Bug in Yii framework - PR submitted to the Yii project
LimeSurvey · May 19, 2015 · 129a5db · 129a5db
1 parent 84380d9
commit 129a5db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/application/commands/InstallCommand.php b/application/commands/InstallCommand.php
@@ -41,9 +41,6 @@ public function run($sArgument)
                     $sql_file = 'mysql';
                     break;
                 case 'pgsql':
-                    if (version_compare($this->connection->getServerVersion(),'9','>=')) {
-                        $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($this->getDBConnectionStringProperty('dbname')) ." SET bytea_output='escape';")->execute();
-                    }
                     $sql_file = 'pgsql';
                     break;
                 case 'dblib': 

diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -948,11 +948,6 @@ function _setup_tables($sFileName, $aDbConfig = array(), $sDatabasePrefix = '')
                 case 'mysqli':
                     $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($sDatabaseName) ." DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;")->execute();
                     break;
-                case 'pgsql':
-                    if (version_compare($this->connection->getServerVersion(),'9','>=')) {
-                        $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($sDatabaseName) ." SET bytea_output='escape';")->execute();
-                    }
-                    break;
             }
         } catch(Exception $e) {
             return array($e->getMessage());

diff --git a/framework/web/CDbHttpSession.php b/framework/web/CDbHttpSession.php
@@ -246,6 +246,9 @@ public function writeSession($id,$data)
 		{
 			$expire=time()+$this->getTimeout();
 			$db=$this->getDbConnection();
+
+            if($db->getDriverName()=='pgsql' )
+                $data=new CDbExpression("convert_to(".$db->quoteValue($data).", 'UTF8')");
 			if($db->getDriverName()=='sqlsrv' || $db->getDriverName()=='mssql' || $db->getDriverName()=='dblib')
 				$data=new CDbExpression('CONVERT(VARBINARY(MAX), '.$db->quoteValue($data).')');
 			if($db->createCommand()->select('id')->from($this->sessionTableName)->where('id=:id',array(':id'=>$id))->queryScalar()===false)