Skip to content

Commit

Permalink
Move to psql
Browse files Browse the repository at this point in the history
  • Loading branch information
stijndcl committed May 6, 2024
1 parent 9d2d719 commit b5cda56
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ ruby "3.1.2"
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.0.3", ">= 7.0.3.1"

# Use mysql as the database for Active Record
gem "mysql2", "~> 0.5", "> 0.5.5"
# Use Postgres as the database for Active Record
gem "pg", "~> 1.5.6"

# Use the Puma web server [https://github.com/puma/puma]
gem "puma", "~> 5.0"
Expand Down
6 changes: 5 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,10 @@ GEM
minitest (5.18.0)
msgpack (1.5.6)
multi_json (1.15.0)
<<<<<<< HEAD
mysql2 (0.5.6)
=======
>>>>>>> b4f1356 (Move to psql)
net-imap (0.2.3)
digest
net-protocol
Expand Down Expand Up @@ -150,6 +153,7 @@ GEM
parallel (1.22.1)
parser (3.1.2.1)
ast (~> 2.4.1)
pg (1.5.6)
public_suffix (5.0.0)
puma (5.6.5)
nio4r (~> 2.0)
Expand Down Expand Up @@ -253,9 +257,9 @@ DEPENDENCIES
debug
jbuilder
multi_json (~> 1.15.0)
mysql2 (~> 0.5, > 0.5.5)
octokit (~> 5.4)
oj (~> 3.13)
pg (~> 1.5.6)
puma (~> 5.0)
rails (~> 7.0.3, >= 7.0.3.1)
rails-controller-testing (~> 1.0)
Expand Down
11 changes: 6 additions & 5 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
default: &default
adapter: mysql2
adapter: postgresql
username: root
password: unipept
password: root
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

development:
<<: *default
username: unipept
database: unipept
username: root
database: postgres
# setup local port forwarding for this to work
host: 127.0.0.1
port: 3306
port: 5432
schema_search_path: "unipept"

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
Expand Down

0 comments on commit b5cda56

Please sign in to comment.