switchman 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f0444c8114ea5df8627ea4124a5c99c0aafd64840493f6e410fade341bedb24
-  data.tar.gz: 44176439003933f030ba0eac73b46dbe7aa6a9a9712c4a9359027d20c7948296
+  metadata.gz: ec8bd036f45f143718da9a25f56578e9d79217ce053df66eb828eafe5f2edd15
+  data.tar.gz: '0236808209e855742dc8caaf113176d6b6045db37c782c0e6eff69e8ae422370'
 SHA512:
-  metadata.gz: 2771dd0ecf117e53a327a9c9092b6efca169fc9dfadc63efc486d401c00646eda3e2a819d3a783ac2be4cd971929366f2c6187fffe5b48f8f674c6cc94eea333
-  data.tar.gz: a2eaae7a569c79abdd0658390d28d3272767d586a78c3bf19bf616eeaefe65ca774d0d6d5ff49a4241cfc7149f274881f42da5dd6d791fb98c9aa97a98af463c
+  metadata.gz: a97ccc3066a172dc3261008b7ceca6e25dc8d352cbaec9ea1e3db383ce7a0cd4fe188f74522e503e16e40c60709338953671e1e4e99c90a46d13079546abea3a
+  data.tar.gz: 62a28505e8c5fd3731de3d5ccf84b06d446b3adb9609f8cd5d14505b8cce9d9af608f44395ea6665ff6e8579facf22f7ceb6fbb3f5ec30a290dbdc8844efe75d

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -161,12 +161,13 @@ module Switchman
 
       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)
+        # (differs from quote_table_name_with_shard below by no logic to
+        # explicitly qualify the table)
         quote_column_name(name)
       end
 
-      def quote_table_name name
+      def quote_table_name(name)
+        return quote_local_table_name(name) if @use_local_table_name
         name = ::ActiveRecord::ConnectionAdapters::PostgreSQL::Utils.extract_schema_qualified_name(name.to_s)
         if !name.schema && use_qualified_names?
           name.instance_variable_set(:@schema, shard.name)
@@ -174,6 +175,13 @@ module Switchman
         name.quoted
       end
 
+      def with_local_table_name
+        @use_local_table_name = true
+        yield
+      ensure
+        @use_local_table_name = false
+      end
+
       def foreign_keys(table_name)
         schema = shard.name if use_qualified_names?
 

data/lib/switchman/active_record/query_methods.rb

@@ -224,19 +224,7 @@ module Switchman
       end
 
       def arel_columns(columns)
-        columns.flat_map do |field|
-          if (Symbol === field || String === field) && (klass.has_attribute?(field) || klass.attribute_alias?(field)) && !from_clause.value
-            klass.arel_attribute(field, table)
-          elsif Symbol === field
-            # the rest of this is pulled from AR - the only change is from quote_table_name to quote_column_name here
-            # otherwise qualified names will add the schema to a column
-            connection.quote_column_name(field.to_s)
-          elsif Proc === field
-            field.call
-          else
-            field
-          end
-        end
+        connection.with_local_table_name { super }
       end
 
       # semi-private

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.13.2"
+  VERSION = "1.13.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties