fast_schema_dumper 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3a6108bbb29f59b67eac0c9e06b9e67824e926802366cedf34138fe7fea734
-  data.tar.gz: 2c0e7a71656edb9832b024c97094ef0971c5a9ceb836f44225933f85d1821e82
+  metadata.gz: 82c764033800133b7c3d6eb20f337a2fd500edfe7444e8e3a9cc19d652fa1cc1
+  data.tar.gz: 57404fe3266a39b3c09858e38fa67930fee4a19f8d42d9b2cf98a78ff0918603
 SHA512:
-  metadata.gz: d4cf177c3a6e7dfa18bbf2018b28555beff7d58fbb2781f3a589850d9deaeb5203577aed31612098e15c5ed79240e3deb9f1de4b5ebbac5b992148f7b96c98d5
-  data.tar.gz: 40779b25d4c21165b35af9cdb40900b40f4ad3bb1968d9fc85cc30ec50e4b78eb0b84254cd6e74bc5a504d78e257d33b0659a60aa6d92ebe977c219a55329225
+  metadata.gz: 737815e4794bc7edcb644f87eb572d7166eb49f37a57fe5e3b7b3bd82999aa9291491321afcafc98a67fd46aed222b859a807849e5a27986c0f1a7f20dba4f36
+  data.tar.gz: 1057a10843c1ab556dcdfe570a9798b8630b7ea8aab965658773802ff8d12fce00ab8849402bbc017c51dcedcfbe4d412bcee8a782c938394c1d5bba31b9cf68

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.5.5] - 2026-11-06
+
+- Require Active Record 7.2 or later. [#57](https://github.com/smartbank-inc/fast_schema_dumper/pull/57)
+- Test against Active Record 7.2, 8.0 and 8.1 in CI. [#57](https://github.com/smartbank-inc/fast_schema_dumper/pull/57)
+- Fix column option order to dump `collation` before `comment`, matching
+  `ActiveRecord::SchemaDumper` output. [#65](https://github.com/smartbank-inc/fast_schema_dumper/pull/65)
+
+## [0.5.4] - 2026-08-04
+
+- Support MySQL functional indexes (e.g. `INDEX ((LOWER(name)))`). Indexes
+  containing expression parts are now dumped as a single string column, matching
+  `ActiveRecord::SchemaDumper` output. Requires MySQL 8.0.13+; older versions
+  fall back to the previous behavior. [#55](https://github.com/smartbank-inc/fast_schema_dumper/pull/55)
+- Index lines are now sorted by the formatted statement string, matching
+  `ActiveRecord::SchemaDumper` ordering exactly. [#55](https://github.com/smartbank-inc/fast_schema_dumper/pull/55)
+
 ## [0.5.3] - 2026-05-18
 
 - Add limit handling for binary/varbinary columns in format_column. [#39](https://github.com/smartbank-inc/fast_schema_dumper/pull/39)

data/lib/fast_schema_dumper/fast_dumper.rb

@@ -49,6 +49,16 @@ module FastSchemaDumper
     ")
 
       # Get all indexes
+      # INFORMATION_SCHEMA.STATISTICS.EXPRESSION exists only in MySQL 8.0.13+
+      result = conn.exec_query("
+      SELECT COUNT(*) as count
+      FROM INFORMATION_SCHEMA.COLUMNS
+      WHERE TABLE_SCHEMA = 'information_schema'
+        AND TABLE_NAME = 'STATISTICS'
+        AND COLUMN_NAME = 'EXPRESSION'
+    ")
+      expression_column = (result.first['count'] > 0) ? "s.EXPRESSION," : ""
+
       indexes_data = conn.exec_query("
       SELECT
         s.TABLE_NAME,
@@ -56,6 +66,8 @@ module FastSchemaDumper
         s.NON_UNIQUE,
         s.COLUMN_NAME,
         s.SEQ_IN_INDEX,
+        s.SUB_PART,
+        #{expression_column}
         s.INDEX_COMMENT,
         s.COLLATION
       FROM INFORMATION_SCHEMA.STATISTICS s
@@ -69,6 +81,7 @@ module FastSchemaDumper
         hash[idx['TABLE_NAME']] ||= {}
         hash[idx['TABLE_NAME']][idx['INDEX_NAME']] ||= {
           columns: [],
+          parts: [],
           unique: idx['NON_UNIQUE'] == 0,
           # length
           orders: {},
@@ -81,10 +94,22 @@ module FastSchemaDumper
           comment: idx['INDEX_COMMENT']
           # enabled
         }
-        hash[idx['TABLE_NAME']][idx['INDEX_NAME']][:columns] << idx['COLUMN_NAME']
-        # Track descending order columns (COLLATION = 'D')
-        if idx['COLLATION'] == 'D'
-          hash[idx['TABLE_NAME']][idx['INDEX_NAME']][:orders][idx['COLUMN_NAME']] = :desc
+        index = hash[idx['TABLE_NAME']][idx['INDEX_NAME']]
+        desc = idx['COLLATION'] == 'D'
+
+        # Functional index parts (MySQL 8.0.13+) have COLUMN_NAME = NULL and the
+        # expression in EXPRESSION
+        if idx['EXPRESSION']
+          index[:parts] << {expression: idx['EXPRESSION'], desc:}
+        else
+          # :columns/:orders are for expression-free indexes.
+          index[:columns] << idx['COLUMN_NAME']
+          # Track descending order columns (COLLATION = 'D')
+          index[:orders][idx['COLUMN_NAME']] = :desc if desc
+
+          # Also keep the part in :parts so mixed indexes like
+          # ((MONTH(starts_at)) DESC, name) can be rebuilt from :parts alone.
+          index[:parts] << {column: idx['COLUMN_NAME'], sub_part: idx['SUB_PART'], desc:}
         end
       end
 
@@ -314,21 +339,12 @@ module FastSchemaDumper
       end
 
       # Indexes
-      # Rails orders indexes lexicographically by their column arrays
-      # Example: ["a", "b"] < ["a"] < ["b", "c"] < ["b"] < ["d"]
-      sorted_indexes = indexes.except('PRIMARY').sort_by do |index_name, index_data|
-        # Create an array padded with high values for comparison
-        # This ensures that missing columns sort after existing ones
-        max_cols = indexes.values.map { |data| data[:columns].size }.max || 1
-        cols = index_data[:columns].dup
-        # Pad with a string that sorts after any real column name
-        cols += ["\xFF" * 100] * (max_cols - cols.size)
-        cols
-      end
-
-      sorted_indexes.each do |index_name, index_data|
-        @output << "  #{format_index(index_name, index_data)}"
+      # Rails sorts the formatted index statements as strings
+      # ref: activerecord: lib/active_record/schema_dumper.rb#indexes_in_create
+      index_lines = indexes.except('PRIMARY').map do |index_name, index_data|
+        "  #{format_index(index_name, index_data)}"
       end
+      @output.concat(index_lines.sort)
 
       # Respect the CHECK constraint
       #
@@ -419,6 +435,15 @@ module FastSchemaDumper
       # null
       col_def += ", null: false" if column['IS_NULLABLE'] == 'NO'
 
+      # collation
+      if column['COLLATION_NAME'] && column['DATA_TYPE'] =~ /char|text/
+        # Check if it's different from the table's default collation
+        # For now, just check if it's utf8mb4_bin which seems to be the special case
+        if column['COLLATION_NAME'] == 'utf8mb4_bin'
+          col_def += ", collation: \"#{column['COLLATION_NAME']}\""
+        end
+      end
+
       # comment
       if column['COLUMN_COMMENT'] && !column['COLUMN_COMMENT'].empty?
         col_def += ", comment: \"#{escape_string(column['COLUMN_COMMENT'])}\""
@@ -429,15 +454,6 @@ module FastSchemaDumper
         col_def += ", unsigned: true"
       end
 
-      # collation
-      if column['COLLATION_NAME'] && column['DATA_TYPE'] =~ /char|text/
-        # Check if it's different from the table's default collation
-        # For now, just check if it's utf8mb4_bin which seems to be the special case
-        if column['COLLATION_NAME'] == 'utf8mb4_bin'
-          col_def += ", collation: \"#{column['COLLATION_NAME']}\""
-        end
-      end
-
       col_def
     end
 
@@ -525,6 +541,11 @@ module FastSchemaDumper
     end
 
     def format_index(index_name, index_data)
+      parts = index_data[:parts] || []
+      if parts.any? { |part| part[:expression] }
+        return format_expression_index(index_name, index_data)
+      end
+
       idx_def = "t.index "
 
       idx_def += if index_data[:columns].size == 1
@@ -563,6 +584,37 @@ module FastSchemaDumper
       idx_def
     end
 
+    # Rails dumps indexes containing expression parts with a single string
+    # instead of a column name array. DESC and prefix lengths are inlined
+    # into the string, so no order:/length: options are emitted.
+    # ref: activerecord: lib/active_record/connection_adapters/mysql/schema_statements.rb#indexes
+    def format_expression_index(index_name, index_data)
+      columns_string = index_data[:parts].map { |part| format_index_part(part) }.join(", ")
+
+      idx_def = "t.index #{columns_string.inspect}"
+      idx_def += ", name: \"#{index_name}\""
+      idx_def += ", unique: true" if index_data[:unique]
+
+      if index_data[:comment] && !index_data[:comment].empty?
+        idx_def += ", comment: \"#{escape_string(index_data[:comment])}\""
+      end
+
+      idx_def
+    end
+
+    def format_index_part(part)
+      str = if part[:expression]
+        expression = part[:expression].gsub("\\'", "'")
+        expression.start_with?("(") ? expression : "(#{expression})"
+      else
+        quoted = "`#{part[:column].gsub("`", "``")}`"
+        quoted += "(#{part[:sub_part]})" if part[:sub_part]
+        quoted
+      end
+      str += " DESC" if part[:desc]
+      str
+    end
+
     def balanced_parentheses?(str)
       depth = 0
       str.each_char do |char|

data/lib/fast_schema_dumper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastSchemaDumper
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_schema_dumper
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Daisuke Aritomo
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement