Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow literal path in sqlite database config.

This commit is contained in:
Taylor Otwell 2011-06-10 22:30:41 -05:00
parent e85e8f957a
commit 6f1f5eed0d
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
system/db/connector.php
View File

@ -22,16 +22,29 @@ class Connector {
*/ */
public static function connect($config) public static function connect($config)
{ {
// --------------------------------------------------- // -----------------------------------------------------
// Establish a SQLite PDO connection. // Connect to SQLite.
// --------------------------------------------------- // -----------------------------------------------------
if ($config->driver == 'sqlite') if ($config->driver == 'sqlite')
{ {
return new \PDO('sqlite:'.APP_PATH.'db/'.$config->database.'.sqlite', null, null, static::$options); // -----------------------------------------------------
// Check the application/db directory first.
// -----------------------------------------------------
if (file_exists($path = APP_PATH.'db/'.$config->database.'.sqlite'))
{
return new \PDO('sqlite:'.$path, null, null, static::$options);
}
// -----------------------------------------------------
// Is the database name the full path?
// -----------------------------------------------------
elseif (file_exists($config->database))
{
return new \PDO('sqlite:'.$config->database, null, null, static::$options);
}
} }
// --------------------------------------------------- // -----------------------------------------------------
// Establish a MySQL or Postgres PDO connection. // Connect to MySQL or Postgres.
// --------------------------------------------------- // -----------------------------------------------------
elseif ($config->driver == 'mysql' or $config->driver == 'pgsql') elseif ($config->driver == 'mysql' or $config->driver == 'pgsql')
{ {
$connection = new \PDO($config->driver.':host='.$config->host.';dbname='.$config->database, $config->username, $config->password, static::$options); $connection = new \PDO($config->driver.':host='.$config->host.';dbname='.$config->database, $config->username, $config->password, static::$options);
@ -43,10 +56,8 @@ public static function connect($config)
return $connection; return $connection;
} }
else
{ throw new \Exception('Database driver '.$config->driver.' is not supported.');
throw new \Exception('Database driver '.$config->driver.' is not supported.');
}
} }
} }