fx 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e391283922484cf5a5b06c7de944c3162a85b7b49546f1fd1a017a6fc762898
-  data.tar.gz: 73b179c85ebc70977bf4d2afbe45088284a9730138c2a424d940d72fb2ab0a30
+  metadata.gz: f602bcfa44f9289edb4ad43379716b554badc5cdd086d04344d9683564b93ede
+  data.tar.gz: cfdb703fb8a27cae0622c8f70a38a35a039677b51363d985018b9f638eb8846c
 SHA512:
-  metadata.gz: 144fcbf71aad79383ee1ae98047b6fc018212ecd3ea2d747f883d7def2c649590b1d04fc77b0a84113fa832a6a0377857cf8482d2290c0c40f6496be0e6db470
-  data.tar.gz: 057f585e7e83a89aebfda256605813a7db9e7d01b5841f436be0a9f7323540fd5a49999e4bf3bbc6db33ab0342e4ad0727b1b9b16690ed3a1aea00ea3011ea2d
+  metadata.gz: fa2447143558b62d037a7c6515211bfcdae05ca437ced59d949828ef1409f76b79b33dbf71677699b98af53453e5b249de18f76f89c3b9895a6f3705462bb7df
+  data.tar.gz: 4b5380abef9d337368e80ac0f0f61dd3d70a2514bd560f175f8726a9a089136f4760237b3b3a86a58a01af65d2797a200b1a8a4a1efd58a8a4d58de30af0bb5b

data/.travis.yml

@@ -19,6 +19,8 @@ language:
 notifications:
   email: false
 rvm:
+  - 3.0
+  - 2.7
   - 2.6
   - 2.5
   - 2.4
@@ -28,12 +30,31 @@ gemfile:
   - gemfiles/rails51.gemfile
   - gemfiles/rails52.gemfile
   - gemfiles/rails60.gemfile
+  - gemfiles/rails61.gemfile
   - gemfiles/rails_edge.gemfile
 matrix:
   allow_failures:
     - gemfile: gemfiles/rails_edge.gemfile
   exclude:
-    - rvm: 2.4
-      gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.4
       gemfile: gemfiles/rails60.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails61.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.5
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.7
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails51.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails52.gemfile

data/Appraisals

@@ -1,32 +1,45 @@
-appraise "rails42" do
-  gem "activerecord", "~> 4.2.0"
-  gem "railties", "~> 4.2.0"
-  gem "pg", "~> 0.15"
+if RUBY_VERSION < "2.6.0"
+  appraise "rails42" do
+    gem "activerecord", "~> 4.2.0"
+    gem "railties", "~> 4.2.0"
+    gem "pg", "~> 0.15.0"
+    gem "bigdecimal", "1.3.5"
+  end
 end
 
-if RUBY_VERSION > "2.2.0"
+if RUBY_VERSION >= "2.2.0" and RUBY_VERSION < "3.0.0"
   appraise "rails50" do
-    gem "activerecord", "~> 5.0"
-    gem "railties", "~> 5.0"
+    gem "activerecord", "~> 5.0.0"
+    gem "railties", "~> 5.0.0"
   end
 
   appraise "rails51" do
-    gem "activerecord", "~> 5.1"
-    gem "railties", "~> 5.1"
+    gem "activerecord", "~> 5.1.0"
+    gem "railties", "~> 5.1.0"
   end
 
   appraise "rails52" do
-    gem "activerecord", "~> 5.2"
-    gem "railties", "~> 5.2"
+    gem "activerecord", "~> 5.2.0"
+    gem "railties", "~> 5.2.0"
   end
 
+end
+
+if RUBY_VERSION >= "2.5.0"
   appraise "rails60" do
-    gem "activerecord", "~> 6.0"
-    gem "railties", "~> 6.0"
+    gem "activerecord", "~> 6.0.0"
+    gem "railties", "~> 6.0.0"
   end
 
