Changeset 683 for trunk/lib

Timestamp:

May 19, 2019 10:51:34 PM (5 years ago)

Author:

anonymous

Message:

Add support for mysql-specific character sets and collations

Location:

trunk/lib

Files:

• App.inc.php (modified) (4 diffs)
• DB.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -124 +124 @@
         'user_timezone' => 'UTC',
         'php_timezone' => 'UTC',
-        'mysql_timezone' => 'UTC',
+        'db_timezone' => 'UTC',
 
         // Use php sessions?
@@ -141 +141 @@
         'enable_db_session_handler' => false,
 
+        // db_* parameters are passed to the DB object in $app->start().
         // DB credentials should be set as apache environment variables in httpd.conf, readable only by root.
         'db_server' => null,
@@ -146 +147 @@
         'db_user' => null,
         'db_pass' => null,
+        'db_character_set' => '',
+        'db_collation' => '',
 
         // CLI scripts will need this JSON file in the include path.
@@ -427 +430 @@
                 'db_debug' => $this->getParam('db_debug'),
                 'db_die_on_failure' => $this->getParam('db_die_on_failure'),
-                'timezone' => $this->getParam('mysql_timezone'),
+                'timezone' => $this->getParam('db_timezone'),
+                'character_set' => $this->getParam('db_character_set'),
+                'collation' => $this->getParam('db_collation'),
             ));
 

trunk/lib/DB.inc.php

@@ -72 +72 @@
         // Timezone for MySQL.
         'timezone' => 'UTC',
+
+        // MySQL character set and collation.
+        'character_set' => '',
+        'collation' => '',
     );
 
@@ -192 +196 @@
         $this->_connected = true;
 
-        // Tell MySQL what character set we're using. Available only on MySQL versions > 4.01.01.
-        if ('' != $app->getParam('character_set') && isset($this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))])) {
-            $this->query(sprintf("SET NAMES '%s';", $this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))]));
-        } else {
-            $app->logMsg(sprintf('%s is not a known character_set.', $app->getParam('character_set')), LOG_ERR, __FILE__, __LINE__);
+        // If the mysql charset is not defined, try to determine a mysql charset from the app charset.
+        if ('' == $this->getParam('character_set') && '' != $app->getParam('character_set') && isset($this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))])) {
+            $this->setParam(array('character_set' => $this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))]));
+        }
+        if ('' != $this->getParam('character_set')) {
+            if ('' != $this->getParam('collation')) {
+                $this->query(sprintf("SET NAMES '%s' COLLATE '%s';", $this->getParam('character_set'), $this->getParam('collation')));
+            } else {
+                $this->query(sprintf("SET NAMES '%s';", $this->getParam('character_set')));
+            }
         }