From 24fbc61e4a46c1e9f185c36629960dce0bad71e2 Mon Sep 17 00:00:00 2001 From: Zachary Flower Date: Sun, 2 Nov 2014 21:50:15 -0700 Subject: Add support for the COMMENT field in DBForge and MySQL Forge classes (pdo, mysql, and mysqli) Signed-off-by: Zachary Flower --- system/database/DB_forge.php | 30 ++++++++++++++++++++++ system/database/drivers/mysql/mysql_forge.php | 1 + system/database/drivers/mysqli/mysqli_forge.php | 1 + .../drivers/pdo/subdrivers/pdo_mysql_forge.php | 1 + 4 files changed, 33 insertions(+) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index aa8bbbe3f..df3b90be6 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -156,6 +156,13 @@ abstract class CI_DB_forge { */ protected $_default = ' DEFAULT '; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = ' COMMENT '; + // -------------------------------------------------------------------- /** @@ -849,6 +856,7 @@ abstract class CI_DB_forge { .$field['default'] .$field['null'] .$field['auto_increment'] + .$field['comment'] .$field['unique']; } @@ -986,6 +994,28 @@ abstract class CI_DB_forge { // -------------------------------------------------------------------- + /** + * Field attribute COMMENT + * + * @param array &$attributes + * @param array &$field + * @return void + */ + protected function _attr_comment(&$attributes, &$field) + { + if ($this->_comment === FALSE) + { + return; + } + + if (!empty($attributes['COMMENT'])) + { + $field['comment'] = $this->_default.$this->db->escape($attributes['COMMENT']); + } + } + + // -------------------------------------------------------------------- + /** * Process primary keys * diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index 6f0d6c5e2..7053fa11d 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -192,6 +192,7 @@ class CI_DB_mysql_forge extends CI_DB_forge { .$field['null'] .$field['default'] .$field['auto_increment'] + .$field['comment'] .$field['unique'] .$extra_clause; } diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index c9a5b6db7..c92d22264 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -194,6 +194,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge { .$field['null'] .$field['default'] .$field['auto_increment'] + .$field['comment'] .$field['unique'] .$extra_clause; } diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php index 6cdfcabb5..85b6ebe84 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php @@ -206,6 +206,7 @@ class CI_DB_pdo_mysql_forge extends CI_DB_pdo_forge { .$field['null'] .$field['default'] .$field['auto_increment'] + .$field['comment'] .$field['unique'] .$extra_clause; } -- cgit v1.2.3-24-g4f1b From 9b512288772f6e0f97fc4274f304132e8f8f5db2 Mon Sep 17 00:00:00 2001 From: Zachary Flower Date: Sun, 2 Nov 2014 21:51:19 -0700 Subject: Disable database COMMENT field by default in all other DB Forge drivers Signed-off-by: Zachary Flower --- system/database/drivers/cubrid/cubrid_forge.php | 7 +++++++ system/database/drivers/ibase/ibase_forge.php | 7 +++++++ system/database/drivers/mssql/mssql_forge.php | 7 +++++++ system/database/drivers/oci8/oci8_forge.php | 7 +++++++ system/database/drivers/odbc/odbc_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_4d_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_informix_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_oci_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php | 7 +++++++ system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php | 7 +++++++ system/database/drivers/postgre/postgre_forge.php | 7 +++++++ system/database/drivers/sqlite/sqlite_forge.php | 7 +++++++ system/database/drivers/sqlite3/sqlite3_forge.php | 7 +++++++ system/database/drivers/sqlsrv/sqlsrv_forge.php | 7 +++++++ 20 files changed, 140 insertions(+) diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php index 2a1929868..b6c6a3b52 100644 --- a/system/database/drivers/cubrid/cubrid_forge.php +++ b/system/database/drivers/cubrid/cubrid_forge.php @@ -92,6 +92,13 @@ class CI_DB_cubrid_forge extends CI_DB_forge { 'REAL' => 'DOUBLE' ); + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/ibase/ibase_forge.php b/system/database/drivers/ibase/ibase_forge.php index 73968bd03..3cab2640b 100644 --- a/system/database/drivers/ibase/ibase_forge.php +++ b/system/database/drivers/ibase/ibase_forge.php @@ -85,6 +85,13 @@ class CI_DB_ibase_forge extends CI_DB_forge { */ protected $_null = 'NULL'; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php index 8d980931b..315ca4be4 100644 --- a/system/database/drivers/mssql/mssql_forge.php +++ b/system/database/drivers/mssql/mssql_forge.php @@ -74,6 +74,13 @@ class CI_DB_mssql_forge extends CI_DB_forge { 'REAL' => 'FLOAT' ); + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index 433692ddb..c1c5f113e 100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php @@ -74,6 +74,13 @@ class CI_DB_oci8_forge extends CI_DB_forge { */ protected $_unsigned = FALSE; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php index d78bc369a..00cb00bef 100644 --- a/system/database/drivers/odbc/odbc_forge.php +++ b/system/database/drivers/odbc/odbc_forge.php @@ -69,6 +69,13 @@ class CI_DB_odbc_forge extends CI_DB_forge { */ protected $_unsigned = FALSE; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php index 840297450..1852c8fe9 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php @@ -100,6 +100,13 @@ class CI_DB_pdo_4d_forge extends CI_DB_4d_forge { */ protected $_default = FALSE; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php index cc8d46273..89db1c393 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php @@ -92,6 +92,13 @@ class CI_DB_pdo_cubrid_forge extends CI_DB_pdo_forge { 'REAL' => 'DOUBLE' ); + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php index c0ee490ce..d9c766ec1 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php @@ -72,6 +72,13 @@ class CI_DB_pdo_dblib_forge extends CI_DB_pdo_forge { 'REAL' => 'FLOAT' ); + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php index 87f1586d7..358f0934a 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php @@ -71,6 +71,13 @@ class CI_DB_pdo_firebird_forge extends CI_DB_pdo_forge { */ protected $_null = 'NULL'; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php b/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php index 3227602f4..043f77f53 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php @@ -71,6 +71,13 @@ class CI_DB_pdo_ibm_forge extends CI_DB_pdo_forge { */ protected $_default = FALSE; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php b/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php index 9a6e9c8a4..393b64e48 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php @@ -73,6 +73,13 @@ class CI_DB_pdo_informix_forge extends CI_DB_pdo_forge { */ protected $_default = ', '; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php index d4f33e144..895aec43d 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php @@ -74,6 +74,13 @@ class CI_DB_pdo_oci_forge extends CI_DB_pdo_forge { */ protected $_unsigned = FALSE; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php b/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php index a9ff67fa8..083cfbcf3 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php @@ -53,6 +53,13 @@ class CI_DB_pdo_odbc_forge extends CI_DB_pdo_forge { */ protected $_unsigned = FALSE; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php index 00579aab4..19497bb3a 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php @@ -77,6 +77,13 @@ class CI_DB_pdo_pgsql_forge extends CI_DB_pdo_forge { */ protected $_null = 'NULL'; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php index f7bd99ed6..81c85940e 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php @@ -74,6 +74,13 @@ class CI_DB_pdo_sqlite_forge extends CI_DB_pdo_forge { */ protected $_null = 'NULL'; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php index b0b08a136..7adeda8ab 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php @@ -72,6 +72,13 @@ class CI_DB_pdo_sqlsrv_forge extends CI_DB_pdo_forge { 'REAL' => 'FLOAT' ); + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php index 1dcd02761..7db9e500c 100644 --- a/system/database/drivers/postgre/postgre_forge.php +++ b/system/database/drivers/postgre/postgre_forge.php @@ -72,6 +72,13 @@ class CI_DB_postgre_forge extends CI_DB_forge { */ protected $_null = 'NULL'; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index 859484225..036b6073f 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -67,6 +67,13 @@ class CI_DB_sqlite_forge extends CI_DB_forge { */ protected $_null = 'NULL'; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/sqlite3/sqlite3_forge.php b/system/database/drivers/sqlite3/sqlite3_forge.php index a527e51cd..df0554869 100644 --- a/system/database/drivers/sqlite3/sqlite3_forge.php +++ b/system/database/drivers/sqlite3/sqlite3_forge.php @@ -60,6 +60,13 @@ class CI_DB_sqlite3_forge extends CI_DB_forge { */ protected $_null = 'NULL'; + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index 0f1da1d22..ab0571845 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -72,6 +72,13 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { 'REAL' => 'FLOAT' ); + /** + * COMMENT value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_comment = FALSE; + // -------------------------------------------------------------------- /** -- cgit v1.2.3-24-g4f1b From e59347dd1665078beb41a1e6ca1b12932b489336 Mon Sep 17 00:00:00 2001 From: Zachary Flower Date: Mon, 3 Nov 2014 08:34:12 -0700 Subject: Ensure forge comments are actually getting parsed Signed-off-by: Zachary Flower --- system/database/DB_forge.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index df3b90be6..6dc2a4514 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -777,6 +777,7 @@ abstract class CI_DB_forge { 'unique' => '', 'default' => '', 'auto_increment' => '', + 'comment' => '', '_literal' => FALSE ); @@ -813,6 +814,7 @@ abstract class CI_DB_forge { } $this->_attr_auto_increment($attributes, $field); + $this->_attr_comment($attributes, $field); $this->_attr_unique($attributes, $field); if (isset($attributes['TYPE']) && ! empty($attributes['CONSTRAINT'])) -- cgit v1.2.3-24-g4f1b From 12ee7a1a74e45b1369876ea945ae3347da046087 Mon Sep 17 00:00:00 2001 From: Zachary Flower Date: Mon, 3 Nov 2014 08:38:41 -0700 Subject: Move comment field after unique field in db forge --- system/database/DB_forge.php | 6 +++--- system/database/drivers/mysql/mysql_forge.php | 2 +- system/database/drivers/mysqli/mysqli_forge.php | 2 +- system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index 6dc2a4514..0317489f6 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -814,8 +814,8 @@ abstract class CI_DB_forge { } $this->_attr_auto_increment($attributes, $field); - $this->_attr_comment($attributes, $field); $this->_attr_unique($attributes, $field); + $this->_attr_comment($attributes, $field); if (isset($attributes['TYPE']) && ! empty($attributes['CONSTRAINT'])) { @@ -858,8 +858,8 @@ abstract class CI_DB_forge { .$field['default'] .$field['null'] .$field['auto_increment'] - .$field['comment'] - .$field['unique']; + .$field['unique'] + .$field['comment']; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index 7053fa11d..ee89e1d80 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -192,8 +192,8 @@ class CI_DB_mysql_forge extends CI_DB_forge { .$field['null'] .$field['default'] .$field['auto_increment'] - .$field['comment'] .$field['unique'] + .$field['comment'] .$extra_clause; } diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index c92d22264..e37bd1b80 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -194,8 +194,8 @@ class CI_DB_mysqli_forge extends CI_DB_forge { .$field['null'] .$field['default'] .$field['auto_increment'] - .$field['comment'] .$field['unique'] + .$field['comment'] .$extra_clause; } diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php index 85b6ebe84..2152dea30 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php @@ -206,8 +206,8 @@ class CI_DB_pdo_mysql_forge extends CI_DB_pdo_forge { .$field['null'] .$field['default'] .$field['auto_increment'] - .$field['comment'] .$field['unique'] + .$field['comment'] .$extra_clause; } -- cgit v1.2.3-24-g4f1b From e4b10bf0ad59049ed78ed9cfc5f708188f3cd442 Mon Sep 17 00:00:00 2001 From: Zachary Flower Date: Mon, 3 Nov 2014 10:42:57 -0700 Subject: Move MySQL comments to MySQL forge classes only --- system/database/DB_forge.php | 39 ++++------------------ system/database/drivers/mysql/mysql_forge.php | 4 ++- system/database/drivers/mysqli/mysqli_forge.php | 4 ++- .../drivers/pdo/subdrivers/pdo_mysql_forge.php | 4 ++- 4 files changed, 15 insertions(+), 36 deletions(-) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index 0317489f6..85505ce41 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -156,13 +156,6 @@ abstract class CI_DB_forge { */ protected $_default = ' DEFAULT '; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = ' COMMENT '; - // -------------------------------------------------------------------- /** @@ -777,7 +770,6 @@ abstract class CI_DB_forge { 'unique' => '', 'default' => '', 'auto_increment' => '', - 'comment' => '', '_literal' => FALSE ); @@ -815,7 +807,11 @@ abstract class CI_DB_forge { $this->_attr_auto_increment($attributes, $field); $this->_attr_unique($attributes, $field); - $this->_attr_comment($attributes, $field); + + if (isset($attributes['COMMENT'])) + { + $field['comment'] = $this->db->escape($attributes['COMMENT']); + } if (isset($attributes['TYPE']) && ! empty($attributes['CONSTRAINT'])) { @@ -858,8 +854,7 @@ abstract class CI_DB_forge { .$field['default'] .$field['null'] .$field['auto_increment'] - .$field['unique'] - .$field['comment']; + .$field['unique']; } // -------------------------------------------------------------------- @@ -996,28 +991,6 @@ abstract class CI_DB_forge { // -------------------------------------------------------------------- - /** - * Field attribute COMMENT - * - * @param array &$attributes - * @param array &$field - * @return void - */ - protected function _attr_comment(&$attributes, &$field) - { - if ($this->_comment === FALSE) - { - return; - } - - if (!empty($attributes['COMMENT'])) - { - $field['comment'] = $this->_default.$this->db->escape($attributes['COMMENT']); - } - } - - // -------------------------------------------------------------------- - /** * Process primary keys * diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index ee89e1d80..282e2d1d8 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -185,6 +185,8 @@ class CI_DB_mysql_forge extends CI_DB_forge { $extra_clause = ' FIRST'; } + $comment_clause = isset($field['comment']) ? ' COMMENT ' . $field['comment'] : ''; + return $this->db->escape_identifiers($field['name']) .(empty($field['new_name']) ? '' : ' '.$this->db->escape_identifiers($field['new_name'])) .' '.$field['type'].$field['length'] @@ -193,7 +195,7 @@ class CI_DB_mysql_forge extends CI_DB_forge { .$field['default'] .$field['auto_increment'] .$field['unique'] - .$field['comment'] + .$comment_clause .$extra_clause; } diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index e37bd1b80..38f624909 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -187,6 +187,8 @@ class CI_DB_mysqli_forge extends CI_DB_forge { $extra_clause = ' FIRST'; } + $comment_clause = isset($field['comment']) ? ' COMMENT ' . $field['comment'] : ''; + return $this->db->escape_identifiers($field['name']) .(empty($field['new_name']) ? '' : ' '.$this->db->escape_identifiers($field['new_name'])) .' '.$field['type'].$field['length'] @@ -195,7 +197,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge { .$field['default'] .$field['auto_increment'] .$field['unique'] - .$field['comment'] + .$comment_clause .$extra_clause; } diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php index 2152dea30..2e988c3f5 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php @@ -199,6 +199,8 @@ class CI_DB_pdo_mysql_forge extends CI_DB_pdo_forge { $extra_clause = ' FIRST'; } + $comment_clause = isset($field['comment']) ? ' COMMENT ' . $field['comment'] : ''; + return $this->db->escape_identifiers($field['name']) .(empty($field['new_name']) ? '' : ' '.$this->db->escape_identifiers($field['new_name'])) .' '.$field['type'].$field['length'] @@ -207,7 +209,7 @@ class CI_DB_pdo_mysql_forge extends CI_DB_pdo_forge { .$field['default'] .$field['auto_increment'] .$field['unique'] - .$field['comment'] + .$comment_clause .$extra_clause; } -- cgit v1.2.3-24-g4f1b From ce8aa3b5abe0b20da7dbee70fb49f440ad41b15c Mon Sep 17 00:00:00 2001 From: Zachary Flower Date: Mon, 3 Nov 2014 10:43:28 -0700 Subject: Remove comment field definition from all other forge classes --- system/database/drivers/cubrid/cubrid_forge.php | 7 ------- system/database/drivers/ibase/ibase_forge.php | 7 ------- system/database/drivers/mssql/mssql_forge.php | 7 ------- system/database/drivers/oci8/oci8_forge.php | 7 ------- system/database/drivers/odbc/odbc_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_4d_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_informix_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_oci_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php | 7 ------- system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php | 7 ------- system/database/drivers/postgre/postgre_forge.php | 7 ------- system/database/drivers/sqlite/sqlite_forge.php | 7 ------- system/database/drivers/sqlite3/sqlite3_forge.php | 7 ------- system/database/drivers/sqlsrv/sqlsrv_forge.php | 7 ------- 20 files changed, 140 deletions(-) diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php index b6c6a3b52..2a1929868 100644 --- a/system/database/drivers/cubrid/cubrid_forge.php +++ b/system/database/drivers/cubrid/cubrid_forge.php @@ -92,13 +92,6 @@ class CI_DB_cubrid_forge extends CI_DB_forge { 'REAL' => 'DOUBLE' ); - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/ibase/ibase_forge.php b/system/database/drivers/ibase/ibase_forge.php index 3cab2640b..73968bd03 100644 --- a/system/database/drivers/ibase/ibase_forge.php +++ b/system/database/drivers/ibase/ibase_forge.php @@ -85,13 +85,6 @@ class CI_DB_ibase_forge extends CI_DB_forge { */ protected $_null = 'NULL'; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php index 315ca4be4..8d980931b 100644 --- a/system/database/drivers/mssql/mssql_forge.php +++ b/system/database/drivers/mssql/mssql_forge.php @@ -74,13 +74,6 @@ class CI_DB_mssql_forge extends CI_DB_forge { 'REAL' => 'FLOAT' ); - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index c1c5f113e..433692ddb 100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php @@ -74,13 +74,6 @@ class CI_DB_oci8_forge extends CI_DB_forge { */ protected $_unsigned = FALSE; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php index 00cb00bef..d78bc369a 100644 --- a/system/database/drivers/odbc/odbc_forge.php +++ b/system/database/drivers/odbc/odbc_forge.php @@ -69,13 +69,6 @@ class CI_DB_odbc_forge extends CI_DB_forge { */ protected $_unsigned = FALSE; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php index 1852c8fe9..840297450 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php @@ -100,13 +100,6 @@ class CI_DB_pdo_4d_forge extends CI_DB_4d_forge { */ protected $_default = FALSE; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php index 89db1c393..cc8d46273 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php @@ -92,13 +92,6 @@ class CI_DB_pdo_cubrid_forge extends CI_DB_pdo_forge { 'REAL' => 'DOUBLE' ); - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php index d9c766ec1..c0ee490ce 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php @@ -72,13 +72,6 @@ class CI_DB_pdo_dblib_forge extends CI_DB_pdo_forge { 'REAL' => 'FLOAT' ); - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php index 358f0934a..87f1586d7 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php @@ -71,13 +71,6 @@ class CI_DB_pdo_firebird_forge extends CI_DB_pdo_forge { */ protected $_null = 'NULL'; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php b/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php index 043f77f53..3227602f4 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php @@ -71,13 +71,6 @@ class CI_DB_pdo_ibm_forge extends CI_DB_pdo_forge { */ protected $_default = FALSE; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php b/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php index 393b64e48..9a6e9c8a4 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php @@ -73,13 +73,6 @@ class CI_DB_pdo_informix_forge extends CI_DB_pdo_forge { */ protected $_default = ', '; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php index 895aec43d..d4f33e144 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php @@ -74,13 +74,6 @@ class CI_DB_pdo_oci_forge extends CI_DB_pdo_forge { */ protected $_unsigned = FALSE; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php b/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php index 083cfbcf3..a9ff67fa8 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php @@ -53,13 +53,6 @@ class CI_DB_pdo_odbc_forge extends CI_DB_pdo_forge { */ protected $_unsigned = FALSE; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php index 19497bb3a..00579aab4 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php @@ -77,13 +77,6 @@ class CI_DB_pdo_pgsql_forge extends CI_DB_pdo_forge { */ protected $_null = 'NULL'; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php index 81c85940e..f7bd99ed6 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php @@ -74,13 +74,6 @@ class CI_DB_pdo_sqlite_forge extends CI_DB_pdo_forge { */ protected $_null = 'NULL'; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php index 7adeda8ab..b0b08a136 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php @@ -72,13 +72,6 @@ class CI_DB_pdo_sqlsrv_forge extends CI_DB_pdo_forge { 'REAL' => 'FLOAT' ); - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php index 7db9e500c..1dcd02761 100644 --- a/system/database/drivers/postgre/postgre_forge.php +++ b/system/database/drivers/postgre/postgre_forge.php @@ -72,13 +72,6 @@ class CI_DB_postgre_forge extends CI_DB_forge { */ protected $_null = 'NULL'; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index 036b6073f..859484225 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -67,13 +67,6 @@ class CI_DB_sqlite_forge extends CI_DB_forge { */ protected $_null = 'NULL'; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/sqlite3/sqlite3_forge.php b/system/database/drivers/sqlite3/sqlite3_forge.php index df0554869..a527e51cd 100644 --- a/system/database/drivers/sqlite3/sqlite3_forge.php +++ b/system/database/drivers/sqlite3/sqlite3_forge.php @@ -60,13 +60,6 @@ class CI_DB_sqlite3_forge extends CI_DB_forge { */ protected $_null = 'NULL'; - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index ab0571845..0f1da1d22 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -72,13 +72,6 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { 'REAL' => 'FLOAT' ); - /** - * COMMENT value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_comment = FALSE; - // -------------------------------------------------------------------- /** -- cgit v1.2.3-24-g4f1b