Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #48 from ddreier/develop

Some changes to make Tiny Issue more database flexible
  • Loading branch information...
commit eb6e930c434d210f8895381e2203de5913b64e8f 2 parents e30cc16 + ca976ad
Michael Hasselbring mikelbring authored
2  app/application/config/database.php
View
@@ -42,8 +42,6 @@
|
*/
- 'default' => 'mysql',
-
/*
|--------------------------------------------------------------------------
| Database Connections
14 app/application/start.php
View
@@ -43,15 +43,17 @@
case 'database':
- $config['connections']['mysql'] = array(
- 'host' => $config_app['mysql']['host'],
- 'database' => $config_app['mysql']['database'],
- 'username' => $config_app['mysql']['username'],
- 'password' => $config_app['mysql']['password'],
+ $config['connections'][$config_app['database']['driver']] = array(
+ 'host' => $config_app['database']['host'],
+ 'database' => $config_app['database']['database'],
+ 'username' => $config_app['database']['username'],
+ 'password' => $config_app['database']['password'],
'charset' => 'utf8',
'prefix' => '',
- 'driver' => 'mysql'
+ 'driver' => $config_app['database']['driver']
);
+
+ $config['default'] = $config_app['database']['driver'];
$load = $config + $load;
6 config.app.example.php
View
@@ -10,9 +10,11 @@
/**
- * Fill out your MySQL database settings
+ * Fill out your database settings. Make sure that the driver is correct: 'mysql' for MySQL, 'sqlsrv' for MSSQL,
+ * 'pgsql' for PostgreSQL, or 'sqlite' for SQLite
*/
- 'mysql' => array(
+ 'database' => array(
+ 'driver' => 'mysql'
'host' => 'localhost',
'database' => 'database_name',
'username' => 'database_user',
Please sign in to comment.
Something went wrong with that request. Please try again.