diff options
| author | Federico Ravasio <ravasio.federico@gmail.com> | 2013-01-20 14:11:09 +0100 |
|---|---|---|
| committer | Federico Ravasio <ravasio.federico@gmail.com> | 2013-01-20 14:11:09 +0100 |
| commit | b2d0e25c2bbc546c3ba6e8c6e8ee10798eca1d9a (patch) | |
| tree | 41caf27d69a0f970c07cd653ce46f0bd43d9a072 | |
| parent | 5fd3c039d465ed5e658d68fbdf064f9eb67e4c70 (diff) | |
| download | gitlab-ci-b2d0e25c2bbc546c3ba6e8c6e8ee10798eca1d9a.tar.gz | |
Added postgresql support.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | config/database.yml.postgresql | 37 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
5 files changed, 44 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c2a12a3..218dbd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ env: - DB=mysql + - DB=postgresql branches: only: - 'master' @@ -7,6 +8,7 @@ rvm: - 1.9.3 services: - mysql + - postgresql before_script: - "cp config/database.yml.$DB config/database.yml" - "bundle exec rake db:create" @@ -11,7 +11,8 @@ end gem 'rails', '3.2.8' # DB -gem 'mysql2' +gem 'mysql2', group: :mysql +gem 'pg', group: :postgres # Settings gem 'settingslogic' diff --git a/Gemfile.lock b/Gemfile.lock index 24c175d..3d51beb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,6 +116,7 @@ GEM mysql2 (0.3.11) nokogiri (1.5.5) orm_adapter (0.4.0) + pg (0.14.1) polyglot (0.3.3) posix-spawn (0.3.6) pry (0.9.10) @@ -255,6 +256,7 @@ DEPENDENCIES haml-rails jquery-rails mysql2 + pg pry quiet_assets rails (= 3.2.8) diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql new file mode 100644 index 0000000..45f1e71 --- /dev/null +++ b/config/database.yml.postgresql @@ -0,0 +1,37 @@ +# +# PRODUCTION +# +production: + adapter: postgresql + encoding: unicode + database: gitlab_ci_production + pool: 5 + username: postgres + password: + # host: localhost + # port: 5432 + # socket: /tmp/postgresql.sock + +# +# Development specific +# +development: + adapter: postgresql + encoding: unicode + database: gitlab_ci_development + pool: 5 + username: postgres + password: + # socket: /tmp/postgresql.sock + +# 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: postgresql + encoding: unicode + database: gitlab_ci_test + pool: 5 + username: postgres + password: + # socket: /tmp/postgresql.sock diff --git a/db/schema.rb b/db/schema.rb index d6232ec..7a44930 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -18,7 +18,7 @@ ActiveRecord::Schema.define(:version => 20130114153451) do t.string "ref" t.string "status" t.datetime "finished_at" - t.text "trace", :limit => 2147483647 + t.text "trace" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.string "sha" |