diff options
author | Aaron Parecki <aaron@parecki.com> | 2015-07-25 03:42:47 -0700 |
---|---|---|
committer | Aaron Parecki <aaron@parecki.com> | 2015-07-25 03:42:47 -0700 |
commit | 41fac1f6f109912defa07d7acb6b95e015ad4339 (patch) | |
tree | daeb304c6a427836166c4ccb65cb247add0b3de0 | |
parent | 0c27b5bdd561aa27e1138f4fdc2be04bd828ff69 (diff) | |
parent | 8de9fd30276a273e715c0f3ee4cf227d2927bb36 (diff) |
Merge pull request #20 from jeena/sqlite
Adds possibility to use SQLite as db
-rw-r--r-- | lib/config.template.php | 5 | ||||
-rw-r--r-- | lib/helpers.php | 10 | ||||
-rw-r--r-- | schema/mysql.sql (renamed from schema/schema.sql) | 0 | ||||
-rw-r--r-- | schema/sqlite.sql | 22 |
4 files changed, 34 insertions, 3 deletions
diff --git a/lib/config.template.php b/lib/config.template.php index dae8968..ee822bb 100644 --- a/lib/config.template.php +++ b/lib/config.template.php @@ -4,11 +4,16 @@ class Config { public static $base_url = 'http://quill.dev/'; public static $gaid = ''; + // MySQL (default) public static $dbHost = '127.0.0.1'; public static $dbName = 'quill'; public static $dbUsername = 'quill'; public static $dbPassword = ''; + // Sqlite + // public static $dbType = 'sqlite'; + // public static $dbFilePath = './example.db'; + public static $jwtSecret = 'xxx'; public static $fbClientID = ''; diff --git a/lib/helpers.php b/lib/helpers.php index 4f6b4c1..e7e7771 100644 --- a/lib/helpers.php +++ b/lib/helpers.php @@ -1,8 +1,12 @@ <?php -ORM::configure('mysql:host=' . Config::$dbHost . ';dbname=' . Config::$dbName); -ORM::configure('username', Config::$dbUsername); -ORM::configure('password', Config::$dbPassword); +if(Config::$dbType == 'sqlite') { + ORM::configure('sqlite:' . Config::$dbFilePath); +} else { + ORM::configure('mysql:host=' . Config::$dbHost . ';dbname=' . Config::$dbName); + ORM::configure('username', Config::$dbUsername); + ORM::configure('password', Config::$dbPassword); +} function render($page, $data) { global $app; diff --git a/schema/schema.sql b/schema/mysql.sql index 5f33ce6..5f33ce6 100644 --- a/schema/schema.sql +++ b/schema/mysql.sql diff --git a/schema/sqlite.sql b/schema/sqlite.sql new file mode 100644 index 0000000..ac691e3 --- /dev/null +++ b/schema/sqlite.sql @@ -0,0 +1,22 @@ +CREATE TABLE users ( + id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, + url TEXT, + authorization_endpoint TEXT, + token_endpoint TEXT, + micropub_endpoint TEXT, + micropub_access_token TEXT, + micropub_scope TEXT, + micropub_response TEXT, + micropub_success INTEGER default 0, + date_created datetime, + last_login datetime, + last_micropub_response TEXT, + last_micropub_response_date datetime, + location_enabled INTEGER NOT NULL default 0, + syndication_targets TEXT, + facebook_access_token TEXT, + twitter_access_token TEXT, + twitter_token_secret TEXT, + twitter_username TEXT, + instagram_access_token TEXT +);
\ No newline at end of file |