online_migrations 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2515b6dd51e983fbcbdb448d33273e77d5b7f30ef53bc42dacb5127ac390fc8
-  data.tar.gz: b099a129bfea91da13d1dbde5c08d18fb09ae195dd83b56495c5513a881f609f
+  metadata.gz: 5f0ae9026f83b836b520090730426b5cf93fe18e193f21ea28cd11b96ebb78a8
+  data.tar.gz: 939595b3b732d6351fbab4403f0271e47a2c42b770a9732e30cdc0f52479ce7b
 SHA512:
-  metadata.gz: '0220675939d3a08c0ecb16ba3e4a212bb40106d34478b7008c2458d2eebbead2c897873634589a6ae55b0665fdf0a02fb691432c639198c7c3a59e378c10d023'
-  data.tar.gz: b3d9a76edb0f4e220790a7de2a2ba5f7930c9106599dd488f585f4003ae61166341feccd66cbc63965b5a181217fe5639eb17e836be48542b0070591c74b8ab6
+  metadata.gz: d09f3b4a3592cada77cf27e152669d6c94e5bd15e3c2930aa18c6ca6de6cd3c0e588314e95cd7cb058e43fea22343c8529ed7c2a11ec60d247ce6479bce58374
+  data.tar.gz: 42185f369b8adb87c10c2e0cfb29891784d3b55bd0c41cc3b92804fb0d8f71d9b70f4349b26a5752ff1f6b9d8ebbdbc061667157d6b1023190907104f71e93b1

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 ## master (unreleased)
 
+## 0.5.2 (2022-10-04)
+
+- Fix sequence resetting in tests that use fixtures
+
+- Fix `update_column_in_batches` for SQL subquery values
+
+    It generated inefficient queries before, e.g.:
+
+    ```ruby
+    update_column_in_batches(:users, :comments_count, Arel.sql(<<~SQL))
+      (select count(*) from comments where comments.user_id = users.id)
+    SQL
+    ```
+
+    Generated SQL queries before:
+    ```sql
+    update users
+    set comments_count = (..count subquery..)
+    where comments_count is null or comments_count != (..count subquery..)
+    ```
+
+    Generated SQL queries now:
+    ```sql
+    update users set comments_count = (..count subquery..)
+    ```
+
+- Fix check for `add_column` with `default: nil` for PostgreSQL < 11
+- Replacing a unique index when other unique index with the prefix of columns exists is safe
+
+## 0.5.1 (2022-07-19)
+
+- Raise for possible index corruption in all environments (previously, the check was made only
+  in the production environment)
+
 ## 0.5.0 (2022-06-23)
 
 - Added check for index corruption with PostgreSQL 14.0 to 14.3

data/lib/generators/online_migrations/install_generator.rb

@@ -10,21 +10,21 @@ module OnlineMigrations
 
     source_root File.expand_path("templates", __dir__)
 
-    def create_migration_file
-      migration_template("migration.rb", File.join(migrations_dir, "install_online_migrations.rb"))
-    end
-
     def copy_initializer_file
       template("initializer.rb", "config/initializers/online_migrations.rb")
     end
 
+    def create_migration_file
+      migration_template("migration.rb", File.join(migrations_dir, "install_online_migrations.rb"))
+    end
+
     private
       def migration_parent
         Utils.migration_parent_string
       end
 
       def start_after
-        self.class.next_migration_number(migrations_dir)
+        self.class.current_migration_number(migrations_dir)
       end
 
       def migrations_dir

data/lib/generators/online_migrations/templates/initializer.rb.tt

@@ -59,11 +59,11 @@ OnlineMigrations.configure do |config|
 
   # Add custom checks. Use the `stop!` method to stop migrations.
   #
-  #   config.add_check do |method, args|
-  #     if method == :add_column && args[0].to_s == "users"
-  #       stop!("No more columns on the users table")
-  #     end
+  # config.add_check do |method, args|
+  #   if method == :add_column && args[0].to_s == "users"
+  #     stop!("No more columns on the users table")
   #   end
+  # end
 
   # ==> Background migrations configuration
   # The number of rows to process in a single background migration run.

data/lib/online_migrations/change_column_type_helpers.rb

