diff options
| author | Joffrey Jaffeux <j.jaffeux@gmail.com> | 2012-06-07 20:00:59 +0200 |
|---|---|---|
| committer | Joffrey Jaffeux <j.jaffeux@gmail.com> | 2012-06-07 20:00:59 +0200 |
| commit | bb2da6fafaab754aee3e6745bf23db52e3aed57d (patch) | |
| tree | 85fd992a15d4ed1800218aedffa8a3aa09931ff2 /system/database | |
| parent | 9d1407523ae585d45171b54123ba29c0ec831f79 (diff) | |
| parent | 25d47aec0417e52af43985663ebc1f62931f13cd (diff) | |
Merge https://github.com/EllisLab/CodeIgniter into test-encryption-class
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_cache.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/mssql/mssql_forge.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_forge.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php index 14f3c21bc..ba9110382 100644 --- a/system/database/DB_cache.php +++ b/system/database/DB_cache.php @@ -99,7 +99,7 @@ class CI_DB_Cache { $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); $filepath = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'.md5($sql); - if (FALSE === ($cachedata = read_file($filepath))) + if (FALSE === ($cachedata = file_get_contents($filepath))) { return FALSE; } diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php index 3708c2233..e6227e189 100644 --- a/system/database/drivers/mssql/mssql_forge.php +++ b/system/database/drivers/mssql/mssql_forge.php @@ -70,7 +70,7 @@ class CI_DB_mssql_forge extends CI_DB_forge { $sql .= "\n\t".$this->db->escape_identifiers($field).' '.$attributes['TYPE']; - if (array_key_exists('CONSTRAINT', $attributes)) + if (stripos($attributes['TYPE'], 'INT') === FALSE && ! empty($attributes['CONSTRAINT'])) { $sql .= '('.$attributes['CONSTRAINT'].')'; } diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index 1529b2a21..d8b5193fa 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -70,7 +70,7 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { $sql .= "\n\t".$this->db->escape_identifiers($field).' '.$attributes['TYPE']; - if (array_key_exists('CONSTRAINT', $attributes)) + if (stripos($attributes['TYPE'], 'INT') === FALSE && ! empty($attributes['CONSTRAINT'])) { $sql .= '('.$attributes['CONSTRAINT'].')'; } |