fast_schema_dumper 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 318d9557a32b7d943e100a40a1a707842f0f1e7cc9465b95f5294c3e495dd5e3
-  data.tar.gz: 6fa2494751fe0027a52abeac9e7cdb66dcce881139c855a074eb0cf90e8f11c0
+  metadata.gz: e66bdcea2398d20e0a2957851af140da62488eb5c4993e65131ea186d5ad9df6
+  data.tar.gz: d70566eea36f7e7dde2ac0b7aaf339e6353e642d82883d4497eedf73a91470be
 SHA512:
-  metadata.gz: 3fa88e9595021d89571795e8b9c0ce2cdb17f3fed68a3e357cb5572ec1e710f1b29f2c6235942d583a13f2946abb1998544edd18b0ec544587a7b7f3d4f12b7d
-  data.tar.gz: 935ab57a56740cd0f0fb75b650cae3f258e6e583da5a05e4af357eef6724530c1750b4205fa4e80b9a6bca416ff2e13f4f5738a183341d503d05fcb55a3164ad
+  metadata.gz: 670c4795780e2ab759a9064030432b2e97d7e5ae5031988b8197b427bf03b011d4c9aa028dc7354233b9af6b213ba651339135874202f71c83152fcdb6a11678
+  data.tar.gz: e382f5cab4f77f165b200891d85ecf9642c0aabbe9601d5260e3eb373ba26bb9c6b850dcaa1536dcdfbdfb88c273d321938e1003f9f5a8dd11a49e2a81b51252

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [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)
+
 ## [0.5.2] - 2026-04-15
 
 - Fix generated column dump order to match ActiveRecord::SchemaDumper. [#32](https://github.com/smartbank-inc/fast_schema_dumper/pull/32)

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
       #
@@ -386,6 +402,11 @@ module FastSchemaDumper
         col_def += ", limit: 3"
       end
 
+      # limit (binary, varbinary)
+      if ['binary', 'varbinary'].include?(column['DATA_TYPE']) && column['CHARACTER_MAXIMUM_LENGTH']
+        col_def += ", limit: #{column['CHARACTER_MAXIMUM_LENGTH']}"
+      end
+
       # size (text)
       if column['DATA_TYPE'] == 'mediumtext'
         col_def += ", size: :medium"
@@ -520,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
@@ -558,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.2"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_schema_dumper
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Daisuke Aritomo