Pin postgres gem

fatfreecrm · Jan 18, 2018 · ddebe74 · ddebe74
1 parent 0581173
commit ddebe74
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,13 +4,17 @@ source 'https://rubygems.org'
 
 # Uncomment the database that you have configured in config/database.yml
 # ----------------------------------------------------------------------
-db_drivers = {
-  "mysql" => "mysql2",
-  "sqlite" => "sqlite3",
-  "postgres" => "pg"
-}
 
-gem db_drivers[ENV['CI'] && ENV['DB']] || 'pg'
+case ENV['CI'] && ENV['DB']
+when 'sqlite'
+  gem 'sqlite3'
+when 'mysql'
+  gem 'mysql2'
+when 'postgres'
+  gem 'pg', '~> 0.21.0' # Pinned, see https://github.com/fatfreecrm/fat_free_crm/pull/689
+else
+  gem 'pg', '~> 0.21.0'
+end
 
 # Removes a gem dependency
 def remove(name)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -216,7 +216,7 @@ GEM
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
-    pg (1.0.0)
+    pg (0.21.0)
     polyamorous (1.3.2)
       activerecord (>= 3.0)
     powerpack (0.1.1)
@@ -435,7 +435,7 @@ DEPENDENCIES
   nokogiri (>= 1.8.1)
   paper_trail (~> 6.0.0)
   paperclip
-  pg
+  pg (~> 0.21.0)
   premailer
   pry-rails
   puma
@@ -471,6 +471,5 @@ DEPENDENCIES
   will_paginate
   zeus
 
-
 BUNDLED WITH
-   1.16.0
+   1.16.1