SHIMADA Koji
null+****@clear*****
Mon Oct 1 20:42:56 JST 2012
SHIMADA Koji 2012-10-01 20:42:56 +0900 (Mon, 01 Oct 2012) New Revision: 001c77d897a124dcab576490dd23a58c5446a2de https://github.com/logaling/logaling-server/commit/001c77d897a124dcab576490dd23a58c5446a2de Log: Use postgresql as default database Modified files: Gemfile Gemfile.lock config/database.yml.example Modified: Gemfile (+1 -1) =================================================================== --- Gemfile 2012-10-01 20:41:47 +0900 (ca7abad) +++ Gemfile 2012-10-01 20:42:56 +0900 (14c1411) @@ -5,7 +5,7 @@ gem 'rails', '3.2.8' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'sqlite3' +gem 'pg' # Gems used only for assets and not required Modified: Gemfile.lock (+2 -2) =================================================================== --- Gemfile.lock 2012-10-01 20:41:47 +0900 (145a429) +++ Gemfile.lock 2012-10-01 20:42:56 +0900 (62638de) @@ -180,6 +180,7 @@ GEM omniauth-twitter (0.0.11) multi_json (~> 1.3) omniauth-oauth (~> 1.0) + pg (0.14.1) pkg-config (1.1.4) polyglot (0.3.3) rack (1.4.1) @@ -240,7 +241,6 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) term-ansicolor (1.0.7) therubyracer (0.10.2) libv8 (~> 3.3.10) @@ -287,9 +287,9 @@ DEPENDENCIES omniauth-facebook omniauth-github omniauth-twitter + pg rails (= 3.2.8) rspec-rails sass-rails (~> 3.2.3) - sqlite3 twitter-bootstrap-rails uglifier (>= 1.0.3) Modified: config/database.yml.example (+47 -17) =================================================================== --- config/database.yml.example 2012-10-01 20:41:47 +0900 (09cc85a) +++ config/database.yml.example 2012-10-01 20:42:56 +0900 (0457401) @@ -1,28 +1,58 @@ -# SQLite version 3.x -# gem install sqlite3 +# PostgreSQL. Versions 8.2 and up are supported. +# +# Install the pg driver: +# gem install pg +# On Mac OS X with macports: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' # -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' development: - adapter: sqlite3 - database: db/development.sqlite3 + adapter: postgresql + encoding: unicode + database: logaling_server_development pool: 5 - timeout: 5000 + username: logaling + password: + min_messages: WARNING + + # 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 + + # 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 # 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: &test - adapter: sqlite3 - database: db/test.sqlite3 +test: + adapter: postgresql + encoding: unicode + database: logaling_server_test pool: 5 - timeout: 5000 + username: logaling + password: + min_messages: WARNING production: - adapter: sqlite3 - database: db/production.sqlite3 + adapter: postgresql + encoding: unicode + database: logaling_server_production pool: 5 - timeout: 5000 - -cucumber: - <<: *test \ No newline at end of file + username: logaling + password: + min_messages: WARNING -------------- next part -------------- An HTML attachment was scrubbed...Descargar
