From 97283c921b48a688682a1002aad08403dd08daa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heiko=20Bernl=C3=B6hr?= Date: Fri, 12 Jan 2018 11:44:52 +0100 Subject: Change configuration to sqlite database. --- Gemfile | 2 +- Gemfile.lock | 49 +++++++++++++++++++++++++++++-------------------- config/database.yml | 44 ++++++++++++++++---------------------------- 3 files changed, 46 insertions(+), 49 deletions(-) diff --git a/Gemfile b/Gemfile index c64535d..fb39a79 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby +gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index dc245ae..2ced1e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,7 +28,7 @@ GEM thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) - builder (3.2.2) + builder (3.2.3) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -40,23 +40,24 @@ GEM execjs (2.2.1) haml (4.0.5) tilt - hike (1.2.1) - i18n (0.6.9) + hike (1.2.3) + i18n (0.8.6) jbuilder (2.1.3) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.6) + libv8 (3.16.14.19) mail (2.6.1) mime-types (>= 1.16, < 3) mime-types (1.25) - minitest (5.4.2) - multi_json (1.10.1) - pg (0.17.1) - rack (1.5.2) - rack-test (0.6.2) + minitest (5.10.3) + multi_json (1.12.2) + pg (1.0.0) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.8) actionmailer (= 4.1.8) @@ -73,13 +74,14 @@ GEM activesupport (= 4.1.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.2) + rake (12.1.0) rdoc (4.1.0) - sass (3.4.6) - sass-rails (4.0.3) + ref (2.0.0) + sass (3.2.19) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) - sass (~> 3.2) - sprockets (~> 2.12) + sass (~> 3.2.2) + sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) @@ -87,22 +89,25 @@ GEM simple-navigation (4.0.4) activesupport (>= 2.3.2) spring (1.1.3) - sprockets (2.12.3) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) sqlite3 (1.3.9) - thor (0.19.1) - thread_safe (0.3.3) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref + thor (0.20.0) + thread_safe (0.3.6) tilt (1.4.1) turbolinks (2.2.2) coffee-rails - tzinfo (1.1.0) + tzinfo (1.2.3) thread_safe (~> 0.1) uglifier (2.5.3) execjs (>= 0.3.0) @@ -123,5 +128,9 @@ DEPENDENCIES simple-navigation spring sqlite3 + therubyracer turbolinks uglifier (>= 1.3.0) + +BUNDLED WITH + 1.15.4 diff --git a/config/database.yml b/config/database.yml index d462838..1c1a37c 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,37 +1,25 @@ -base: &base - adapter: postgresql - encoding: unicode - pool: 5 - username: mb7 - password: +# SQLite version 3.x +# gem install sqlite3 # -development: - database: ecs_development - <<: *base - - # Connect on a TCP socket. Omitted by default since the client uses a - # domain socket that doesn't need configuration. Windows does not have - # domain sockets, so uncomment these lines. - #host: localhost - #port: 5432 - - # Schema search path. The server defaults to $user,public - #schema_search_path: myapp,sharedapp,public +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: 5 + timeout: 5000 - # Minimum log levels, in increasing order: - # debug5, debug4, debug3, debug2, debug1, - # log, notice, warning, error, fatal, and panic - # The server defaults to notice. - #min_messages: warning +development: + <<: *default + database: db/development.sqlite3 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: - database: ecs_test - <<: *base + <<: *default + database: db/test.sqlite3 production: - database: ecs_production - <<: *base - + <<: *default + database: db/production.sqlite3 -- cgit v1.2.3