fx 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c58b9ff49b98b110220c15bb8e017038a237e2583b86a771a4fdad267fed316d
-  data.tar.gz: 4309eea32302e5828871134973269edeb532da5aa817639e4b8b9b466a7d8f1f
+  metadata.gz: a1b25361cfa43280f81e493a4eb518864862dad321878048282ce8f9daad6e1a
+  data.tar.gz: ce20ce6b1bb9031b420e78b83ecf23416d50ca44668cf15e0951142e32a0c75e
 SHA512:
-  metadata.gz: '09a4bc41360e92347b92bc9a3cadf3acd04cef9a87baaf549504c6667bf621053c0a156f00aea267b61505e1d14abee4993a1ce9b4acddea0a22c7bd926672fa'
-  data.tar.gz: 72883cf8649ac59df101613905842ac034ae8ecf5f7533474185ee15bda83e3e27c3373f790dbabd9209b06ec969ba7119aa2ea94590858a11cb9269d0c97b93
+  metadata.gz: 2e8d5db85fb283586a9d713cdffb6fc50604e85498eeb2c16ac8f63708fabe01a29e03b4157b32f84fe061d4bedb996f4e44db90f5d53d2b655c730352c7c101
+  data.tar.gz: 70e6670c67e267f383fa7ed3001350fa3c6548d4bf6183625ee10bf1a5c53cfa5c87cbd9bf231b196524f206d96bf638ba16f6b9020f20803f4ae85685fbf44a

data/.github/scripts/check-eol

