fx 0.3.0 → 0.6.1

data/spec/fx/schema_dumper/function_spec.rb

@@ -3,14 +3,69 @@ require "spec_helper"
 describe Fx::SchemaDumper::Function, :db do
   it "dumps a create_function for a function in the database" do
     sql_definition = <<-EOS
-      CREATE OR REPLACE FUNCTION test()
+      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)
+
+    expect(output).to(
+      match(/table "my_table".*function :my_function.*RETURN 'test';/m),
+    )
+  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
+
+    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
+  end
+
+  it "does not dump a create_function for aggregates in the database" do
+    sql_definition = <<-EOS
+      CREATE OR REPLACE FUNCTION test(text, text)
+      RETURNS text AS $$
+      BEGIN
+          RETURN 'test';
+      END;
+      $$ LANGUAGE plpgsql;
+    EOS
+
+    aggregate_sql_definition = <<-EOS
+      CREATE AGGREGATE aggregate_test(text)
+      (
+          sfunc = test,
+          stype = text
+      );
+    EOS
+
     connection.create_function :test, sql_definition: sql_definition
+    connection.execute aggregate_sql_definition
     stream = StringIO.new
 
     ActiveRecord::SchemaDumper.dump(connection, stream)
@@ -18,5 +73,6 @@ describe Fx::SchemaDumper::Function, :db do
     output = stream.string
     expect(output).to include "create_function :test, sql_definition: <<-SQL"
     expect(output).to include "RETURN 'test';"
+    expect(output).not_to include "aggregate_test"
   end
 end

data/spec/fx/trigger_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+require "fx/trigger"
+
+module Fx
+  describe Trigger do
+    describe "#<=>" do
+      it "delegates to `name`" do
+        trigger_a = Trigger.new(
+          "name" => "name_a",
+          "definition" => "some defintion",
+        )
+        trigger_b = Trigger.new(
+          "name" => "name_b",
+          "definition" => "some defintion",
+        )
+        trigger_c = Trigger.new(
+          "name" => "name_c",
+          "definition" => "some defintion",
+        )
+
+        expect(trigger_b).to be_between(trigger_a, trigger_c)
+      end
+    end
+
+    describe "#==" do
+      it "compares `name` and `definition`" do
+        trigger_a = Trigger.new(
+          "name" => "name_a",
+          "definition" => "some defintion",
+        )
+        trigger_b = Trigger.new(
+          "name" => "name_b",
+          "definition" => "some other defintion",
+        )
+
+        expect(trigger_a).not_to eq(trigger_b)
+      end
+    end
+
+    describe "#to_schema" do
+      it "returns a schema compatible version of the trigger" do
+        trigger = Trigger.new(
+          "name" => "uppercase_users_name",
+          "definition" => "CREATE TRIGGER uppercase_users_name ...",
+        )
+
+        expect(trigger.to_schema).to eq <<-EOS
+  create_trigger :uppercase_users_name, sql_definition: <<-\SQL
+      CREATE TRIGGER uppercase_users_name ...
+  SQL
+        EOS
+      end
+    end
+  end
+end

data/spec/generators/fx/function/function_generator_spec.rb

@@ -13,6 +13,18 @@ describe Fx::Generators::FunctionGenerator, :generator do
     expect(migration_file(migration)).to contain "CreateFunctionTest"
   end
 
