New feature #07664: Allow unix_socket on installation and connexion s…

…tring (use socket directly in DB location) Dev: maybe adding more protocol : http://dev.mysql.com/doc/refman/5.5/en//connecting.html#option_general_protocol Dev: but seem needed only for some ... hoster
LimeSurvey · Mar 26, 2013 · 7f74b1b · 7f74b1b
1 parent 7df1d6f
commit 7f74b1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -1104,7 +1104,11 @@ function _getDsn($sDatabaseType, $sDatabaseLocation, $sDatabasePort, $sDatabaseN
         switch ($sDatabaseType) {
             case 'mysql':
             case 'mysqli':
-                $dsn = "mysql:host={$sDatabaseLocation};port={$sDatabasePort};dbname={$sDatabaseName};";
+                // MySQL allow unix_socket for database location, then test if $sDatabaseLocation start with "/"
+                if(substr($sDatabaseLocation,0,1)=="/") 
+                    $dsn = "mysql:unix_socket={$sDatabaseLocation};dbname={$sDatabaseName};";
+                else
+                    $dsn = "mysql:host={$sDatabaseLocation};port={$sDatabasePort};dbname={$sDatabaseName};";
                 break;
             case 'pgsql':
                 if (empty($sDatabasePwd))
@@ -1129,7 +1133,6 @@ function _getDsn($sDatabaseType, $sDatabaseLocation, $sDatabasePort, $sDatabaseN
             default:
                 throw new Exception(sprintf('Unknown database type "%s".', $sDatabaseType));
         }
-
         return $dsn;
     }
 

diff --git a/application/views/installer/dbconfig_view.php b/application/views/installer/dbconfig_view.php
@@ -34,7 +34,7 @@
                     <tr>
                         <td style="width: 428px;">
                             <b><?php echo CHtml::activeLabelEx($model, 'dblocation', array('label' => $clang->gT("Database location"))); ?></b><br />
-                            <div class="description-field"><?php $clang->eT('Set this to the IP/net location of your database server. In most cases "localhost" will work.'); ?> </div>
+                            <div class="description-field"><?php $clang->eT('Set this to the IP/net location of your database server. In most cases "localhost" will work. You can force Unix socket with complete socket path.'); ?> </div>
                         </td>
                         <td style="width: 224px;" align="right"><?php echo CHtml::activeTextField($model, 'dblocation', array('required' => 'required')) ?></td>
                     </tr>