diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-06-08 00:39:20 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-06-08 00:39:20 +0200 |
commit | caa04f15096590261093dff2a8b59f266a1dcaf5 (patch) | |
tree | 49b8ee0d2fe4cc0fc2b4a3afc94562b4022c0a1c /system/database/drivers/pdo | |
parent | 5ef194df98294d5427c0e7582ca88b1fc06e1d72 (diff) |
Revert back some escape_identifiers() to proect_identifiers() as the first one can't handle arrays
Diffstat (limited to 'system/database/drivers/pdo')
-rw-r--r-- | system/database/drivers/pdo/pdo_forge.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/system/database/drivers/pdo/pdo_forge.php b/system/database/drivers/pdo/pdo_forge.php index 8ce4513dc..56457505c 100644 --- a/system/database/drivers/pdo/pdo_forge.php +++ b/system/database/drivers/pdo/pdo_forge.php @@ -112,8 +112,7 @@ class CI_DB_pdo_forge extends CI_DB_forge { if (count($primary_keys) > 0) { - $primary_keys = $this->db->escape_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY (".implode(', ', $primary_keys).')'; + $sql .= ",\n\tPRIMARY KEY (".implode(', ', $this->db->protect_identifiers($primary_keys)).')'; } if (is_array($keys) && count($keys) > 0) @@ -121,7 +120,7 @@ class CI_DB_pdo_forge extends CI_DB_forge { foreach ($keys as $key) { $key = is_array($key) - ? $this->db->escape_identifiers($key) + ? $this->db->protect_identifiers($key) : array($this->db->escape_identifiers($key)); $sql .= ",\n\tFOREIGN KEY (".implode(', ', $key).')'; |