@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# Check if minimum supported dependency versions are at or approaching EOL.
+# Uses the endoflife.date API. Outputs GitHub Actions annotations and opens
+# an issue when action is needed.
+#
+# Environment:
+#   WARN_DAYS - days before EOL to start warning (default: 90)
+#   GH_TOKEN  - GitHub token for creating issues (optional)
+
+set -e
+
+WARN_DAYS="${WARN_DAYS:-90}"
+
+ruby_min=$(ruby -e "
+  spec = Gem::Specification.load('fx.gemspec')
+  puts spec.required_ruby_version.requirements
+    .select { |op, _| op == '>=' }
+    .map { |_, v| v.segments[0..1].join('.') }
+    .first
+")
+
+rails_min=$(ruby -e "
+  spec = Gem::Specification.load('fx.gemspec')
+  dep = spec.dependencies.find { |d| d.name == 'activerecord' }
+  puts dep.requirement.requirements
+    .select { |op, _| op == '>=' }
+    .map { |_, v| v.segments[0..1].join('.') }
+    .first
+")
+
+postgres_min=$(ruby -ryaml -e "
+  ci = YAML.load_file('.github/workflows/ci.yml')
+  versions = ci.dig('jobs', 'tests', 'strategy', 'matrix', 'postgres')
+  puts versions.map(&:to_i).min
+")
+
+echo "Ruby minimum: $ruby_min"
+echo "Rails minimum: $rails_min"
+echo "PostgreSQL minimum: $postgres_min"
+
+alerts=""
+
+check_eol() {
+  product="$1"
+  version="$2"
+
+  eol_date=$(curl -sf "https://endoflife.date/api/${product}/${version}.json" \
+    | ruby -rjson -e '
+      data = JSON.parse($stdin.read)
+      eol = data["eol"]
+      if eol == true
+        puts "1970-01-01"
+      elsif eol == false
+        exit
+      else
+        puts eol
+      end
+    ') || return 0
+
+  if [ -z "$eol_date" ]; then
+    echo "$product $version: no EOL date set (still supported)"
+    return
+  fi
+
+  today=$(date -u +%Y-%m-%d)
+  warn_date=$(date -u -d "$today + ${WARN_DAYS} days" +%Y-%m-%d 2>/dev/null \
+    || date -u -v+"${WARN_DAYS}"d +%Y-%m-%d)
+
+  if [ "$eol_date" \< "$today" ] || [ "$eol_date" = "$today" ]; then
+    echo "::error::$product $version reached EOL on $eol_date"
+    alerts="$alerts- **$product $version** reached EOL on $eol_date\n"
+  elif [ "$eol_date" \< "$warn_date" ]; then
+    echo "::warning::$product $version reaches EOL on $eol_date (within ${WARN_DAYS} days)"
+    alerts="$alerts- **$product $version** reaches EOL on $eol_date (within ${WARN_DAYS} days)\n"
+  else
+    echo "$product $version: EOL on $eol_date (no action needed)"
+  fi
+}
+
+check_eol "ruby" "$ruby_min"
+check_eol "rails" "$rails_min"
+check_eol "postgresql" "$postgres_min"
+
+if [ -n "$alerts" ]; then
+  title="Dependency EOL alert"
+  body=$(printf "The following minimum supported versions are at or approaching end-of-life:\n\n%b\n\nConsider bumping the minimum version in \`fx.gemspec\` and updating the CI matrix." "$alerts")
+
+  existing=$(gh issue list --state open --search "$title" --json number --jq '.[0].number' 2>/dev/null || true)
+  if [ -n "$existing" ]; then
+    echo "Issue #$existing already open, skipping creation"
+  else
+    gh issue create --title "$title" --body "$body"
+  fi
+fi

data/.github/workflows/ci.yml

@@ -8,18 +8,26 @@ on:
 
 jobs:
   tests:
-    name: Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}
+    name: "ruby ${{ matrix.ruby }} / rails ${{ matrix.rails }} / postgres ${{ matrix.postgres }}"
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.2", "4.0"]
+        ruby: ["3.3", "4.0"]
         rails: ["7.2", "8.1"]
+        postgres: ["14", "18"]
+        include:
+          - ruby: "4.0"
+            rails: "main"
+            postgres: "18"
+            allow-failure: true
+
+    continue-on-error: ${{ matrix.allow-failure || false }}
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres:${{ matrix.postgres }}
         env:
           POSTGRES_USER: postgres
           POSTGRES_HOST_AUTH_METHOD: trust

data/.github/workflows/eol-check.yml

@@ -0,0 +1,30 @@
+name: EOL Check
+
+on:
+  schedule:
+    - cron: "0 9 1 * *" # 1st of each month at 09:00 UTC
+  workflow_dispatch:
+    inputs:
+      warn_days:
+        description: "Days before EOL to start warning"
+        required: false
+        default: "90"
+
+permissions:
+  issues: write
+
+env:
+  WARN_DAYS: ${{ inputs.warn_days || '90' }}
+
+jobs:
+  check:
+    name: Check dependency EOL status
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Check EOL status
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: .github/scripts/check-eol

data/CHANGELOG.md

@@ -5,9 +5,29 @@ changelog, see the [commits] for each version via the version links.
 
 [commits]: https://github.com/teoljungberg/fx/commits/master
 
-## [Unreleased]
+## [0.11.0]
 
-[Unreleased]: https://github.com/teoljungberg/fx/compare/v0.10.1..HEAD
+[0.11.0]: https://github.com/teoljungberg/fx/compare/v0.10.2...v0.11.0
+
+- Drop EOL Ruby 3.2 (#212)
+- Add `Function#signature` for PostgreSQL function identity (#207)
+- Add PostgreSQL versioning policy, officially supporting PostgreSQL 14-18 (#194)
+- Refactor Statements module to use explicit keyword arguments instead of `**options` hash (#186)
+- Internal refactorings / improvements
+  - Add scheduled EOL check for Ruby, Rails, and PostgreSQL (#205)
+  - Add GitHub release creation to release task (#209)
+  - Add PostgreSQL 18 to CI test matrix (#194)
+  - Default `support_drop_function_without_args` to `true` (#194)
+  - Document adapter subclass pattern for custom schema dump ordering (#211)
+  - Remove duplicate command recorder specs (#202)
+
+## [0.10.2]
+
+[0.10.2]: https://github.com/teoljungberg/fx/compare/v0.10.1...v0.10.2
+
+- Remove upper bound on Rails dependency (#198)
+- Internal refactorings / improvements
+  - Add Rails main to CI matrix
 
 ## [0.10.1]
 

data/Gemfile

@@ -4,8 +4,13 @@ rails_version = ENV.fetch("RAILS_VERSION", "8.1")
 
 gemspec
 
-gem "activerecord", "~> #{rails_version}.0"
-gem "railties", "~> #{rails_version}.0"
+if rails_version == "main"
+  gem "activerecord", github: "rails/rails", branch: "main"
+  gem "railties", github: "rails/rails", branch: "main"
+else
+  gem "activerecord", "~> #{rails_version}.0"
+  gem "railties", "~> #{rails_version}.0"
+end
 
 gem "bundler", ">= 1.5"
 gem "pg"

data/README.md

@@ -1,7 +1,6 @@
 # F(x)
 
 [![Build Status](https://github.com/teoljungberg/fx/actions/workflows/ci.yml/badge.svg)](https://github.com/teoljungberg/fx/actions/workflows/ci.yml)
-[![Documentation Quality](http://inch-ci.org/github/teoljungberg/fx.svg?branch=master)](http://inch-ci.org/github/teoljungberg/fx)
 
 F(x) adds methods to `ActiveRecord::Migration` to create and manage database
 functions and triggers in Rails.
@@ -108,6 +107,35 @@ end
 That's how you tell Rails to use the default as a literal SQL for the default
 column value instead of a plain string.
 
+## Customizing Schema Dump Order
+
+By default, functions and triggers are dumped to `schema.rb` in the order
+returned by the database. If you need a specific ordering (e.g., alphabetical
+for deterministic diffs), subclass the adapter and override `#functions` or
+`#triggers`. These methods are part of the adapter's public API and will remain
+stable across releases:
+
+```ruby
+# config/initializers/fx.rb
+class SortedPostgresAdapter < Fx::Adapters::Postgres
+  def functions
+    super.sort_by(&:name)
+  end
+
+  def triggers
+    super.sort_by(&:name)
+  end
+end
+
+Fx.configure do |config|
+  config.database = SortedPostgresAdapter.new
+end
+```
+
+The same approach works for more advanced ordering. For example, if your
+functions depend on each other and need to be dumped in dependency order, you
+could use Ruby's built-in `TSort` to topologically sort them.
+
 ## Plugins/Adapters
 
 - [MySQL](https://github.com/f-mer/fx-adapters-mysql/)
@@ -116,19 +144,22 @@ column value instead of a plain string.
 
 ## Version Support
 
-F(x) follows the maintenance policies of Ruby and Rails, supporting versions
-within their official maintenance windows.
+F(x) follows the maintenance policies of Ruby, Rails, and PostgreSQL, supporting
+versions within their official maintenance windows.
 
-**Ruby:** 3.2+ ([maintenance branches])
+**Ruby:** 3.3+ ([maintenance branches])
 
 **Rails:** 7.2, 8.0, 8.1 ([maintenance policy])
 
-When a Ruby or Rails version reaches end-of-life, support will be dropped in the
-next minor release of F(x). Older versions may continue to work but are not
-tested or guaranteed.
+**PostgreSQL:** 14, 15, 16, 17, 18 ([versioning policy])
+
+When a version reaches end-of-life, support will be dropped in the next minor
+release of F(x). Older versions may continue to work but are not tested or
+guaranteed.
 
 [maintenance branches]: https://www.ruby-lang.org/en/downloads/branches/
 [maintenance policy]: https://rubyonrails.org/maintenance
+[versioning policy]: https://www.postgresql.org/support/versioning/
 
 ## Contributing
 

data/Rakefile

@@ -2,6 +2,15 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "standard/rake"
 
+Rake::Task["release"].enhance do
+  unless system("which gh > /dev/null 2>&1")
+    abort "gh CLI is not installed. Install it to create GitHub releases."
+  end
+
+  tag = "v#{Fx::VERSION}"
+  sh "gh release create #{tag} --verify-tag -t #{tag} --generate-notes"
+end
+
 namespace :dummy do
   require_relative "spec/dummy/config/application"
   Dummy::Application.load_tasks

data/fx.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0")
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 7.2", "< 8.2"
-  spec.add_dependency "railties", ">= 7.2", "< 8.2"
+  spec.add_dependency "activerecord", ">= 7.2"
+  spec.add_dependency "railties", ">= 7.2"
 
-  spec.required_ruby_version = ">= 3.2"
+  spec.required_ruby_version = ">= 3.3"
 end

data/lib/fx/adapters/postgres/connection.rb

@@ -10,25 +10,11 @@ module Fx
       #
       # @api private
       class Connection < SimpleDelegator
-        # PostgreSQL version constants for feature support
-        POSTGRES_VERSIONS = {
-          # PostgreSQL 10.0 - introduced DROP FUNCTION without args
-          # https://www.postgresql.org/docs/10/sql-dropfunction.html
-          v10: 10_00_00
-        }.freeze
-
+        # All supported PostgreSQL versions (14+) support DROP FUNCTION
+        # without argument lists.
+        # https://www.postgresql.org/docs/10/sql-dropfunction.html
         def support_drop_function_without_args
-          server_version >= POSTGRES_VERSIONS[:v10]
-        end
-
-        private
-
-        def server_version
-          undecorated_connection.raw_connection.server_version
-        end
-
-        def undecorated_connection
-          __getobj__
+          true
         end
       end
     end

data/lib/fx/adapters/postgres/functions.rb

@@ -12,7 +12,8 @@ module Fx
         FUNCTIONS_WITH_DEFINITIONS_QUERY = <<~SQL.freeze
           SELECT
               pp.proname AS name,
-              pg_get_functiondef(pp.oid) AS definition
+              pg_get_functiondef(pp.oid) AS definition,
+              pg_get_function_identity_arguments(pp.oid) AS arguments
           FROM pg_proc pp
           JOIN pg_namespace pn
               ON pn.oid = pp.pronamespace

data/lib/fx/adapters/postgres.rb

@@ -125,11 +125,7 @@ module Fx
       #
       # @return [void]
       def drop_function(name)
-        if connection.support_drop_function_without_args
-          execute("DROP FUNCTION #{name};")
-        else
-          execute("DROP FUNCTION #{name}();")
-        end
+        execute("DROP FUNCTION #{name};")
       end
 
       # Drops the trigger from the database

data/lib/fx/command_recorder.rb

@@ -1,17 +1,20 @@
 module Fx
   # @api private
   module CommandRecorder
-    def create_function(*args)
-      record(:create_function, args)
+    def create_function(*args, &block)
+      record(:create_function, args, &block)
     end
+    ruby2_keywords :create_function
 
-    def drop_function(*args)
-      record(:drop_function, args)
+    def drop_function(*args, &block)
+      record(:drop_function, args, &block)
     end
+    ruby2_keywords :drop_function
 
-    def update_function(*args)
-      record(:update_function, args)
+    def update_function(*args, &block)
+      record(:update_function, args, &block)
     end
+    ruby2_keywords :update_function
 
     def invert_create_function(args)
       [:drop_function, args]
@@ -25,17 +28,20 @@ module Fx
       perform_inversion(:update_function, args)
     end
 
-    def create_trigger(*args)
-      record(:create_trigger, args)
+    def create_trigger(*args, &block)
+      record(:create_trigger, args, &block)
     end
+    ruby2_keywords :create_trigger
 
-    def drop_trigger(*args)
-      record(:drop_trigger, args)
+    def drop_trigger(*args, &block)
+      record(:drop_trigger, args, &block)
     end
+    ruby2_keywords :drop_trigger
 
-    def update_trigger(*args)
-      record(:update_trigger, args)
+    def update_trigger(*args, &block)
+      record(:update_trigger, args, &block)
     end
+    ruby2_keywords :update_trigger
 
     def invert_create_trigger(args)
       [:drop_trigger, args]
@@ -51,12 +57,13 @@ module Fx
 
     private
 
+    MESSAGE_IRREVERSIBLE = "`%s` is reversible only if given a `revert_to_version`".freeze
+
     def perform_inversion(method, args)
       arguments = Arguments.new(args)
 
       if arguments.revert_to_version.nil?
-        message = "`#{method}` is reversible only if given a `revert_to_version`"
-        raise ActiveRecord::IrreversibleMigration, message
+        raise ActiveRecord::IrreversibleMigration, format(MESSAGE_IRREVERSIBLE, method)
       end
 
       [method, arguments.invert_version.to_a]
@@ -68,19 +75,19 @@ module Fx
       end
 
       def function
-        args[0]
+        args.fetch(0)
       end
 
       def version
-        options[:version]
+        options.fetch(:version)
       end
 
       def revert_to_version
-        options[:revert_to_version]
+        options.fetch(:revert_to_version, nil)
       end
 
       def invert_version
-        Arguments.new([function, options_for_revert])
+        self.class.new([function, options_for_revert])
       end
 
       def to_a
@@ -92,14 +99,20 @@ module Fx
       attr_reader :args
 
       def options
-        @options ||= args[1] || {}
+        @options ||= args.fetch(1, {}).dup
       end
 
       def options_for_revert
-        options.clone.tap do |revert_options|
+        opts = options.clone.tap do |revert_options|
           revert_options[:version] = revert_to_version
           revert_options.delete(:revert_to_version)
         end
+
+        keyword_hash(opts)
+      end
+
+      def keyword_hash(hash)
+        Hash.ruby2_keywords_hash(hash)
       end
     end
     private_constant :Arguments

data/lib/fx/function.rb

@@ -4,15 +4,27 @@ module Fx
     include Comparable
 
     attr_reader :name, :definition
-    delegate :<=>, to: :name
 
     def initialize(row)
       @name = row.fetch("name")
       @definition = row.fetch("definition")
+      @arguments = row.fetch("arguments", nil)
+    end
+
+    def <=>(other)
+      signature <=> other.signature
     end
 
     def ==(other)
-      name == other.name && definition == other.definition
+      signature == other.signature && definition == other.definition
+    end
+
+    def signature
+      if @arguments.nil?
+        name
+      else
+        "#{name}(#{@arguments})"
+      end
     end
 
     def to_schema

data/lib/fx/statements.rb

@@ -26,10 +26,7 @@ module Fx
     #     $$ LANGUAGE plpgsql;
     #   SQL
     #
-    def create_function(name, options = {})
-      version = options.fetch(:version, 1)
-      sql_definition = options[:sql_definition]
-
+    def create_function(name, version: 1, sql_definition: nil, revert_to_version: nil)
       validate_version_or_sql_definition_present!(version, sql_definition)
       sql_definition = resolve_sql_definition(sql_definition, name, version, :function)
 
@@ -47,7 +44,7 @@ module Fx
     # @example Drop a function, rolling back to version 2 on rollback
     #   drop_function(:uppercase_users_name, revert_to_version: 2)
     #
-    def drop_function(name, options = {})
+    def drop_function(name, revert_to_version: nil)
       Fx.database.drop_function(name)
     end
 
@@ -80,10 +77,7 @@ module Fx
     #     $$ LANGUAGE plpgsql;
     #   SQL
     #
-    def update_function(name, options = {})
-      version = options[:version]
-      sql_definition = options[:sql_definition]
-
+    def update_function(name, version: nil, sql_definition: nil, revert_to_version: nil)
       validate_version_or_sql_definition_present!(version, sql_definition)
 
       sql_definition = resolve_sql_definition(sql_definition, name, version, :function)
@@ -113,10 +107,7 @@ module Fx
     #         EXECUTE FUNCTION uppercase_users_name();
     #    SQL
     #
-    def create_trigger(name, options = {})
-      version = options[:version]
-      sql_definition = options[:sql_definition]
-
+    def create_trigger(name, version: nil, sql_definition: nil, on: nil, revert_to_version: nil)
       validate_version_and_sql_definition_exclusive!(version, sql_definition)
 
       version ||= 1
@@ -139,8 +130,7 @@ module Fx
     # @example Drop a trigger, rolling back to version 3 on rollback
     #   drop_trigger(:log_inserts, on: :users, revert_to_version: 3)
     #
-    def drop_trigger(name, options = {})
-      on = options.fetch(:on)
+    def drop_trigger(name, on:, revert_to_version: nil)
       Fx.database.drop_trigger(name, on: on)
     end
 
@@ -176,18 +166,10 @@ module Fx
     #         EXECUTE FUNCTION uppercase_users_name();
     #    SQL
     #
-    def update_trigger(name, options = {})
-      version = options[:version]
-      on = options[:on]
-      sql_definition = options[:sql_definition]
-
+    def update_trigger(name, on:, version: nil, sql_definition: nil, revert_to_version: nil)
       validate_version_or_sql_definition_present!(version, sql_definition)
       validate_version_and_sql_definition_exclusive!(version, sql_definition)
 
-      if on.nil?
-        raise ArgumentError, "on is required"
-      end
-
       sql_definition = resolve_sql_definition(sql_definition, name, version, :trigger)
 
       Fx.database.update_trigger(

data/lib/fx/version.rb

@@ -1,4 +1,4 @@
 module Fx
   # @api private
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/spec/fx/adapters/postgres_spec.rb

@@ -143,44 +143,11 @@ RSpec.describe Fx::Adapters::Postgres, :db do
   end
 
   describe "#support_drop_function_without_args" do
-    it "returns true for PostgreSQL version 10.0" do
+    it "returns true for all supported PostgreSQL versions" do
       adapter = Fx::Adapters::Postgres.new
       connection = adapter.send(:connection)
-      allow(connection).to receive(:server_version).and_return(10_00_00)
 
-      result = connection.support_drop_function_without_args
-
-      expect(result).to be(true)
-    end
-
-    it "returns true for PostgreSQL version 11.0" do
-      adapter = Fx::Adapters::Postgres.new
-      connection = adapter.send(:connection)
-      allow(connection).to receive(:server_version).and_return(11_00_00)
-
-      result = connection.support_drop_function_without_args
-
-      expect(result).to be(true)
-    end
-
-    it "returns false for PostgreSQL version 9.6" do
-      adapter = Fx::Adapters::Postgres.new
-      connection = adapter.send(:connection)
-      allow(connection).to receive(:server_version).and_return(9_06_00)
-
-      result = connection.support_drop_function_without_args
-
-      expect(result).to be(false)
-    end
-
-    it "returns false for PostgreSQL version 9.5" do
-      adapter = Fx::Adapters::Postgres.new
-      connection = adapter.send(:connection)
-      allow(connection).to receive(:server_version).and_return(9_05_00)
-
-      result = connection.support_drop_function_without_args
-
-      expect(result).to be(false)
+      expect(connection.support_drop_function_without_args).to be(true)
     end
   end
 end

data/spec/fx/command_recorder_spec.rb

@@ -10,14 +10,6 @@ RSpec.describe Fx::CommandRecorder, :db do
       expect(recorder.commands).to eq([[:create_function, [:test], nil]])
     end
 
-    it "reverts to drop_function" do
-      recorder = ActiveRecord::Migration::CommandRecorder.new
-
-      recorder.create_function :test
-
-      expect(recorder.commands).to eq([[:create_function, [:test], nil]])
-    end
-
     it "reverts to drop_function" do
       recorder = ActiveRecord::Migration::CommandRecorder.new
 
@@ -95,14 +87,6 @@ RSpec.describe Fx::CommandRecorder, :db do
       expect(recorder.commands).to eq([[:create_trigger, [:greetings], nil]])
     end
 
-    it "reverts to drop_trigger" do
-      recorder = ActiveRecord::Migration::CommandRecorder.new
-
-      recorder.create_trigger :greetings
-
-      expect(recorder.commands).to eq([[:create_trigger, [:greetings], nil]])
-    end
-
     it "reverts to drop_trigger" do
       recorder = ActiveRecord::Migration::CommandRecorder.new
 

data/spec/fx/function_spec.rb

@@ -2,44 +2,121 @@ require "spec_helper"
 
 RSpec.describe Fx::Function do
   describe "#<=>" do
-    it "delegates to `name`" do
+    it "delegates to `signature`" do
       function_a = Fx::Function.new(
         "name" => "name_a",
-        "definition" => "some definition"
+        "definition" => "some definition",
+        "arguments" => ""
       )
       function_b = Fx::Function.new(
         "name" => "name_b",
-        "definition" => "some definition"
+        "definition" => "some definition",
+        "arguments" => ""
       )
       function_c = Fx::Function.new(
         "name" => "name_c",
-        "definition" => "some definition"
+        "definition" => "some definition",
+        "arguments" => ""
       )
 
       expect(function_b).to be_between(function_a, function_c)
     end
+
+    it "orders overloads by signature" do
+      add_int = Fx::Function.new(
+        "name" => "add",
+        "definition" => "some definition",
+        "arguments" => "integer, integer"
+      )
+      add_text = Fx::Function.new(
+        "name" => "add",
+        "definition" => "some definition",
+        "arguments" => "text, text"
+      )
+
+      expect(add_int <=> add_text).to be < 0
+    end
   end
 
   describe "#==" do
-    it "compares `name` and `definition`" do
+    it "compares `signature` and `definition`" do
       function_a = Fx::Function.new(
         "name" => "name_a",
-        "definition" => "some definition"
+        "definition" => "some definition",
+        "arguments" => ""
       )
       function_b = Fx::Function.new(
         "name" => "name_b",
-        "definition" => "some other definition"
+        "definition" => "some other definition",
+        "arguments" => ""
       )
 
       expect(function_a).not_to eq(function_b)
     end
+
+    it "distinguishes overloads with the same name" do
+      add_int = Fx::Function.new(
+        "name" => "add",
+        "definition" => "CREATE FUNCTION add(integer)",
+        "arguments" => "integer"
+      )
+      add_text = Fx::Function.new(
+        "name" => "add",
+        "definition" => "CREATE FUNCTION add(text)",
+        "arguments" => "text"
+      )
+
+      expect(add_int).not_to eq(add_text)
+    end
+  end
+
+  describe "#signature" do
+    it "returns name with arguments when arguments are present" do
+      function = Fx::Function.new(
+        "name" => "inc",
+        "definition" => "some definition",
+        "arguments" => "integer"
+      )
+
+      expect(function.signature).to eq("inc(integer)")
+    end
+
+    it "returns name with multiple arguments" do
+      function = Fx::Function.new(
+        "name" => "add",
+        "definition" => "some definition",
+        "arguments" => "integer, integer"
+      )
+
+      expect(function.signature).to eq("add(integer, integer)")
+    end
+
+    it "returns name with empty parens for no-arg functions" do
+      function = Fx::Function.new(
+        "name" => "now_utc",
+        "definition" => "some definition",
+        "arguments" => ""
+      )
+
+      expect(function.signature).to eq("now_utc()")
+    end
+
+    it "returns just the name when arguments key is missing" do
+      function = Fx::Function.new(
+        "name" => "now_utc",
+        "definition" => "some definition"
+      )
+
+      expect(function.signature).to eq("now_utc")
+    end
   end
 
   describe "#to_schema" do
     it "returns a schema compatible version of the function" do
       function = Fx::Function.new(
         "name" => "uppercase_users_name",
-        "definition" => "CREATE OR REPLACE TRIGGER uppercase_users_name ..."
+        "definition" => "CREATE OR REPLACE TRIGGER uppercase_users_name ...",
+        "arguments" => ""
       )
 
       expect(function.to_schema).to eq(<<-EOS)
@@ -52,7 +129,8 @@ RSpec.describe Fx::Function do
     it "maintains backslashes" do
       function = Fx::Function.new(
         "name" => "regex",
-        "definition" => "CREATE OR REPLACE FUNCTION regex \\1"
+        "definition" => "CREATE OR REPLACE FUNCTION regex \\1",
+        "arguments" => ""
       )
 
       expect(function.to_schema).to eq(<<-'EOS')

data/spec/fx/statements_spec.rb

@@ -176,6 +176,7 @@ RSpec.describe Fx::Statements, :db do
       expect do
         connection.update_trigger(
           :whatever,
+          on: :users,
           version: nil,
           sql_definition: nil
         )
@@ -191,6 +192,7 @@ RSpec.describe Fx::Statements, :db do
       expect do
         connection.update_trigger(
           :whatever,
+          on: :users,
           version: 1,
           sql_definition: "a definition"
         )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fx
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Teo Ljungberg
@@ -16,9 +16,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,9 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -36,9 +30,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,9 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.2'
 description: |
   Adds methods to ActiveRecord::Migration to create and manage database functions
   and triggers in Rails
@@ -58,7 +46,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/scripts/check-eol"
 - ".github/workflows/ci.yml"
+- ".github/workflows/eol-check.yml"
 - ".gitignore"
 - ".rspec"
 - ".standard.yml"
@@ -149,7 +139,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/teoljungberg/fx/issues
-  changelog_uri: https://github.com/teoljungberg/fx/blob/v0.10.1/CHANGELOG.md
+  changelog_uri: https://github.com/teoljungberg/fx/blob/v0.11.0/CHANGELOG.md
   homepage_uri: https://github.com/teoljungberg/fx
   source_code_uri: https://github.com/teoljungberg/fx
 rdoc_options: []
@@ -159,14 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Support for database functions and triggers in Rails migrations
 test_files: []