diff --git a/README.md b/README.md index 1d917828..c31c509b 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,7 @@ for you. * `app['database']['adapter']` * **Supported values:** `mariadb`, `mysql`, `postgresql`, `sqlite3` - * **Note:** There is no default database adapter if a RDS resource is not - defined in your stack. + * **Default:** `sqlite3` * ActiveRecord adapter which will be used for database connection. * `app['database']['username']` * Username used to authenticate to the DB diff --git a/attributes/default.rb b/attributes/default.rb index 2c046140..b982f824 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -21,6 +21,11 @@ nginx::http_stub_status_module ) +# database +## common + +default['defaults']['database']['adapter'] = 'sqlite3' + # scm ## common diff --git a/libraries/drivers_db_base.rb b/libraries/drivers_db_base.rb index 7bbd8037..e1269aa1 100644 --- a/libraries/drivers_db_base.rb +++ b/libraries/drivers_db_base.rb @@ -58,7 +58,8 @@ def app_engine end def node_engine - node['deploy'][app['shortname']]['database'].try(:[], 'adapter') + node['deploy'][app['shortname']]['database'].try(:[], 'adapter') || + node['defaults'].try(:[], 'database').try(:[], 'adapter') end private diff --git a/libraries/drivers_db_factory.rb b/libraries/drivers_db_factory.rb index a5e68783..29cab564 100644 --- a/libraries/drivers_db_factory.rb +++ b/libraries/drivers_db_factory.rb @@ -13,7 +13,8 @@ def self.detect_engine(app, node, options) Drivers::Db::Base.descendants.detect do |db_driver| db_driver.allowed_engines.include?( options.try(:[], :rds).try(:[], 'engine') || - node.try(:[], 'deploy').try(:[], app['shortname']).try(:[], 'database').try(:[], 'adapter') + node.try(:[], 'deploy').try(:[], app['shortname']).try(:[], 'database').try(:[], 'adapter') || + node.try(:[], 'defaults').try(:[], 'database').try(:[], 'adapter') ) end end