@@ -100,7 +100,7 @@ module OnlineMigrations
       end.to_h
 
       if (extra_keys = (options.keys - conversions.keys)).any?
-        raise ArgumentError, "Options has unknown keys: #{extra_keys.map(&:inspect).join(', ')}. "\
+        raise ArgumentError, "Options has unknown keys: #{extra_keys.map(&:inspect).join(', ')}. " \
                              "Can contain only column names: #{conversions.keys.map(&:inspect).join(', ')}."
       end
 
@@ -400,7 +400,7 @@ module OnlineMigrations
 
           # This is necessary as we can't properly rename indexes such as "taggings_idx".
           unless index.name.include?(from_column)
-            raise "The index #{index.name} can not be copied as it does not "\
+            raise "The index #{index.name} can not be copied as it does not " \
                   "mention the old column. You have to rename this index manually first."
           end
 

data/lib/online_migrations/command_checker.rb

@@ -174,8 +174,8 @@ module OnlineMigrations
       def add_column(table_name, column_name, type, **options)
         default = options[:default]
         volatile_default = false
-        if !new_or_small_table?(table_name) && !default.nil? &&
-           (postgresql_version < Gem::Version.new("11") || (volatile_default = Utils.volatile_default?(connection, type, default)))
+        if !new_or_small_table?(table_name) && options.key?(:default) &&
+           (postgresql_version < Gem::Version.new("11") || (!default.nil? && (volatile_default = Utils.volatile_default?(connection, type, default))))
 
           raise_error :add_column_with_default,
             code: command_str(:add_column_with_default, table_name, column_name, type, options),
@@ -478,9 +478,17 @@ module OnlineMigrations
             command: command_str(:remove_index, table_name, **options.merge(algorithm: :concurrently))
         end
 
-        if options[:column] || options[:name]
-          options[:column] ||= connection.indexes(table_name).find { |index| index.name == options[:name].to_s }
-          @removed_indexes << IndexDefinition.new(table: table_name, columns: options.delete(:column), **options)
+        index_def = connection.indexes(table_name).find do |index|
+          index.name == options[:name].to_s ||
+            Array(index.columns).map(&:to_s) == Array(options[:column]).map(&:to_s)
+        end
+
+        if index_def
+          existing_options = [:name, :columns, :unique, :where, :type, :using, :opclasses].map do |option|
+            [option, index_def.public_send(option)] if index_def.respond_to?(option)
+          end.compact.to_h
+
+          @removed_indexes << IndexDefinition.new(table: table_name, **existing_options)
         end
       end
 
@@ -597,15 +605,14 @@ module OnlineMigrations
           if Utils.developer_env? && (target_version = OnlineMigrations.config.target_version)
             target_version.to_s
           else
-            # For rails 6.0+ we can use connection.database_version
-            pg_connection = connection.raw_connection
-            database_version = pg_connection.server_version
-            patch = database_version % 100
-            database_version /= 100
-            minor = database_version % 100
-            database_version /= 100
-            major = database_version
-            "#{major}.#{minor}.#{patch}"
+            database_version = connection.select_value("SHOW server_version_num").to_i
+            major = database_version / 10000
+            if database_version >= 100000
+              minor = database_version % 10000
+            else
+              minor = (database_version % 10000) / 100
+            end
+            "#{major}.#{minor}"
           end
 
         Gem::Version.new(version)
@@ -745,8 +752,7 @@ module OnlineMigrations
 
       def index_corruption?
         postgresql_version >= Gem::Version.new("14.0") &&
-          postgresql_version < Gem::Version.new("14.4") &&
-          !Utils.developer_env?
+          postgresql_version < Gem::Version.new("14.4")
       end
 
       def run_custom_checks(method, args)

data/lib/online_migrations/index_definition.rb

@@ -30,10 +30,7 @@ module OnlineMigrations
       return false if where != other.where
       return false if other.respond_to?(:opclasses) && opclasses != other.opclasses
 
-      case [unique, other.unique]
-      when [true, true]
-        columns == other.columns
-      when [true, false]
+      if unique && !other.unique
         false
       else
         prefix?(self, other)

data/lib/online_migrations/schema_cache.rb

