summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-05-25 11:58:30 +0200
committerAndrey Andreev <narf@devilix.net>2016-05-25 11:58:30 +0200
commit75794bccae31233bb7f8e12915f42562ac4eb295 (patch)
tree244dddae7493cf01e598be30eedb94901c112928
parent9e78be0d736ed0caab396f58109ce1db7169d727 (diff)
[ci skip] Add 'LONGTEXT' to 'STRING' alias to CUBRID drivers for DBForge
Requested in #4640
-rw-r--r--system/database/drivers/cubrid/cubrid_forge.php3
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php3
-rw-r--r--user_guide_src/source/changelog.rst1
3 files changed, 7 insertions, 0 deletions
diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php
index 8262beb6b..46a3b2185 100644
--- a/system/database/drivers/cubrid/cubrid_forge.php
+++ b/system/database/drivers/cubrid/cubrid_forge.php
@@ -178,6 +178,9 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
$attributes['TYPE'] = 'INTEGER';
$attributes['UNSIGNED'] = FALSE;
return;
+ case 'LONGTEXT':
+ $attributes['TYPE'] = 'STRING';
+ return;
default: return;
}
}
diff --git a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
index 5f854061d..b5b95078e 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
@@ -178,6 +178,9 @@ class CI_DB_pdo_cubrid_forge extends CI_DB_pdo_forge {
$attributes['TYPE'] = 'INTEGER';
$attributes['UNSIGNED'] = FALSE;
return;
+ case 'LONGTEXT':
+ $attributes['TYPE'] = 'STRING';
+ return;
default: return;
}
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7d1d961c0..471e78f53 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -12,6 +12,7 @@ Release Date: Not Released
- Updated :doc:`Image Manipulation Library <libraries/image_lib>` to validate *width* and *height* configuration values.
- Updated :doc:`Encryption Library <libraries/encryption>` to always prefer ``random_bytes()`` when it is available.
- Updated :doc:`Session Library <libraries/session>` to log 'debug' messages when using fallbacks to *session.save_path* (php.ini) or 'sess_use_database', 'sess_table_name' settings.
+ - Added a 'LONGTEXT' to 'STRING' alias to :doc:`Database Forge <database/forge>` for the 'cubrid', 'pdo/cubrid' drivers.
- :php:func:`password_hash()` :doc:`compatibility function <general/compatibility_functions>` changes: