diff options
| author | Jonathon Hill <jhill@brandmovers.com> | 2012-11-12 15:03:36 +0100 |
|---|---|---|
| committer | Jonathon Hill <jhill@brandmovers.com> | 2012-11-12 15:03:36 +0100 |
| commit | b719bfdb268926e764a787ffcab1a3ea9c9759d7 (patch) | |
| tree | 4329fd690881f4c343fe8b5f4fa5b9078dd84ea9 | |
| parent | 3978fc33d82dd7f778d1adbf30744f4dfac41c25 (diff) | |
Changed the `migration_style` config setting to `migration_type`
Signed-off-by: Jonathon Hill <jhill@brandmovers.com>
| -rw-r--r-- | application/config/migration.php | 4 | ||||
| -rw-r--r-- | system/libraries/Migration.php | 14 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/migration.rst | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/application/config/migration.php b/application/config/migration.php index 476da1b8e..3ea3ef93c 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -39,7 +39,7 @@ $config['migration_enabled'] = FALSE; /* |-------------------------------------------------------------------------- -| Migration Style +| Migration Type |-------------------------------------------------------------------------- | | Migration file names may be based on a sequential identifier or on @@ -53,7 +53,7 @@ $config['migration_enabled'] = FALSE; | to 'sequential' for backward compatibility. | */ -$config['migration_style'] = 'timestamp'; +$config['migration_type'] = 'timestamp'; /* |-------------------------------------------------------------------------- diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index 275aeb048..af9e53030 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -48,11 +48,11 @@ class CI_Migration { protected $_migration_enabled = FALSE; /** - * Migration numbering style + * Migration numbering type * * @var bool */ - protected $_migration_style = 'sequential'; + protected $_migration_type = 'sequential'; /** * Path to migration classes @@ -142,12 +142,12 @@ class CI_Migration { } // Migration basename regex - $this->_migration_regex = $this->_migration_style === 'timestamp' ? '/^\d{14}_(\w+)$/' : '/^\d{3}_(\w+)$/'; + $this->_migration_regex = $this->_migration_type === 'timestamp' ? '/^\d{14}_(\w+)$/' : '/^\d{3}_(\w+)$/'; - // Make sure a valid migration numbering style was set. - if ( ! in_array($this->_migration_style, array('sequential', 'timestamp'))) + // Make sure a valid migration numbering type was set. + if ( ! in_array($this->_migration_type, array('sequential', 'timestamp'))) { - show_error('An invalid migration numbering style was specified: '.$this->_migration_style); + show_error('An invalid migration numbering type was specified: '.$this->_migration_type); } // If the migrations table is missing, make it @@ -216,7 +216,7 @@ class CI_Migration { foreach ($migrations as $number => $file) { // Check for sequence gaps - if ($this->_migration_style === 'sequential' AND $previous !== FALSE AND abs($number - $previous) > 1) + if ($this->_migration_type === 'sequential' AND $previous !== FALSE AND abs($number - $previous) > 1) { $this->_error_string = sprintf($this->lang->line('migration_sequence_gap'), $number); return FALSE; diff --git a/user_guide_src/source/libraries/migration.rst b/user_guide_src/source/libraries/migration.rst index 246396171..1a73fb78d 100644 --- a/user_guide_src/source/libraries/migration.rst +++ b/user_guide_src/source/libraries/migration.rst @@ -28,7 +28,7 @@ method taken. Two numbering styles are available: helps prevent numbering conflicts when working in a team environment, and is the preferred scheme in CodeIgniter 3.0 and later. -The desired style may be selected using the **$config['migration_style']** +The desired style may be selected using the **$config['migration_type']** setting in your **migration.php** config file. Regardless of which numbering style you choose to use, prefix your migration @@ -158,6 +158,6 @@ Preference Default Options Des version number. **migration_auto_latest** FALSE TRUE / FALSE Enable or disable automatically running migrations. -**migration_style** 'timestamp' 'timestamp' / 'sequential' The type of numeric identifier used to name +**migration_type** 'timestamp' 'timestamp' / 'sequential' The type of numeric identifier used to name migration files. ========================== ====================== ========================== ============================================= |