add support for database level collation

diff --git a/all_db.php b/all_db.php
index 331316031c56bc90f1b86d750b9a4d75cdf79ef8..b2b515b38cadbac4978882e9a5d9453364473f7d 100644 (file)
--- a/all_db.php
+++ b/all_db.php
@@ -199,6 +199,7 @@
                echo "\t\t\t</select>\n";
                echo "\t\t</td>\n\t</tr>\n";
 
+               // ENCODING
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strencoding']}</th>\n";
                echo "\t\t<td class=\"data1\">\n";
                echo "\t\t\t<select name=\"formEncoding\">\n";
@@ -211,6 +212,23 @@
                echo "\t\t\t</select>\n";
                echo "\t\t</td>\n\t</tr>\n";
 
+               if ($data->hasDatabaseCollation()) {
+                       if (!isset($_POST['formCollate'])) $_POST['formCollate'] = '';
+                       if (!isset($_POST['formCType'])) $_POST['formCType'] = '';
+
+                       // LC_COLLATE
+                       echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcollation']}</th>\n";
+                       echo "\t\t<td class=\"data1\">\n";
+                       echo "\t\t\t<input name=\"formCollate\" value=\"", htmlspecialchars($_POST['formCollate']), "\" />\n";
+                       echo "\t\t</td>\n\t</tr>\n";
+
+                       // LC_CTYPE
+                       echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strctype']}</th>\n";
+                       echo "\t\t<td class=\"data1\">\n";
+                       echo "\t\t\t<input name=\"formCType\" value=\"", htmlspecialchars($_POST['formCType']), "\" />\n";
+                       echo "\t\t</td>\n\t</tr>\n";
+               }
+
                // Tablespace (if there are any)
                if ($data->hasTablespaces() && $tablespaces->recordCount() > 0) {
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strtablespace']}</th>\n";
@@ -258,7 +276,8 @@
                // Check that they've given a name and a definition
                if ($_POST['formName'] == '') doCreate($lang['strdatabaseneedsname']);
                else {
-                       $status = $data->createDatabase($_POST['formName'], $_POST['formEncoding'], $_POST['formSpc'], $_POST['formComment'], $_POST['formTemplate']);
+                       $status = $data->createDatabase($_POST['formName'], $_POST['formEncoding'], $_POST['formSpc'],
+                               $_POST['formComment'], $_POST['formTemplate'], $_POST['formCollate'], $_POST['formCType']);
                        if ($status == 0) {
                                $_reload_browser = true;
                                doDefault($lang['strdatabasecreated']);
@@ -345,6 +364,14 @@
                                'title' => $lang['strencoding'],
                                'field' => field('datencoding'),
                        ),
+                       'lc_collate' => array(
+                               'title' => $lang['strcollation'],
+                               'field' => field('datcollate'),
+                       ),
+                       'lc_ctype' => array(
+                               'title' => $lang['strctype'],
+                               'field' => field('datctype'),
+                       ),
                        'tablespace' => array(
                                'title' => $lang['strtablespace'],
                                'field' => field('tablespace'),
@@ -391,6 +418,7 @@
 
                if (!$data->hasTablespaces()) unset($columns['tablespace']);
                if (!$data->hasServerAdminFuncs()) unset($columns['dbsize']);
+               if (!$data->hasDatabaseCollation()) unset($columns['lc_collate'], $columns['lc_ctype']);
                if (!isset($data->privlist['database'])) unset($actions['privileges']);
 
                $misc->printTable($databases, $columns, $actions, $lang['strnodatabases']);

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 9b4d0d172f23e0605bacd4b01a4ead02c3a02abd..6b20edb624401a7255ab6dea3f29b3969594f3ba 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -445,6 +445,8 @@ class Postgres extends ADODB_base {
 
        /**
         * Return all database available on the server
+        * @param $currentdatabase database name that should be on top of the resultset
+        * 
         * @return A list of databases, sorted alphabetically
         */
        function getDatabases($currentdatabase = NULL) {
@@ -469,15 +471,17 @@ class Postgres extends ADODB_base {
                else
                        $where = ' AND pdb.datallowconn';
 
-               $sql = "SELECT pdb.datname AS datname, pr.rolname AS datowner, pg_encoding_to_char(encoding) AS datencoding,
-                               (SELECT description FROM pg_catalog.pg_shdescription pd WHERE pdb.oid=pd.objoid) AS datcomment,
-                               (SELECT spcname FROM pg_catalog.pg_tablespace pt WHERE pt.oid=pdb.dattablespace) AS tablespace,
-                                                          pg_catalog.pg_database_size(pdb.oid) as dbsize
-                        FROM pg_catalog.pg_database pdb LEFT JOIN pg_catalog.pg_roles pr ON (pdb.datdba = pr.oid)
-                                               WHERE true
-                                       {$where}
-                                       {$clause}
-                                       {$orderby}";
+               $sql = "
+                       SELECT pdb.datname AS datname, pr.rolname AS datowner, pg_encoding_to_char(encoding) AS datencoding,
+                               (SELECT description FROM pg_catalog.pg_shdescription pd WHERE pdb.oid=pd.objoid) AS datcomment,
+                               (SELECT spcname FROM pg_catalog.pg_tablespace pt WHERE pt.oid=pdb.dattablespace) AS tablespace,
+                               pg_catalog.pg_database_size(pdb.oid) as dbsize, pdb.datcollate, pdb.datctype
+                       FROM pg_catalog.pg_database pdb
+                               LEFT JOIN pg_catalog.pg_roles pr ON (pdb.datdba = pr.oid)
+                       WHERE true
+                               {$where}
+                               {$clause}
+                       {$orderby}";
 
                return $this->selectSet($sql);
        }
@@ -545,22 +549,28 @@ class Postgres extends ADODB_base {
         * @return -1 tablespace error
         * @return -2 comment error
         */
-       function createDatabase($database, $encoding, $tablespace = '', $comment = '', $template = 'template1') {
+       function createDatabase($database, $encoding, $tablespace = '', $comment = '', $template = 'template1',
+               $lc_collate = '', $lc_ctype = '')
+       {
                $this->fieldClean($database);
                $this->clean($encoding);
                $this->fieldClean($tablespace);
-               $this->fieldClean($comment);
                $this->fieldClean($template);
+               $this->clean($lc_collate);
+               $this->clean($lc_ctype);
 
                $sql = "CREATE DATABASE \"{$database}\" WITH TEMPLATE=\"{$template}\"";
 
                if ($encoding != '') $sql .= " ENCODING='{$encoding}'";
+               if ($lc_collate != '') $sql .= " LC_COLLATE='{$lc_collate}'";
+               if ($lc_ctype != '') $sql .= " LC_CTYPE='{$lc_ctype}'";
 
                if ($tablespace != '' && $this->hasTablespaces()) $sql .= " TABLESPACE \"{$tablespace}\"";
 
                $status = $this->execute($sql);
                if ($status != 0) return -1;
 
+               $this->fieldClean($comment);
                if ($comment != '' && $this->hasSharedComments()) {
                        $status = $this->setComment('DATABASE',$database,'',$comment);
                        if ($status != 0) return -2;
@@ -7575,6 +7585,7 @@ class Postgres extends ADODB_base {
        function hasVirtualTransactionId() { return true; }
        function hasWithoutOIDs() { return true; }
        function hasAlterDatabase() { return $this->hasAlterDatabaseRename(); }
+       function hasDatabaseCollation() { return true; }
        function hasMagicTypes() { return true; }
        function hasQueryKill() { return true; }
        function hasConcurrentIndexBuild() { return true; }

diff --git a/classes/database/Postgres83.php b/classes/database/Postgres83.php
index cc399dc547c5fb31dc7fe3a0660815c8ff68383d..7fcc2ee4ab75591be0dcf200ed249c64700384fd 100644 (file)
--- a/classes/database/Postgres83.php
+++ b/classes/database/Postgres83.php
@@ -56,8 +56,53 @@ class Postgres83 extends Postgres {
                return $this->help_page;
        }
 
+       // Databse functions
+
+       /**
+        * Return all database available on the server
+        * @param $currentdatabase database name that should be on top of the resultset
+        * 
+        * @return A list of databases, sorted alphabetically
+        */
+       function getDatabases($currentdatabase = NULL) {
+               global $conf, $misc;
+
+               $server_info = $misc->getServerInfo();
+
+               if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser($server_info['username'])) {
+                       $username = $server_info['username'];
+                       $this->clean($username);
+                       $clause = " AND pr.rolname='{$username}'";
+               }
+               else $clause = '';
+
+               if ($currentdatabase != NULL)
+                       $orderby = "ORDER BY pdb.datname = '{$currentdatabase}' DESC, pdb.datname";
+               else
+                       $orderby = "ORDER BY pdb.datname";
+
+               if (!$conf['show_system'])
+                       $where = ' AND NOT pdb.datistemplate';
+               else
+                       $where = ' AND pdb.datallowconn';
+
+               $sql = "
+                       SELECT pdb.datname AS datname, pr.rolname AS datowner, pg_encoding_to_char(encoding) AS datencoding,
+                               (SELECT description FROM pg_catalog.pg_shdescription pd WHERE pdb.oid=pd.objoid) AS datcomment,
+                               (SELECT spcname FROM pg_catalog.pg_tablespace pt WHERE pt.oid=pdb.dattablespace) AS tablespace,
+                               pg_catalog.pg_database_size(pdb.oid) as dbsize
+                       FROM pg_catalog.pg_database pdb LEFT JOIN pg_catalog.pg_roles pr ON (pdb.datdba = pr.oid)
+                       WHERE true
+                               {$where}
+                               {$clause}
+                       {$orderby}";
+
+               return $this->selectSet($sql);
+       }
+
        function hasAutovacuumSysTable() { return true; }
        function hasQueryKill() { return false; }
+       function hasDatabaseCollation() { return false; }
 
 }
 

diff --git a/lang/english.php b/lang/english.php
index a07585973330557eea74e07d68d8146e714365ee..66c6704562c1faa850c64ce5ffd48f157d09fbf2 100644 (file)
--- a/lang/english.php
+++ b/lang/english.php
@@ -139,6 +139,8 @@
        $lang['strselectall'] = 'Select all';
        $lang['strunselectall'] = 'Unselect all';
        $lang['strlocale'] = 'Locale';
+       $lang['strcollation'] = 'Collation';
+       $lang['strctype'] = 'Character Type';
 
        // User-supplied SQL history
        $lang['strhistory'] = 'History';

diff --git a/lang/french.php b/lang/french.php
index 5abda048c7446114181c340d6eecf2db94ef46f6..f75fac959864654bf4fd4bcaba4cdef8a1fe3a7d 100644 (file)
--- a/lang/french.php
+++ b/lang/french.php
@@ -60,6 +60,7 @@
        $lang['stralter'] = 'Modifier';
        $lang['strok'] = 'OK';
        $lang['strcancel'] = 'Annuler';
+$lang['strkill']  =  'Kill';
        $lang['strac']  =  'Activer la complétion automatique';
        $lang['strsave'] = 'Sauvegarder';
        $lang['strreset'] = 'Réinitialiser';
@@ -138,6 +139,8 @@ $lang['strconfdropcred']  =  'For security reason, disconnecting will destroy yo
        $lang['strselectall']  =  'Sélectionner tout';
        $lang['strunselectall']  =  'Desélectionner tout';
        $lang['strlocale']  =  'Locale';
+       $lang['strcollation']  =  'Tri';
+       $lang['strctype']  =  'Type de cartactère';
 
        // User-supplied SQL history
        $lang['strhistory']  =  'Historique';
@@ -180,6 +183,8 @@ $lang['strconfdropcred']  =  'For security reason, disconnecting will destroy yo
        $lang['strcannotdumponwindows']  =  'La sauvegarde de table complexe et des noms de schémas n\'est pas supporté sur Windows.';
        $lang['strinvalidserverparam'] = 'Tentative de connexion avec un serveur invalide, il est possible que quelqu\'un essai de pirater votre système.'; 
        $lang['strnoserversupplied']  =  'Aucun serveur fournis !';
+$lang['strbadpgdumppath']  =  'Export error: Failed to execute pg_dump (given path in your conf/config.inc.php : %s). Please, fix this path in your configuration and relog.';
+$lang['strbadpgdumpallpath']  =  'Export error: Failed to execute pg_dumpall (given path in your conf/config.inc.php : %s). Please, fix this path in your configuration and relog.';
 
        // Tables
        $lang['strtable'] = 'Table';
@@ -367,6 +372,7 @@ $lang['strconfdropcred']  =  'For security reason, disconnecting will destroy yo
        $lang['strdatabasealtered']  =  'Base de données modifiée.';
        $lang['strdatabasealteredbad']  =  'Échec lors de la modification de la base de données.';
        $lang['strspecifydatabasetodrop']  =  'Vous devez spécifier au moins une base de données à supprimer';
+$lang['strtemplatedb']  =  'Template';
 
        // Views
        $lang['strview'] = 'Vue';
@@ -456,6 +462,7 @@ $lang['strconfdropcred']  =  'For security reason, disconnecting will destroy yo
        $lang['strconfcluster']  =  'Êtes-vous sur de vouloir mettre en cluster « %s » ?';
        $lang['strclusteredgood']  =  'Cluster effectué.';
        $lang['strclusteredbad']  =  'Échec du cluster.';
+$lang['strconcurrently']  =  'Concurrently';
 
        // Rules
        $lang['strrules'] = 'Règles';

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index f864eb17e475e244aa74e2f1d0b7239cc1599479..4ebe06b40fab2d8ea74132e92075f11f84670c5a 100644 (file)
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -139,6 +139,8 @@
        $lang['strselectall'] = 'Select all';
        $lang['strunselectall'] = 'Unselect all';
        $lang['strlocale'] = 'Locale';
+       $lang['strcollation'] = 'Collation';
+       $lang['strctype'] = 'Character Type';
 
        // User-supplied SQL history
        $lang['strhistory'] = 'History';

diff --git a/lang/recoded/french.php b/lang/recoded/french.php
index cc43b6cdc6708747caa9504be1dd1bcb129f7b31..64bbfbb75a992592948803cb1fba588a7a2ac543 100644 (file)
--- a/lang/recoded/french.php
+++ b/lang/recoded/french.php
@@ -60,6 +60,7 @@
        $lang['stralter'] = 'Modifier';
        $lang['strok'] = 'OK';
        $lang['strcancel'] = 'Annuler';
+$lang['strkill']  =  'Kill';
        $lang['strac']  =  'Activer la complétion automatique';
        $lang['strsave'] = 'Sauvegarder';
        $lang['strreset'] = 'Réinitialiser';
@@ -133,10 +134,13 @@
        $lang['strfile']  =  'Fichier';
        $lang['strfileimported']  =  'Fichier importé.';
        $lang['strtrycred']  =  'Utilisez ces identifiants pour tous les serveurs';
+$lang['strconfdropcred']  =  'For security reason, disconnecting will destroy your shared login information. Are you sure you want to disconnect ?';
        $lang['stractionsonmultiplelines']  =  'Actions sur plusieurs lignes';
        $lang['strselectall']  =  'Sélectionner tout';
        $lang['strunselectall']  =  'Desélectionner tout';
        $lang['strlocale']  =  'Locale';
+       $lang['strcollation']  =  'Tri';
+       $lang['strctype']  =  'Type de cartactère';
 
        // User-supplied SQL history
        $lang['strhistory']  =  'Historique';
@@ -179,6 +183,8 @@
        $lang['strcannotdumponwindows']  =  'La sauvegarde de table complexe et des noms de schémas n\'est pas supporté sur Windows.';
        $lang['strinvalidserverparam'] = 'Tentative de connexion avec un serveur invalide, il est possible que quelqu\'un essai de pirater votre système.'; 
        $lang['strnoserversupplied']  =  'Aucun serveur fournis !';
+$lang['strbadpgdumppath']  =  'Export error: Failed to execute pg_dump (given path in your conf/config.inc.php : %s). Please, fix this path in your configuration and relog.';
+$lang['strbadpgdumpallpath']  =  'Export error: Failed to execute pg_dumpall (given path in your conf/config.inc.php : %s). Please, fix this path in your configuration and relog.';
 
        // Tables
        $lang['strtable'] = 'Table';
@@ -245,6 +251,7 @@
        $lang['strspecifytabletoempty']  =  'Vous devez spécifier au moins une table à vider';
        $lang['strspecifytabletodrop']  =  'Vous devez spécifier au moins une table à supprimer';
        $lang['strspecifytabletovacuum']  =  'Vous devez spécifier au moins une table sur laquelle effectuer le vacuum';
+       $lang['strnofieldsforinsert']  =  'Vous ne pouvez insérer de données dans une table sans champs.';
 
        // Columns
        $lang['strcolprop']  =  'Propriétés de la Colonne';
@@ -365,6 +372,7 @@
        $lang['strdatabasealtered']  =  'Base de données modifiée.';
        $lang['strdatabasealteredbad']  =  'Échec lors de la modification de la base de données.';
        $lang['strspecifydatabasetodrop']  =  'Vous devez spécifier au moins une base de données à supprimer';
+$lang['strtemplatedb']  =  'Template';
 
        // Views
        $lang['strview'] = 'Vue';
@@ -454,6 +462,7 @@
        $lang['strconfcluster']  =  'Êtes-vous sur de vouloir mettre en cluster « %s » ?';
        $lang['strclusteredgood']  =  'Cluster effectué.';
        $lang['strclusteredbad']  =  'Échec du cluster.';
+$lang['strconcurrently']  =  'Concurrently';
 
        // Rules
        $lang['strrules'] = 'Règles';