switchman 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e86d6e07988c45f8c70c42c92ece5263797af099
-  data.tar.gz: 624f54c1a3735b12050b977177076fc3fc870027
+  metadata.gz: d2e63c8b9d8a43c1cf8716f775593bc0e5c7296b
+  data.tar.gz: c4cda98c0bbdf18d0c648adcf8d8465c90f2246e
 SHA512:
-  metadata.gz: f30d8b5ee490486c13a4f800a09c2bc29ba266e98e839980242562b46f0e0e080e68d7039019d5a69e7944d232829bd592521e86f7206e5bd35cf42cf360a208
-  data.tar.gz: 9e3b24c5493efce7a36e5da23a0dc471dc878a034125e8304dccb05c7beabef5daa009c87360f5e1c5bc9293f5b3892a5a624a86fffcbdea40fca44bb7878f8c
+  metadata.gz: f2e7e0889dce714d0d128eeca5b09434ba0cd313ebe9e09db2f1d58e7d706e6aa1353e03b54496d2f145fbd19467c74bd095870025eb6fca0321170c06ffd14a
+  data.tar.gz: e0614890e323dcedd8b272e1ec571be80de1640d27601d9c905208e4fca69931676ec03e4ef038775aa634e43751909bdf0b18f261fe32b1c8a394764c830d24

data/app/models/switchman/shard_internal.rb

@@ -198,7 +198,7 @@ module Switchman
             scopes = Hash[database_servers.map do |server|
               server_scope = server.shards.merge(scope)
               if parallel == 1
-                subscopes = [server_scope]
+                subscopes = server_scope
               else
                 subscopes = []
                 total = server_scope.count

data/db/migrate/20161206323434_add_back_default_string_limits_switchman.rb

@@ -0,0 +1,11 @@
+class AddBackDefaultStringLimitsSwitchman < ActiveRecord::Migration
+  def up
+    add_string_limit_if_missing :switchman_shards, :name
+    add_string_limit_if_missing :switchman_shards, :database_server_id
+  end
+
+  def add_string_limit_if_missing(table, column)
+    return if column_exists?(table, column, :string, limit: 255)
+    change_column table, column, :string, limit: 255
+  end
+end

data/lib/switchman/active_record/calculations.rb

@@ -1,16 +1,13 @@
 module Switchman
   module ActiveRecord
     module Calculations
-      CALL_SUPER = Object.new.freeze
-      private_constant :CALL_SUPER
 
       def pluck(*column_names)
-        return super(*column_names[1..-1]) if column_names.first.equal?(CALL_SUPER)
         target_shard = Shard.current(klass.shard_category)
         shard_count = 0
         result = self.activate do |relation, shard|
           shard_count += 1
-          results = relation.pluck(CALL_SUPER, *column_names)
+          results = relation.call_super(:pluck, Calculations, *column_names)
           if column_names.length > 1
             column_names.each_with_index do |column_name, idx|
               if klass.sharded_column?(column_name)
@@ -30,13 +27,12 @@ module Switchman
         result
       end
 
-      def execute_simple_calculation(operation, column_name, distinct, super_method: false)
-        return super(operation, column_name, distinct) if super_method
+      def execute_simple_calculation(operation, column_name, distinct)
         operation = operation.to_s.downcase
         if operation == "average"
           result = calculate_simple_average(column_name, distinct)
         else
-          result = self.activate{ |relation| relation.send(:execute_simple_calculation, operation, column_name, distinct, super_method: true) }
+          result = self.activate{ |relation| relation.call_super(:execute_simple_calculation, Calculations, operation, column_name, distinct) }
           if result.is_a?(Array)
             case operation
             when "count", "sum"

data/lib/switchman/active_record/finder_methods.rb

@@ -1,9 +1,8 @@
 module Switchman
   module ActiveRecord
     module FinderMethods
-      def find_one(id, call_super: false)
+      def find_one(id)
         return super(id) unless klass.integral_id?
-        return super(id) if call_super
 
         if shard_source_value != :implicit
           current_shard = Shard.current(klass.shard_category)
@@ -14,7 +13,7 @@ module Switchman
             # skip the shard if the object can't be on it. unless we're only looking at one shard;
             # we might be expecting a shadow object
             next if current_id > Shard::IDS_PER_SHARD && self.all_shards.length > 1
-            relation.send(:find_one, current_id, call_super: true)
+            relation.call_super(:find_one, FinderMethods, current_id)
           end
           if result.is_a?(Array)
             result = result.first
@@ -52,9 +51,9 @@ module Switchman
           relation = relation.where(table[primary_key].eq(conditions)) if conditions != :none
         end
 
-        args = [relation, "#{name} Exists"]
-        args << relation.bind_values
-        relation.activate { return true if connection.select_value(*args) }
+        relation.activate do |shard_rel|
+          return true if connection.select_value(shard_rel, "#{name} Exists", shard_rel.bind_values)
+        end
         false
       end
     end

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -56,20 +56,40 @@ module Switchman
         SQL
       end
 
-      def table_exists?(name)
+      method_name = ::Rails.version >= '5' ? :data_source_exists? : :table_exists?
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{method_name}(name)
+          name = ::ActiveRecord::ConnectionAdapters::PostgreSQL::Utils.extract_schema_qualified_name(name.to_s)
+          return false unless name.identifier
+          if !name.schema && use_qualified_names?
+            name.instance_variable_set(:@schema, shard.name)
+          end
+
+          exec_query(<<-SQL, 'SCHEMA').rows.first[0].to_i > 0
+            SELECT COUNT(*)
+            FROM pg_class c
+            LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+            WHERE c.relkind IN ('r','v','m') -- (r)elation/table, (v)iew, (m)aterialized view
+            AND c.relname = '\#{name.identifier}'
+            AND n.nspname = \#{name.schema ? "'\#{name.schema}'" : 'ANY (current_schemas(false))'}
+          SQL
+        end
+      RUBY
+
+      def view_exists?(name)
         name = ::ActiveRecord::ConnectionAdapters::PostgreSQL::Utils.extract_schema_qualified_name(name.to_s)
         return false unless name.identifier
         if !name.schema && use_qualified_names?
           name.instance_variable_set(:@schema, shard.name)
         end
 
-        exec_query(<<-SQL, 'SCHEMA').rows.first[0].to_i > 0
-            SELECT COUNT(*)
-            FROM pg_class c
-            LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
-            WHERE c.relkind IN ('r','v','m') -- (r)elation/table, (v)iew, (m)aterialized view
-            AND c.relname = '#{name.identifier}'
-            AND n.nspname = #{name.schema ? "'#{name.schema}'" : 'ANY (current_schemas(false))'}
+        select_values(<<-SQL, 'SCHEMA').any?
+          SELECT c.relname
+          FROM pg_class c
+          LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+          WHERE c.relkind IN ('v','m') -- (v)iew, (m)aterialized view
+          AND c.relname = '#{name.identifier}'
+          AND n.nspname = #{name.schema ? "'#{name.schema}'" : 'ANY (current_schemas(false))'}
         SQL
       end
 
@@ -175,7 +195,14 @@ module Switchman
           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)