@@ -69,8 +69,9 @@ module OnlineMigrations
       def renamed_tables
         @renamed_tables ||= begin
           table_renames = OnlineMigrations.config.table_renames
+          views = connection.views
           table_renames.select do |old_name, _|
-            connection.views.include?(old_name)
+            views.include?(old_name)
           end
         end
       end
@@ -78,8 +79,9 @@ module OnlineMigrations
       def renamed_columns
         @renamed_columns ||= begin
           column_renames = OnlineMigrations.config.column_renames
+          views = connection.views
           column_renames.select do |table_name, _|
-            connection.views.include?(table_name)
+            views.include?(table_name)
           end
         end
       end

data/lib/online_migrations/schema_statements.rb

@@ -85,9 +85,13 @@ module OnlineMigrations
 
       conditions = columns_and_values.map do |(column_name, value)|
         value = Arel.sql(value.call.to_s) if value.is_a?(Proc)
-        arel_column = model.arel_table[column_name]
-        arel_column.not_eq(value).or(arel_column.eq(nil))
-      end
+
+        # Ignore subqueries in conditions
+        unless value.is_a?(Arel::Nodes::SqlLiteral) && value.to_s =~ /select\s+/i
+          arel_column = model.arel_table[column_name]
+          arel_column.not_eq(value).or(arel_column.eq(nil))
+        end
+      end.compact
 
       batch_relation = model.where(conditions.inject(:and))
       batch_relation = yield batch_relation if block_given?
@@ -404,7 +408,7 @@ module OnlineMigrations
         batch_options = options.extract!(:batch_size, :batch_column_name, :progress, :pause_ms)
 
         if column_exists?(table_name, column_name)
-          Utils.say("Column was not created because it already exists (this may be due to an aborted migration "\
+          Utils.say("Column was not created because it already exists (this may be due to an aborted migration " \
                     "or similar) table_name: #{table_name}, column_name: #{column_name}")
         else
           transaction do
@@ -655,7 +659,7 @@ module OnlineMigrations
         schema = __schema_for_table(table_name)
 
         if __index_valid?(index_name, schema: schema)
-          Utils.say("Index was not created because it already exists (this may be due to an aborted migration "\
+          Utils.say("Index was not created because it already exists (this may be due to an aborted migration " \
                     "or similar): table_name: #{table_name}, column_name: #{column_name}")
           return
         else
@@ -699,7 +703,7 @@ module OnlineMigrations
           end
         end
       else
-        Utils.say("Index was not removed because it does not exist (this may be due to an aborted migration "\
+        Utils.say("Index was not removed because it does not exist (this may be due to an aborted migration " \
                   "or similar): table_name: #{table_name}, column_name: #{column_names}")
       end
     end
@@ -768,7 +772,7 @@ module OnlineMigrations
       constraint_name = __check_constraint_name(table_name, expression: expression, **options)
 
       if __check_constraint_exists?(table_name, constraint_name)
-        Utils.say("Check constraint was not created because it already exists (this may be due to an aborted migration "\
+        Utils.say("Check constraint was not created because it already exists (this may be due to an aborted migration " \
                   "or similar) table_name: #{table_name}, expression: #{expression}, constraint name: #{constraint_name}")
       else
         query = "ALTER TABLE #{table_name} ADD CONSTRAINT #{constraint_name} CHECK (#{expression})"
@@ -820,6 +824,29 @@ module OnlineMigrations
       end
     end
 
+    # @private
+    def pk_and_sequence_for(table)
+      views = self.views
+
+      table_renames = OnlineMigrations.config.table_renames
+      renamed_tables = table_renames.select do |old_name, _|
+        views.include?(old_name)
+      end
+
+      column_renames = OnlineMigrations.config.column_renames
+      renamed_columns = column_renames.select do |table_name, _|
+        views.include?(table_name)
+      end
+
+      if renamed_tables.key?(table)
+        super(renamed_tables[table])
+      elsif renamed_columns.key?(table)
+        super("#{table}_column_rename")
+      else
+        super
+      end
+    end
+
     # Disables statement timeout while executing &block
     #
     # Long-running migrations may take more than the timeout allowed by the database.

data/lib/online_migrations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnlineMigrations
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: online_migrations
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - fatkodima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord