switchman 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a061d43139c6beef4a69af819d1797a7d14650d
-  data.tar.gz: 4efbe1614848d2d2ba0e23d8bc8b993ff44a9fc9
+  metadata.gz: 6d7676d7b016d87da297714bb0ac6c4e6b2d2114
+  data.tar.gz: 67746d37c000d95e9f59a8be237a3a602b8d2e89
 SHA512:
-  metadata.gz: 423e156b64348617b371ff59e042db181a69eda6a64bae54c5823b4e8e6e4f35b0ed748c4ee2f6e4d462bd17501f6bd417c881d3edb6c21266f7421650716d15
-  data.tar.gz: 8ced56c4ab5bf0327b98d8fa4d25b228b02badb181866f722d79cce44eece0148f1b0dd328ec93a91181d7802a65123cd1c3e33d2811a35115bdae95a18eb83b
+  metadata.gz: 3dfceefb5d04a739ac608d547f502133d0f3fa0185b17092087c9b2b2526c2bf947f8aa1657448341302cf4ce706b1b95cbc8110f738e62d752a0be409ea6f30
+  data.tar.gz: d1a2c684c4e720ed9e3e1777ac7c343ff83a9d8871e458b4644f8d1280ebec0bbfd52cd147d35ae9fec790599093623657209268efe43995e2ab01542e2bb12d

data/lib/switchman/active_record/abstract_adapter.rb

@@ -27,6 +27,10 @@ module Switchman
         quote_table_name(name)
       end
 
+      def use_qualified_names?
+        false
+      end
+
       protected
 
       def log(*args, &block)

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -180,6 +180,40 @@ module Switchman
           name.quoted
         end
       end
+
+      if ::Rails.version >= '4.2'
+        def foreign_keys(table_name)
+          schema = shard.name if use_qualified_names?
+
+          # mostly copy-pasted from AR - only change is to the nspname condition for qualified names support
+          fk_info = select_all <<-SQL.strip_heredoc
+            SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+            FROM pg_constraint c
+            JOIN pg_class t1 ON c.conrelid = t1.oid
+            JOIN pg_class t2 ON c.confrelid = t2.oid
+            JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+            JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+            JOIN pg_namespace t3 ON c.connamespace = t3.oid
+            WHERE c.contype = 'f'
+              AND t1.relname = #{quote(table_name)}
+              AND t3.nspname = #{schema ? "'#{schema}'" : 'ANY (current_schemas(false))'}
+            ORDER BY c.conname
+          SQL
+
+          fk_info.map do |row|
+            options = {
+              column: row['column'],
+              name: row['name'],
+              primary_key: row['primary_key']
+            }
+
+            options[:on_delete] = extract_foreign_key_action(row['on_delete'])
+            options[:on_update] = extract_foreign_key_action(row['on_update'])
+
+            ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(table_name, row['to_table'], options)
+          end
+        end
+      end
     end
   end
 end

data/lib/switchman/active_record/query_methods.rb

@@ -91,6 +91,19 @@ module Switchman
         end
       end
 
+      if ::Rails.version >= '4.2' && ::Rails.version < '5'
+        # fixes an issue in Rails 4.2 with `reverse_sql_order` and qualified names
+        # where quoted_table_name is called before shard(s) have been activated
+        # if there's no ordering
+        def reverse_order!
+          orders = order_values.uniq
+          orders.reject!(&:blank?)
+          orders = [arel_table[primary_key].desc] if orders.empty?
+
+          self.order_values = reverse_sql_order(orders)
+          self
+        end
+      end
 
       private
 

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.7"
+  VERSION = "1.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties