summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorZachary Flower <zach@ninjaninja.net>2014-11-03 16:38:41 +0100
committerZachary Flower <zach@ninjaninja.net>2014-11-03 16:38:41 +0100
commit12ee7a1a74e45b1369876ea945ae3347da046087 (patch)
tree2c1589192c88d165e2cc7281f0892ec9e37ca541 /system
parente59347dd1665078beb41a1e6ca1b12932b489336 (diff)
Move comment field after unique field in db forge
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_forge.php6
-rw-r--r--system/database/drivers/mysql/mysql_forge.php2
-rw-r--r--system/database/drivers/mysqli/mysqli_forge.php2
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php2
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;
}