+  context "when passed --no-migration" do
+    it "creates a only function definition file" do
+      migration = file("db/migrate/create_function_test.rb")
+      function_definition = file("db/functions/test_v01.sql")
+
+      run_generator ["test", "--no-migration"]
+
+      expect(function_definition).to exist
+      expect(migration_file(migration)).not_to exist
+    end
+  end
+
   it "updates an existing function" do
     with_function_definition(
       name: "test",

data/spec/generators/fx/trigger/trigger_generator_spec.rb

@@ -14,6 +14,18 @@ describe Fx::Generators::TriggerGenerator, :generator do
     expect(migration_file(migration)).to contain "on: :some_table"
   end
 
+  context "when passed --no-migration" do
+    it "creates a only trigger definition file" do
+      migration = file("db/migrate/create_trigger_test.rb")
+      trigger_definition = file("db/triggers/test_v01.sql")
+
+      run_generator ["test", {"table_name" => "some_table"}, "--no-migration"]
+
+      expect(trigger_definition).to exist
+      expect(migration_file(migration)).not_to exist
+    end
+  end
+
   it "supports naming the table as `on` aswell as `table_name`" do
     migration = file("db/migrate/create_trigger_test.rb")
     trigger_definition = file("db/triggers/test_v01.sql")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fx
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Teo Ljungberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -188,13 +188,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
-- ".ruby-version"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CONTRIBUTING.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/appraisal
@@ -204,14 +206,12 @@ files:
 - bin/setup
 - bin/yard
 - fx.gemspec
-- gemfiles/rails40.gemfile
-- gemfiles/rails40.gemfile.lock
-- gemfiles/rails41.gemfile
-- gemfiles/rails41.gemfile.lock
 - gemfiles/rails42.gemfile
-- gemfiles/rails42.gemfile.lock
 - gemfiles/rails50.gemfile
-- gemfiles/rails50.gemfile.lock
+- gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/fx.rb
 - lib/fx/adapters/postgres.rb
 - lib/fx/adapters/postgres/connection.rb
@@ -224,6 +224,7 @@ files:
 - lib/fx/configuration.rb
 - lib/fx/definition.rb
 - lib/fx/function.rb
+- lib/fx/railtie.rb
 - lib/fx/schema_dumper.rb
 - lib/fx/schema_dumper/function.rb
 - lib/fx/schema_dumper/trigger.rb
@@ -259,15 +260,19 @@ files:
 - spec/features/functions/revert_spec.rb
 - spec/features/triggers/migrations_spec.rb
 - spec/features/triggers/revert_spec.rb
+- spec/fx/adapters/postgres/functions_spec.rb
+- spec/fx/adapters/postgres/triggers_spec.rb
 - spec/fx/adapters/postgres_spec.rb
 - spec/fx/command_recorder/arguments_spec.rb
 - spec/fx/command_recorder_spec.rb
 - spec/fx/configuration_spec.rb
 - spec/fx/definition_spec.rb
+- spec/fx/function_spec.rb
 - spec/fx/schema_dumper/function_spec.rb
 - spec/fx/schema_dumper/trigger_spec.rb
 - spec/fx/statements/function_spec.rb
 - spec/fx/statements/trigger_spec.rb
+- spec/fx/trigger_spec.rb
 - spec/generators/fx/function/function_generator_spec.rb
 - spec/generators/fx/trigger/trigger_generator_spec.rb
 - spec/spec_helper.rb
@@ -293,8 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Support for database functions and triggers in Rails migrations
@@ -317,15 +321,19 @@ test_files:
 - spec/features/functions/revert_spec.rb
 - spec/features/triggers/migrations_spec.rb
 - spec/features/triggers/revert_spec.rb
+- spec/fx/adapters/postgres/functions_spec.rb
+- spec/fx/adapters/postgres/triggers_spec.rb
 - spec/fx/adapters/postgres_spec.rb
 - spec/fx/command_recorder/arguments_spec.rb
 - spec/fx/command_recorder_spec.rb
 - spec/fx/configuration_spec.rb
 - spec/fx/definition_spec.rb
+- spec/fx/function_spec.rb
 - spec/fx/schema_dumper/function_spec.rb
 - spec/fx/schema_dumper/trigger_spec.rb
 - spec/fx/statements/function_spec.rb
 - spec/fx/statements/trigger_spec.rb
+- spec/fx/trigger_spec.rb
 - spec/generators/fx/function/function_generator_spec.rb
 - spec/generators/fx/trigger/trigger_generator_spec.rb
 - spec/spec_helper.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.3

data/gemfiles/rails40.gemfile

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

data/gemfiles/rails40.gemfile.lock

@@ -1,111 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    fx (0.3.0)
-      activerecord (>= 4.0.0)
-      railties (>= 4.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    ammeter (1.1.4)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-rails (>= 2.2)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (4.0.2)
-    builder (3.1.4)
-    coderay (1.1.1)
-    database_cleaner (1.5.3)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    method_source (0.8.2)
-    minitest (4.7.5)
-    multi_json (1.12.1)
-    pg (0.19.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
-    redcarpet (3.3.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (0.3.52)
-    yard (0.9.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.0.0)
-  ammeter (>= 1.1.3)
-  appraisal
-  bundler (>= 1.5)
-  database_cleaner
-  fx!
-  pg
-  pry
-  railties (~> 4.0.0)
-  rake
-  redcarpet
-  rspec (>= 3.3)
-  yard
-
-BUNDLED WITH
-   1.13.6

data/gemfiles/rails41.gemfile

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

data/gemfiles/rails41.gemfile.lock

@@ -1,113 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    fx (0.3.0)
-      activerecord (>= 4.0.0)
-      railties (>= 4.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (4.1.16)
-      actionview (= 4.1.16)
-      activesupport (= 4.1.16)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.16)
-      activesupport (= 4.1.16)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.16)
-      activesupport (= 4.1.16)
-      builder (~> 3.1)
-    activerecord (4.1.16)
-      activemodel (= 4.1.16)
-      activesupport (= 4.1.16)
-      arel (~> 5.0.0)
-    activesupport (4.1.16)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    ammeter (1.1.4)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-rails (>= 2.2)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    coderay (1.1.1)
-    database_cleaner (1.5.3)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    method_source (0.8.2)
-    minitest (5.9.1)
-    pg (0.19.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    railties (4.1.16)
-      actionpack (= 4.1.16)
-      activesupport (= 4.1.16)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
-    redcarpet (3.3.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    yard (0.9.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.1.0)
-  ammeter (>= 1.1.3)
-  appraisal
-  bundler (>= 1.5)
-  database_cleaner
-  fx!
-  pg
-  pry
-  railties (~> 4.1.0)
-  rake
-  redcarpet
-  rspec (>= 3.3)
-  yard
-
-BUNDLED WITH
-   1.13.6