Fixed issue: Create token table on Postgres throws index error, if do…

…ne repeatedly
LimeSurvey · Oct 22, 2020 · 3089628 · 3089628
1 parent 37e9f26
commit 3089628
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -2472,8 +2472,8 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
                                 $oDB->createCommand()->createIndex('idx_email', $sTableName, 'email(30)', false);
                                 break;
                             case 'pgsql':
-                                $oDB->createCommand()->createIndex('idx_email', $sTableName, 'email', false);
-                                break;
+                                $oDB->createCommand()->createIndex('idx_email_'.substr($sTableName,7).'_'.rand(1, 50000), $sTableName, 'email', false);
+                            break;
                             // MSSQL does not support indexes on text fields so no dice
                         }
                     } catch (Exception $e) { rollBackToTransactionBookmark(); }

diff --git a/application/models/Token.php b/application/models/Token.php
@@ -203,7 +203,7 @@ public static function createTable($surveyId, array $extraFields = array())
                 $db->createCommand()->createIndex('idx_email', $sTableName, 'email(30)', false);
                 break;
             case 'pgsql':
-                $db->createCommand()->createIndex('idx_email_'.$surveyId_.rand(1, 50000), $sTableName, 'email', false);
+                $db->createCommand()->createIndex('idx_email_'.$surveyId.'_'.rand(1, 50000), $sTableName, 'email', false);
                 break;
         }