diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-06 20:49:57 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-06 20:49:57 +0200 |
| commit | 89ba83c811338134030ef051626e38e3876bc762 (patch) | |
| tree | 24e3b8b6f738c9a7443e88312c808787dacb14fa /system/database/drivers/mysqli/mysqli_forge.php | |
| parent | 11c111c3ff128791f571ac2519bb796baecf7226 (diff) | |
| parent | ea09a8a5552f2aacdeab0c88a605fe44047ebd0a (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_forge.php')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_forge.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index 8cf0ae1fd..4b6939e2a 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -42,7 +42,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge { */ public function _create_database($name) { - return 'CREATE DATABASE '.$name; + return 'CREATE DATABASE '.$name.' CHARACTER SET '.$this->db->char_set.' COLLATE '.$this->db->dbcollat; } // -------------------------------------------------------------------- @@ -148,7 +148,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge { $sql .= 'IF NOT EXISTS '; } - $sql .= $this->db->_escape_identifiers($table).' ('.$this->_process_fields($fields); + $sql .= $this->db->escape_identifiers($table).' ('.$this->_process_fields($fields); if (count($primary_keys) > 0) { @@ -187,7 +187,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge { */ public function _drop_table($table) { - return 'DROP TABLE IF EXISTS '.$this->db->_escape_identifiers($table); + return 'DROP TABLE IF EXISTS '.$this->db->escape_identifiers($table); } // -------------------------------------------------------------------- |