diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 01:04:45 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 01:04:45 +0200 |
| commit | d01e4a612cc3d445aab8a73b63d5b0d5466e394d (patch) | |
| tree | 153cb1ff52bb6c66f5029de065a01fcce84138b8 /application | |
| parent | 37f4b9caa02783e06dd7c5318200113409a0deb1 (diff) | |
| parent | 2ca826b0888096d3ab252cb642975dcc1e57ceab (diff) | |
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/database.php | 3 | ||||
| -rw-r--r-- | application/config/migration.php | 42 |
2 files changed, 44 insertions, 1 deletions
diff --git a/application/config/database.php b/application/config/database.php index fa541a734..b4b34bf66 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -27,7 +27,8 @@ | ['char_set'] The character set used in communicating with the database | ['dbcollat'] The character collation used in communicating with the database | NOTE: For MySQL and MySQLi databases, this setting is only used -| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7. +| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7 +| (and in table creation queries made with DB Forge). | There is an incompatibility in PHP with mysql_real_escape_string() which | can make your site vulnerable to SQL injection if you are using a | multi-byte character set and are running versions lower than these. diff --git a/application/config/migration.php b/application/config/migration.php new file mode 100644 index 000000000..509fd90ab --- /dev/null +++ b/application/config/migration.php @@ -0,0 +1,42 @@ +<?php defined('BASEPATH') OR exit('No direct script access allowed');
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable Migrations
+|--------------------------------------------------------------------------
+|
+| Migrations are disabled by default for security reasons.
+| You should enable migrations whenever you intend to do a schema migration
+| and disable it back when you're done.
+|
+*/
+$config['migration_enabled'] = TRUE;
+
+
+/*
+|--------------------------------------------------------------------------
+| Migrations version
+|--------------------------------------------------------------------------
+|
+| This is used to set migration version that the file system should be on.
+| If you run $this->migration->latest() this is the version that schema will
+| be upgraded / downgraded to.
+|
+*/
+$config['migration_version'] = 0;
+
+
+/*
+|--------------------------------------------------------------------------
+| Migrations Path
+|--------------------------------------------------------------------------
+|
+| Path to your migrations folder.
+| Typically, it will be within your application path.
+| Also, writing permission is required within the migrations path.
+|
+*/
+$config['migration_path'] = APPPATH . 'migrations/';
+
+
+/* End of file migration.php */
+/* Location: ./application/config/migration.php */
\ No newline at end of file |