+  appraise "rails61" do
+    gem "activerecord", "~> 6.1.0"
+    gem "railties", "~> 6.1.0"
+  end
+end
+
+if RUBY_VERSION >= "2.7.0"
   appraise "rails-edge" do
-    gem "rails", github: "rails/rails"
+    gem "rails", github: "rails/rails", branch: "main"
     gem "arel", :github => "rails/arel"
   end
 end

data/README.md

@@ -108,6 +108,10 @@ 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.
 
+## Plugins/Adapters
+
+- [SQLserver](https://github.com/tarellel/fx-sqlserver-adapter)
+
 ## Contributing
 
 See [contributing](CONTRIBUTING.md) for more details.

data/fx.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "appraisal", '~> 2.3.0'
   spec.add_development_dependency "bundler", '>= 1.5'
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "rake"

data/gemfiles/rails42.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
 gem "railties", "~> 4.2.0"
-gem "pg", "~> 0.15"
+gem "pg", "~> 0.15.0"
+gem "bigdecimal", "1.3.5"
 
 gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0"
-gem "railties", "~> 5.0"
+gem "activerecord", "~> 5.0.0"
+gem "railties", "~> 5.0.0"
 
 gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1"
-gem "railties", "~> 5.1"
+gem "activerecord", "~> 5.1.0"
+gem "railties", "~> 5.1.0"
 
 gemspec path: "../"

data/gemfiles/rails52.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2"
-gem "railties", "~> 5.2"
+gem "activerecord", "~> 5.2.0"
+gem "railties", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/rails60.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0"
-gem "railties", "~> 6.0"
+gem "activerecord", "~> 6.0.0"
+gem "railties", "~> 6.0.0"
 
 gemspec path: "../"

data/gemfiles/rails61.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+gem "railties", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_edge.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", github: "rails/rails"
+gem "rails", github: "rails/rails", branch: "main"
 gem "arel", github: "rails/arel"
 
 gemspec path: "../"

data/lib/fx/function.rb

@@ -17,7 +17,7 @@ module Fx
 
     def to_schema
       <<-SCHEMA.indent(2)
-create_function :#{name}, sql_definition: <<-\SQL
+create_function :#{name}, sql_definition: <<-'SQL'
 #{definition.indent(4).rstrip}
 SQL
       SCHEMA

data/lib/fx/statements/function.rb

@@ -11,7 +11,7 @@ module Fx
       #   find the definition file in `db/functions`. This defaults to `1` if
       #   not provided.
       # @param sql_definition [String] The SQL query for the function schema.
-      #   If both `sql_defintion` and `version` are provided,
+      #   If both `sql_definition` and `version` are provided,
       #   `sql_definition` takes prescedence.
       # @return The database response from executing the create statement.
       #
@@ -29,7 +29,10 @@ module Fx
       #     $$ LANGUAGE plpgsql;
       #   SQL
       #
-      def create_function(name, version: 1, sql_definition: nil)
+      def create_function(name, options = {})
+        version = options.fetch(:version, 1)
+        sql_definition = options[:sql_definition]
+
         if version.nil? && sql_definition.nil?
           raise(
             ArgumentError,
@@ -53,7 +56,8 @@ 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, revert_to_version: nil)
+      def drop_function(name, options = {})
+        revert_to_version = options[:revert_to_version]
         Fx.database.drop_function(name)
       end
 
@@ -64,7 +68,7 @@ module Fx
       #   find the definition file in `db/functions`. This defaults to `1` if
       #   not provided.
       # @param sql_definition [String] The SQL query for the function schema.
-      #   If both `sql_defintion` and `version` are provided,
+      #   If both `sql_definition` and `version` are provided,
       #   `sql_definition` takes prescedence.
       # @return The database response from executing the create statement.
       #
@@ -86,7 +90,11 @@ module Fx
       #     $$ LANGUAGE plpgsql;
       #   SQL
       #
-      def update_function(name, version: nil, sql_definition: nil, revert_to_version: nil)
+      def update_function(name, options = {})
+        version = options[:version]
+        sql_definition = options[:sql_definition]
+        revert_to_version = options[:revert_to_version]
+
         if version.nil? && sql_definition.nil?
           raise(
             ArgumentError,

data/lib/fx/statements/trigger.rb

@@ -3,7 +3,7 @@ module Fx
     # Methods that are made available in migrations for managing Fx triggers.
     module Trigger
       # @api private
-      DEFINTION_TYPE = "trigger".freeze
+      DEFINITION_TYPE = "trigger".freeze
 
       # Create a new database trigger.
       #
@@ -27,7 +27,11 @@ module Fx
       #         EXECUTE PROCEDURE uppercase_users_name();
       #    SQL
       #
-      def create_trigger(name, version: nil, on: nil, sql_definition: nil)
+      def create_trigger(name, options = {})
+        version = options[:version]
+        _on = options[:on]
+        sql_definition = options[:sql_definition]
+
         if version.present? && sql_definition.present?
           raise(
             ArgumentError,
@@ -43,7 +47,7 @@ module Fx
         sql_definition ||= Fx::Definition.new(
           name: name,
           version: version,
-          type: DEFINTION_TYPE,
+          type: DEFINITION_TYPE,
         ).to_sql
 
         Fx.database.create_trigger(sql_definition)
@@ -62,7 +66,9 @@ 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, on:, revert_to_version: nil)
+      def drop_trigger(name, options = {})
+        on = options.fetch(:on)
+        revert_to_version = options[:revert_to_version]
         Fx.database.drop_trigger(name, on: on)
       end
 
@@ -98,7 +104,12 @@ module Fx
       #         EXECUTE PROCEDURE uppercase_users_name();
       #    SQL
       #
-      def update_trigger(name, version: nil, on: nil, sql_definition: nil, revert_to_version: nil)
+      def update_trigger(name, options = {})
+        version = options[:version]
+        on = options[:on]
+        sql_definition = options[:sql_definition]
+        revert_to_version = options[:revert_to_version]
+
         if version.nil? && sql_definition.nil?
           raise(
             ArgumentError,
@@ -121,7 +132,7 @@ module Fx
         sql_definition ||= Fx::Definition.new(
           name: name,
           version: version,
-          type: DEFINTION_TYPE,
+          type: DEFINITION_TYPE,
         ).to_sql
 
         Fx.database.update_trigger(

data/lib/fx/version.rb

@@ -1,4 +1,4 @@
 module Fx
   # @api private
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/spec/fx/function_spec.rb

@@ -7,15 +7,15 @@ module Fx
       it "delegates to `name`" do
         function_a = Function.new(
           "name" => "name_a",
-          "definition" => "some defintion",
+          "definition" => "some definition",
         )
         function_b = Function.new(
           "name" => "name_b",
-          "definition" => "some defintion",
+          "definition" => "some definition",
         )
         function_c = Function.new(
           "name" => "name_c",
-          "definition" => "some defintion",
+          "definition" => "some definition",
         )
 
         expect(function_b).to be_between(function_a, function_c)
@@ -26,11 +26,11 @@ module Fx
       it "compares `name` and `definition`" do
         function_a = Function.new(
           "name" => "name_a",
-          "definition" => "some defintion",
+          "definition" => "some definition",
         )
         function_b = Function.new(
           "name" => "name_b",
-          "definition" => "some other defintion",
+          "definition" => "some other definition",
         )
 
         expect(function_a).not_to eq(function_b)
@@ -44,9 +44,22 @@ module Fx
           "definition" => "CREATE OR REPLACE TRIGGER uppercase_users_name ...",
         )
 
-        expect(function.to_schema).to eq <<-EOS
-  create_function :uppercase_users_name, sql_definition: <<-\SQL
+        expect(function.to_schema).to eq <<-'EOS'
+  create_function :uppercase_users_name, sql_definition: <<-'SQL'
       CREATE OR REPLACE TRIGGER uppercase_users_name ...
+  SQL
+        EOS
+      end
+
+      it "maintains backslashes" do
+        function = Function.new(
+          "name" => "regex",
+          "definition" => "CREATE OR REPLACE FUNCTION regex \\1",
+        )
+
+        expect(function.to_schema).to eq <<-'EOS'
+  create_function :regex, sql_definition: <<-'SQL'
+      CREATE OR REPLACE FUNCTION regex \1
   SQL
         EOS
       end

data/spec/fx/schema_dumper/function_spec.rb

@@ -23,27 +23,29 @@ describe Fx::SchemaDumper::Function, :db do
   end
 
   it "dumps a create_function for a function in the database" do
-    Fx.configuration.dump_functions_at_beginning_of_schema = true
-    sql_definition = <<-EOS
-      CREATE OR REPLACE FUNCTION my_function()
-      RETURNS text AS $$
-      BEGIN
-          RETURN 'test';
-      END;
-      $$ LANGUAGE plpgsql;
-    EOS
-    connection.create_function :my_function, sql_definition: sql_definition
-    connection.create_table :my_table
-    stream = StringIO.new
-    output = stream.string
+    begin
+      Fx.configuration.dump_functions_at_beginning_of_schema = true
+      sql_definition = <<-EOS
+        CREATE OR REPLACE FUNCTION my_function()
+        RETURNS text AS $$
+        BEGIN
+            RETURN 'test';
+        END;
+        $$ LANGUAGE plpgsql;
+      EOS
+      connection.create_function :my_function, sql_definition: sql_definition
+      connection.create_table :my_table
+      stream = StringIO.new
+      output = stream.string
 
-    ActiveRecord::SchemaDumper.dump(connection, stream)
+      ActiveRecord::SchemaDumper.dump(connection, stream)
 
-    expect(output).to(
-      match(/function :my_function.*RETURN 'test';.*table "my_table"/m),
-    )
-  ensure
-    Fx.configuration.dump_functions_at_beginning_of_schema = false
+      expect(output).to(
+        match(/function :my_function.*RETURN 'test';.*table "my_table"/m),
+      )
+    ensure
+      Fx.configuration.dump_functions_at_beginning_of_schema = false
+    end
   end
 
   it "does not dump a create_function for aggregates in the database" do
@@ -71,7 +73,7 @@ describe Fx::SchemaDumper::Function, :db do
     ActiveRecord::SchemaDumper.dump(connection, stream)
 
     output = stream.string
-    expect(output).to include "create_function :test, sql_definition: <<-SQL"
+    expect(output).to include "create_function :test, sql_definition: <<-'SQL'"
     expect(output).to include "RETURN 'test';"
     expect(output).not_to include "aggregate_test"
   end

data/spec/fx/trigger_spec.rb

@@ -7,15 +7,15 @@ module Fx
       it "delegates to `name`" do
         trigger_a = Trigger.new(
           "name" => "name_a",
-          "definition" => "some defintion",
+          "definition" => "some definition",
         )
         trigger_b = Trigger.new(
           "name" => "name_b",
-          "definition" => "some defintion",
+          "definition" => "some definition",
         )
         trigger_c = Trigger.new(
           "name" => "name_c",
-          "definition" => "some defintion",
+          "definition" => "some definition",
         )
 
         expect(trigger_b).to be_between(trigger_a, trigger_c)
@@ -26,11 +26,11 @@ module Fx
       it "compares `name` and `definition`" do
         trigger_a = Trigger.new(
           "name" => "name_a",
-          "definition" => "some defintion",
+          "definition" => "some definition",
         )
         trigger_b = Trigger.new(
           "name" => "name_b",
-          "definition" => "some other defintion",
+          "definition" => "some other definition",
         )
 
         expect(trigger_a).not_to eq(trigger_b)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fx
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Teo Ljungberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,7 @@ files:
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/fx.rb
 - lib/fx/adapters/postgres.rb
@@ -298,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.2
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: Support for database functions and triggers in Rails migrations