fx 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07cc76f1310a1982698708c2022bbfae7853263a
-  data.tar.gz: a598bd9efd102a6d8b2789379c46f865a4319f86
+  metadata.gz: 6938f7995ea791b0cae6efb9198d707e1c844933
+  data.tar.gz: 3f636e55ea8dc7c4d858ba4f178233eafe2af09a
 SHA512:
-  metadata.gz: b9b0b8012f86bb96300811e6e7f3eaf0ae03f437da774bb8751759cd7c3546556d5bd3ed195410e97db0a808f55e118c88deca1887d570bd6752308aabd254b0
-  data.tar.gz: 022f693c2da994f7204e6320b4bf73b606df63d8d2c5a9f28bce6cb596d035ce949f2c39a3b6111aa6f926079a5b1b67ed73cd989b7ec1567aa5b3d2113a0e74
+  metadata.gz: 024d66a1780024f26d6ba5b8e619d398e9d30a838a7427a13b054b63e7376baf8c530251ace8ab74c963772c191aeca7b2f65212024e6a9eb3a2e2dd0574701e
+  data.tar.gz: b28ac249704b43766fd76e9110d1fee6c1098c3811d6736f3eb56a23a1fc043a5d40e159cb969edf103cc66e51b8861c5a1167650d44eded8e7bdba6f5a68922

data/gemfiles/rails40.gemfile.lock

@@ -60,29 +60,29 @@ GEM
       activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
+    rake (11.2.2)
     redcarpet (3.3.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    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.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      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)
@@ -108,4 +108,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.12.4
+   1.13.6

data/gemfiles/rails41.gemfile.lock

@@ -47,7 +47,7 @@ GEM
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.9.0)
+    minitest (5.9.1)
     pg (0.18.4)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -61,29 +61,29 @@ GEM
       activesupport (= 4.1.15)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
+    rake (11.2.2)
     redcarpet (3.3.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    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.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      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)
@@ -110,4 +110,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.12.4
+   1.13.6

data/gemfiles/rails42.gemfile.lock

@@ -53,10 +53,10 @@ GEM
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     method_source (0.8.2)
-    mini_portile2 (2.0.0)
-    minitest (5.9.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
     pg (0.18.4)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -78,29 +78,29 @@ GEM
       activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
+    rake (11.2.2)
     redcarpet (3.3.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    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.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      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)
@@ -127,4 +127,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.12.4
+   1.13.6

data/gemfiles/rails50.gemfile.lock

@@ -123,4 +123,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.13.3
+   1.13.6

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

@@ -17,7 +17,8 @@ module Fx
               ON pn.oid = pp.pronamespace
           LEFT JOIN pg_depend pd
               ON pd.objid = pp.oid AND pd.deptype = 'e'
-          WHERE pn.nspname = 'public' AND pd.objid IS NULL;
+          WHERE pn.nspname = 'public' AND pd.objid IS NULL
+          ORDER BY pp.oid;
         SQL
 
         # Wraps #all as a static facade.

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

@@ -18,7 +18,8 @@ module Fx
           JOIN pg_proc pp
               ON (pp.oid = pt.tgfoid)
           WHERE pt.tgname
-          NOT ILIKE '%constraint%' AND pt.tgname NOT ILIKE 'pg%';
+          NOT ILIKE '%constraint%' AND pt.tgname NOT ILIKE 'pg%'
+          ORDER BY pc.oid;
         SQL
 
         # Wraps #all as a static facade.

data/lib/fx/version.rb

@@ -1,4 +1,4 @@
 module Fx
   # @api private
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/generators/fx/function/function_generator.rb

@@ -59,6 +59,14 @@ module Fx
           end
         end
 
+        def activerecord_migration_class
+          if ActiveRecord::Migration.respond_to?(:current_version)
+            "ActiveRecord::Migration[5.0]"
+          else
+            "ActiveRecord::Migration"
+          end
+        end
+
         def formatted_name
           if singular_name.include?(".")
             "\"#{singular_name}\""

data/lib/generators/fx/function/templates/db/migrate/create_function.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < <%= activerecord_migration_class %>
   def change
     create_function <%= formatted_name %>
   end

data/lib/generators/fx/function/templates/db/migrate/update_function.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < <%= activerecord_migration_class %>
   def change
     update_function <%= formatted_name %>, version: <%= version %>, revert_to_version: <%= previous_version %>
   end

data/lib/generators/fx/trigger/templates/db/migrate/create_trigger.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < <%= activerecord_migration_class %>
   def change
     create_trigger <%= formatted_name %>, on: <%= formatted_table_name %>
   end

data/lib/generators/fx/trigger/templates/db/migrate/update_trigger.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < <%= activerecord_migration_class %>
   def change
     update_trigger <%= formatted_name %>, on: <%= formatted_table_name %>, version: <%= version %>, revert_to_version: <%= previous_version %>
   end

data/lib/generators/fx/trigger/trigger_generator.rb

@@ -56,6 +56,14 @@ module Fx
           end
         end
 
+        def activerecord_migration_class
+          if ActiveRecord::Migration.respond_to?(:current_version)
+            "ActiveRecord::Migration[5.0]"
+          else
+            "ActiveRecord::Migration"
+          end
+        end
+
         def formatted_name
           if singular_name.include?(".")
             "\"#{singular_name}\""

data/spec/features/functions/migrations_spec.rb

@@ -16,7 +16,7 @@ describe "Function migrations", :db do
   end
 
   it "can run migrations that create functions" do
-    migration = Class.new(ActiveRecord::Migration) do
+    migration = Class.new(migration_class) do
       def up
         create_function :test
       end
@@ -28,7 +28,7 @@ describe "Function migrations", :db do
   it "can run migrations that drop functions" do
     connection.create_function(:test)
 
-    migration = Class.new(ActiveRecord::Migration) do
+    migration = Class.new(migration_class) do
       def up
         drop_function :test
       end
@@ -53,7 +53,7 @@ describe "Function migrations", :db do
       version: 2,
       sql_definition: sql_definition,
     ) do