+          # strip the schema name from to_table if it matches
+          to_table = row['to_table']
+          to_table_qualified_name = ::ActiveRecord::ConnectionAdapters::PostgreSQL::Utils.extract_schema_qualified_name(to_table)
+          if use_qualified_names? && to_table_qualified_name.schema == shard.name
+            to_table = to_table_qualified_name.identifier
+          end
+
+          ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(table_name, to_table, options)
         end
       end
     end

data/lib/switchman/active_record/relation.rb

@@ -42,17 +42,15 @@ module Switchman
         primary_shard.activate(klass.shard_category) { super }
       end
 
-      def explain(super_method: false)
-        return super() if super_method
-        self.activate { |relation| relation.explain(super_method: true) }
+      def explain
+        self.activate { |relation| relation.call_super(:explain, Relation) }
       end
 
       to_a_method = ::Rails.version >= '5' ? :records : :to_a
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{to_a_method}(super_method: false)
-          return super() if super_method
+        def #{to_a_method}
           return @records if loaded?
-          results = self.activate { |relation| relation.#{to_a_method}(super_method: true) }
+          results = self.activate { |relation| relation.call_super(#{to_a_method.inspect}, Relation) }
           case shard_value
           when Array, ::ActiveRecord::Relation, ::ActiveRecord::Base
             @records = results
@@ -62,14 +60,10 @@ module Switchman
         end
       RUBY
 
-      CALL_SUPER = Object.new.freeze
-      private_constant :CALL_SUPER
-
-      %w{update_all delete_all}.each do |method|
+      %I{update_all delete_all}.each do |method|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{method}(*args)
-            return super(*args[1..-1]) if args.first.equal?(CALL_SUPER)
-            result = self.activate { |relation| relation.#{method}(CALL_SUPER, *args) }
+            result = self.activate { |relation| relation.call_super(#{method.inspect}, Relation, *args) }
             result = result.sum if result.is_a?(Array)
             result
           end

data/lib/switchman/call_super.rb

@@ -0,0 +1,18 @@
+module Switchman
+  module CallSuper
+    def super_method_above(method_name, above_module)
+      @super_methods ||= {}
+      @super_methods[[method_name, above_module]] ||= begin
+        method = method(method_name)
+        while method.owner != above_module
+          method = method.super_method
+        end
+        method.super_method
+      end
+    end
+
+    def call_super(method, above_module, *args, &block)
+      super_method_above(method, above_module).call(*args, &block)
+    end
+  end
+end

data/lib/switchman/engine.rb

@@ -84,6 +84,7 @@ module Switchman
         require "switchman/active_record/type_caster"
         require "switchman/active_record/where_clause_factory"
         require "switchman/arel"
+        require "switchman/call_super"
         require "switchman/rails"
         require "switchman/shackles/relation"
         require "switchman/shard_internal"
@@ -134,9 +135,10 @@ module Switchman
         ::ActiveRecord::Relation.prepend(ActiveRecord::Calculations)
         ::ActiveRecord::Relation.include(ActiveRecord::FinderMethods)
         ::ActiveRecord::Relation.include(ActiveRecord::QueryMethods)
+        ::ActiveRecord::Relation.prepend(Shackles::Relation)
         ::ActiveRecord::Relation.prepend(ActiveRecord::Relation)
         ::ActiveRecord::Relation.include(ActiveRecord::SpawnMethods)
-        ::ActiveRecord::Relation.prepend(Shackles::Relation)
+        ::ActiveRecord::Relation.include(CallSuper)
 
         if ::Rails.version >= '5'
           ::ActiveRecord::Relation::WhereClauseFactory.prepend(ActiveRecord::WhereClauseFactory)

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -190,6 +190,7 @@ files:
 - app/models/switchman/shard_internal.rb
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
+- db/migrate/20161206323434_add_back_default_string_limits_switchman.rb
 - lib/switchman.rb
 - lib/switchman/action_controller/caching.rb
 - lib/switchman/active_record/abstract_adapter.rb
@@ -217,6 +218,7 @@ files:
 - lib/switchman/active_record/where_clause_factory.rb
 - lib/switchman/active_support/cache.rb
 - lib/switchman/arel.rb
+- lib/switchman/call_super.rb
 - lib/switchman/connection_pool_proxy.rb
 - lib/switchman/database_server.rb
 - lib/switchman/default_shard.rb
@@ -246,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -254,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic