change from deploy to base

Author: anonychun

railties/lib/rails/generators/database.rb

@@ -27,22 +27,22 @@ def gem_for_database(database = options[:database])
         end
       end
 
-      def docker_for_database_build(database = options[:database])
+      def docker_for_database_base(database = options[:database])
         case database
-        when "mysql"          then "build-essential default-libmysqlclient-dev git"
-        when "trilogy"        then "build-essential git"
-        when "postgresql"     then "build-essential git libpq-dev"
-        when "sqlite3"        then "build-essential git"
+        when "mysql"          then "curl default-mysql-client libvips"
+        when "trilogy"        then "curl libvips"
+        when "postgresql"     then "curl libvips postgresql-client"
+        when "sqlite3"        then "curl libsqlite3-0 libvips"
         else nil
         end
       end
 
-      def docker_for_database_deploy(database = options[:database])
+      def docker_for_database_build(database = options[:database])
         case database
-        when "mysql"          then "curl default-mysql-client libvips"
-        when "trilogy"        then "curl libvips"
-        when "postgresql"     then "curl libvips postgresql-client"
-        when "sqlite3"        then "curl libsqlite3-0 libvips"
+        when "mysql"          then "build-essential default-libmysqlclient-dev git"
+        when "trilogy"        then "build-essential git"
+        when "postgresql"     then "build-essential git libpq-dev"
+        when "sqlite3"        then "build-essential git"
         else nil
         end
       end
@@ -59,19 +59,19 @@ def convert_database_option_for_jruby
         end
       end
 
-      def build_package_for_database(database = options[:database])
+      def base_package_for_database(database = options[:database])
         case database
-        when "mysql" then "default-libmysqlclient-dev"
-        when "postgresql" then "libpq-dev"
+        when "mysql" then "default-mysql-client"
+        when "postgresql" then "postgresql-client"
+        when "sqlite3" then "libsqlite3-0"
         else nil
         end
       end
 
-      def base_package_for_database(database = options[:database])
+      def build_package_for_database(database = options[:database])
         case database
-        when "mysql" then "default-mysql-client"
-        when "postgresql" then "postgresql-client"
-        when "sqlite3" then "libsqlite3-0"
+        when "mysql" then "default-libmysqlclient-dev"
+        when "postgresql" then "libpq-dev"
         else nil
         end
       end

railties/lib/rails/generators/rails/db/system/change/change_generator.rb

@@ -44,40 +44,40 @@ def edit_dockerfile
             dockerfile_path = File.expand_path("Dockerfile", destination_root)
             return unless File.exist?(dockerfile_path)
 
+            base_name = docker_for_database_base
             build_name = docker_for_database_build
-            deploy_name = docker_for_database_deploy
+            if base_name
+              gsub_file("Dockerfile", all_docker_bases_regex, base_name)
+            end
             if build_name
               gsub_file("Dockerfile", all_docker_builds_regex, build_name)
             end
-            if deploy_name
-              gsub_file("Dockerfile", all_docker_deploys_regex, deploy_name)
-            end
           end
 
           private
             def all_database_gems
               DATABASES.map { |database| gem_for_database(database) }
             end
 
-            def all_docker_builds
-              DATABASES.map { |database| docker_for_database_build(database).nil? ? nil : docker_for_database_build(database) }.compact!
+            def all_docker_bases
+              DATABASES.map { |database| docker_for_database_base(database).nil? ? nil : docker_for_database_base(database) }.compact!
             end
 
-            def all_docker_deploys
-              DATABASES.map { |database| docker_for_database_deploy(database).nil? ? nil : docker_for_database_deploy(database) }.compact!
+            def all_docker_builds
+              DATABASES.map { |database| docker_for_database_build(database).nil? ? nil : docker_for_database_build(database) }.compact!
             end
 
             def all_database_gems_regex
               all_database_gem_names = all_database_gems.map(&:first)
               /(\b#{all_database_gem_names.join('\b|\b')}\b)/
             end
 
-            def all_docker_builds_regex
-              /(\b#{all_docker_builds.join('\b|\b')}\b)/
+            def all_docker_bases_regex
+              /(\b#{all_docker_bases.join('\b|\b')}\b)/
             end
 
-            def all_docker_deploys_regex
-              /(\b#{all_docker_deploys.join('\b|\b')}\b)/
+            def all_docker_builds_regex
+              /(\b#{all_docker_builds.join('\b|\b')}\b)/
             end
 
             def gem_entry_regex_for(gem_name)

railties/test/generators/db_system_change_generator_test.rb

@@ -85,7 +85,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
             end
 
             assert_file("Dockerfile") do |content|
-              assert_match "build-essential git libvips", content
+              assert_match "build-essential git", content
               assert_match "curl libsqlite3-0 libvips", content
             end
           end