-      migration = Class.new(ActiveRecord::Migration) do
+      migration = Class.new(migration_class) do
         def change
           update_function :test, version: 2, revert_to_version: 1
         end

data/spec/features/functions/revert_spec.rb

@@ -16,7 +16,7 @@ describe "Reverting migrations", :db do
   end
 
   it "can run reversible migrations for creating functions" do
-    migration = Class.new(ActiveRecord::Migration) do
+    migration = Class.new(migration_class) do
       def change
         create_function :test
       end
@@ -28,12 +28,12 @@ describe "Reverting migrations", :db do
   it "can run reversible migrations for dropping functions" do
     connection.create_function(:test)
 
-    good_migration = Class.new(ActiveRecord::Migration) do
+    good_migration = Class.new(migration_class) do
       def change
         drop_function :test, revert_to_version: 1
       end
     end
-    bad_migration = Class.new(ActiveRecord::Migration) do
+    bad_migration = Class.new(migration_class) do
       def change
         drop_function :test
       end
@@ -63,7 +63,7 @@ describe "Reverting migrations", :db do
       version: 2,
       sql_definition: sql_definition,
     ) do
-      migration = Class.new(ActiveRecord::Migration) do
+      migration = Class.new(migration_class) do
         def change
           update_function :test, version: 2, revert_to_version: 1
         end

data/spec/features/triggers/migrations_spec.rb

@@ -33,7 +33,7 @@ describe "Trigger migrations", :db do
   end
 
   it "can run migrations that create triggers" do
-    migration = Class.new(ActiveRecord::Migration) do
+    migration = Class.new(migration_class) do
       def up
         create_trigger :uppercase_users_name
       end
@@ -45,7 +45,7 @@ describe "Trigger migrations", :db do
   it "can run migrations that drop triggers" do
     connection.create_trigger(:uppercase_users_name)
 
-    migration = Class.new(ActiveRecord::Migration) do
+    migration = Class.new(migration_class) do
       def up
         drop_trigger :uppercase_users_name, on: :users
       end

data/spec/features/triggers/revert_spec.rb

@@ -33,7 +33,7 @@ describe "Reverting migrations", :db do
   end
 
   it "can run reversible migrations for creating triggers" do
-    migration = Class.new(ActiveRecord::Migration) do
+    migration = Class.new(migration_class) do
       def change
         create_trigger :uppercase_users_name, on: :users
       end
@@ -45,12 +45,12 @@ describe "Reverting migrations", :db do
   it "can run reversible migrations for dropping triggers" do
     connection.create_trigger(:uppercase_users_name, on: :users)
 
-    good_migration = Class.new(ActiveRecord::Migration) do
+    good_migration = Class.new(migration_class) do
       def change
         drop_trigger :uppercase_users_name, on: :users, revert_to_version: 1
       end
     end
-    bad_migration = Class.new(ActiveRecord::Migration) do
+    bad_migration = Class.new(migration_class) do
       def change
         drop_trigger :uppercase_users_name, on: :users
       end
@@ -78,7 +78,7 @@ describe "Reverting migrations", :db do
       sql_definition: sql_definition,
       version: 2,
     ) do
-      migration = Class.new(ActiveRecord::Migration) do
+      migration = Class.new(migration_class) do
         def change
           update_trigger(
             :uppercase_users_name,

data/spec/support/migration_helpers.rb

@@ -7,6 +7,14 @@ module MigrationsHelper
     end
   end
 
+  def migration_class
+    if Rails::VERSION::MAJOR >= 5
+      ::ActiveRecord::Migration[5.0]
+    else
+      ::ActiveRecord::Migration
+    end
+  end
+
   def connection
     @_connection ||= ActiveRecord::Base.connection
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fx
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Teo Ljungberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal