switchman 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 746fbf37c5142ff690f7641e15191b0d1ed6c1cc
-  data.tar.gz: 1a1f1d4cced641aec4980dcbfb41616ea0212bc5
+  metadata.gz: a8f9aba599d3ef529a78c94fd5e94c2f204b7ccc
+  data.tar.gz: 5bf0f3c88787aec47ed93c41069cc7ad06054423
 SHA512:
-  metadata.gz: def9f78de55963797ea0afdab709727d5a6bc88a4c11d9acc6de5bd076da4f5a53f6dfddff986b5a0bfaea1e7c358ac554fb5b82f5e54489b21d16333da60745
-  data.tar.gz: 76e372029e0ae7586a37c8aa4808e02b9329fe0608be7be5fce93117ee8d63e092953bd5be6566d924b3cfd02d86f6fb2d0d25dd4e0851e36f24cbbc5a6ed349
+  metadata.gz: b44289cf27c475ffacc928e691c6e0698b771ebc840d742ffab6e7e926bf728ebff2c574bb403df221cbf51bfc46eeea18b2a62bde62e1a847972228eefb9b65
+  data.tar.gz: bb774752360b5b84cfa665b8c13f1dd3bba7fe5a4bd09007d453309d8003699c8e0917e17e3452222410746aaee6088d95b1d9cbc3aa2e5bcdf76ffd260afafd

data/lib/switchman/active_record/abstract_adapter.rb

@@ -22,6 +22,10 @@ module Switchman
         @last_query_at = Time.now
       end
 
+      def quote_local_table_name(name)
+        quote_table_name(name)
+      end
+
       if ::Rails.version < '4'
         def dump_schema_information #:nodoc:
           sm_table = ::ActiveRecord::Migrator.schema_migrations_table_name

data/lib/switchman/active_record/attribute_methods.rb

@@ -30,7 +30,7 @@ module Switchman
               reflections.find { |_, r| r.belongs_to? && r.foreign_key.to_s == attr_name }.try(:last)
         rescue ::ActiveRecord::StatementInvalid
           # this is for when models are referenced in initializers before migrations have been run
-          nil
+          raise if connection.open_transactions > 0
         end
 
         def define_method_global_attribute(attr_name)

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -9,8 +9,12 @@ module Switchman
         select_values("SELECT * FROM unnest(current_schemas(false))")
       end
 
+      def use_qualified_names?
+        @config[:use_qualified_names]
+      end
+
       def tables(name = nil)
-        schema = shard.name if @config[:use_qualified_names]
+        schema = shard.name if use_qualified_names?
 
         query(<<-SQL, 'SCHEMA').map { |row| row[0] }
           SELECT tablename
@@ -23,7 +27,7 @@ module Switchman
         if ::Rails.version < '4.2'
           schema, table = ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::Utils.extract_schema_and_table(name.to_s)
           return false unless table
-          schema ||= shard.name if @config[:use_qualified_names]
+          schema ||= shard.name if use_qualified_names?
 
           binds = [[nil, table]]
           binds << [nil, schema] if schema
@@ -39,7 +43,7 @@ module Switchman
         else
           name = Utils.extract_schema_qualified_name(name.to_s)
           return false unless name.identifier
-          if !name.schema && @config[:use_qualified_names]
+          if !name.schema && use_qualified_names?
             name.instance_variable_set(:@schema, shard.name)
           end
 
@@ -55,7 +59,7 @@ module Switchman
       end
 
       def indexes(table_name)
-        schema = shard.name if @config[:use_qualified_names]
+        schema = shard.name if use_qualified_names?
 
         result = query(<<-SQL, 'SCHEMA')
            SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid
@@ -107,7 +111,7 @@ module Switchman
       end
 
       def index_name_exists?(table_name, index_name, default)
-        schema = shard.name if @config[:use_qualified_names]
+        schema = shard.name if use_qualified_names?
 
         exec_query(<<-SQL, 'SCHEMA').rows.first[0].to_i > 0
             SELECT COUNT(*)
@@ -121,11 +125,18 @@ module Switchman
         SQL
       end
 
+      def quote_local_table_name(name)
+        # postgres quotes tables and columns the same; just pass through
+        # (differs from quote_table_name below by no logic to explicitly
+        # qualify the table)
+        quote_column_name(name)
+      end
+
       def quote_table_name name
         if ::Rails.version < '4.2'
           schema, name_part = extract_pg_identifier_from_name(name.to_s)
 
-          if !name_part && @config[:use_qualified_names] && shard.name
+          if !name_part && use_qualified_names? && shard.name
             schema, name_part = shard.name, schema
           end
 
@@ -137,7 +148,7 @@ module Switchman
           end
         else
           name = Utils.extract_schema_qualified_name(name.to_s)
-          if !name.schema && @config[:use_qualified_names]
+          if !name.schema && use_qualified_names?
             name.instance_variable_set(:@schema, shard.name)
           end
           name.quoted

data/lib/switchman/active_record/reflection.rb

@@ -0,0 +1,15 @@
+module Switchman
+  module ActiveRecord
+    module Reflection
+      module AssociationReflection
+        # removes memoization - ActiveRecord::ModelSchema does that anyway;
+        # and in fact this is the exact change AR makes in 4.2+
+        if ::Rails.version < '4.2'
+          def quoted_table_name
+            klass.quoted_table_name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/switchman/arel.rb

@@ -1,6 +1,36 @@
 module Switchman
   module Arel
     module Visitors
+      module ToSql
+        def visit_Arel_Nodes_TableAlias *args
+          if ::Rails.version < '4.2'
+            o = args.shift
+            "#{visit o.relation, *args} #{quote_local_table_name o.name}"
+          else
+            o, collector = args
+            collector = visit o.relation, collector
+            collector << " "
+            collector << quote_local_table_name(o.name)
+          end
+        end
+
+        def visit_Arel_Attributes_Attribute *args
+          o = args.first
+          self.last_column = column_for(o) if ::Rails.version < '4.0'
+          join_name = o.relation.table_alias || o.relation.name
+          result = "#{quote_local_table_name join_name}.#{quote_column_name o.name}"
+          unless ::Rails.version < '4.2'
+            result = args.last << result
+          end
+          result
+        end
+
+        def quote_local_table_name name
+          return name if ::Arel::Nodes::SqlLiteral === name
+          @connection.quote_local_table_name(name)
+        end
+      end
+
       module PostgreSQL
         # the only difference is to remove caching (which only applies to Arel < 6.0/AR < 4.2)
         def quote_table_name name

data/lib/switchman/engine.rb

@@ -80,6 +80,7 @@ module Switchman
         require "switchman/active_record/persistence"
         require "switchman/active_record/query_cache"
         require "switchman/active_record/query_methods"
+        require "switchman/active_record/reflection"
         require "switchman/active_record/relation"
         require "switchman/active_record/spawn_methods"
         require "switchman/arel"
@@ -105,12 +106,14 @@ module Switchman
         ::ActiveRecord::ConnectionAdapters::QueryCache.send(:remove_method, :select_all)
 
         ::ActiveRecord::LogSubscriber.send(:include, ActiveRecord::LogSubscriber)
+        ::ActiveRecord::Reflection::AssociationReflection.prepend(ActiveRecord::Reflection::AssociationReflection)
         ::ActiveRecord::Relation.send(:include, ActiveRecord::Calculations)
         ::ActiveRecord::Relation.send(:include, ActiveRecord::FinderMethods)
         ::ActiveRecord::Relation.send(:include, ActiveRecord::QueryMethods)
         ::ActiveRecord::Relation.send(:include, ActiveRecord::Relation)
         ::ActiveRecord::Relation.send(:include, ActiveRecord::SpawnMethods)
 
+        ::Arel::Visitors::ToSql.prepend(Arel::Visitors::ToSql)
         ::Arel::Visitors::PostgreSQL.send(:include, Arel::Visitors::PostgreSQL) if ::Rails.version < '4.2'
       end
     end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.3.7"
+  VERSION = "1.3.8"
 end

data/spec/dummy/log/test.log

@@ -356775,3 +356775,41 @@ Migrating to AddDummyForeignKey (20150618035859)
    (0.3ms)  BEGIN
   SQL (0.3ms)  DELETE FROM "switchman_shards" WHERE "switchman_shards"."id" = $1  [["id", 1031]]
    (0.1ms)  COMMIT
+Connecting to database specified by database.yml
+   (0.9ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (11.1ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' LIMIT 1
+Connecting to database specified by database.yml
+   (0.4ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.4ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' LIMIT 1
+   (1.4ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.9ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' ORDER BY "switchman_shards"."id" ASC LIMIT 1
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (1.1ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.7ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' ORDER BY "switchman_shards"."id" ASC LIMIT 1
+   (0.1ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (1.0ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (1.1ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' ORDER BY "switchman_shards"."id" ASC LIMIT 1
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (1.1ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.6ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' ORDER BY "switchman_shards"."id" ASC LIMIT 1
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK

data/spec/lib/active_record/postgresql_adapter_spec.rb

@@ -3,21 +3,18 @@ require "spec_helper"
 module Switchman
   module ActiveRecord
     describe PostgreSQLAdapter do
+      before do
+        skip "requires PostgreSQL" unless ::ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+      end
+
       describe '#quote_table_name' do
         before do
-          skip "requires PostgreSQL" unless ::ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-          @config = ::ActiveRecord::Base.connection.instance_variable_get(:@config)
-          @prior_use_qualified_names = @config[:use_qualified_names]
-          @config[:use_qualified_names] = true
           shard = mock()
           shard.stubs(:name).returns('bob')
+          ::ActiveRecord::Base.connection.stubs(:use_qualified_names?).returns(true)
           ::ActiveRecord::Base.connection.stubs(:shard).returns(shard)
         end
 
-        after do
-          @config[:use_qualified_names] = @prior_use_qualified_names
-        end
-
         it 'should add schema if not included' do
           expect(::ActiveRecord::Base.connection.quote_table_name('table')).to eq '"bob"."table"'
         end
@@ -26,6 +23,17 @@ module Switchman
           expect(::ActiveRecord::Base.connection.quote_table_name('schema.table')).to eq '"schema"."table"'
         end
       end
+
+      context "table aliases" do
+        it "qualifies tables, but not aliases or columns" do
+          shard = mock()
+          shard.stubs(:name).returns('bob')
+          ::ActiveRecord::Base.connection.stubs(:use_qualified_names?).returns(true)
+          ::ActiveRecord::Base.connection.stubs(:shard).returns(shard)
+
+          expect(User.joins(:parent).where(id: 1).to_sql).to be_include %{* FROM "bob"."users" INNER JOIN "bob"."users" "parents_users" ON "parents_users"."id" = "users"."parent_id" WHERE "users"."id" = 1}
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -163,6 +163,7 @@ files:
 - lib/switchman/active_record/postgresql_adapter.rb
 - lib/switchman/active_record/query_cache.rb
 - lib/switchman/active_record/query_methods.rb
+- lib/switchman/active_record/reflection.rb
 - lib/switchman/active_record/relation.rb
 - lib/switchman/active_record/spawn_methods.rb
 - lib/switchman/active_support/cache.rb