switchman 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f68441314d99fc739f03cd1af70e938efa0d0803ff6f5c405aed15afea0798
-  data.tar.gz: 553846718daea03d833792d3ff079ee0ce2bddce63231f2e40262fe901c84949
+  metadata.gz: 730c18de3f2e731bbbdce7ff8405691a0530510fa62ef552ae526728c92f1572
+  data.tar.gz: 8fbf3a6f789e76816e08af306404c8c5f04be944d4525289be82d00502c2df34
 SHA512:
-  metadata.gz: 4d05aea36873a2d809b414ad9cceeb8e1ee3c0966acd7e67e3f941e3b971c685a3a7ad666d19b5a74edc47ba59025782a486c70c596d918998ef01a01c5b9f40
-  data.tar.gz: 02bb3d231398cae6966ec6d8f1ca5ce4101f529d55dc119ebcbd512077ab3c5887c3eb9309fc5a8aba2df7fcd5eb21fae9911c1c2b4c29cfc328653a52fa3d1f
+  metadata.gz: bf7bafe9382647ce00b1323c168ce49f48d5d8d7db68718d75a9a05f6c4f02557e439aa941b9876273c962936891c757f89422727a50ff4ec4a5a045e40b6e23
+  data.tar.gz: c84822183e7448b8a9b2db7c9400d91429756e2b2f470fd1183a68e0d914b448cc1afb97ae3981fdf21a4a6f82c1eefb959d19fa801d4ac78120d8d31e300790

data/app/models/switchman/shard_internal.rb

@@ -254,7 +254,21 @@ module Switchman
               pid, io_in, io_out, io_err = Open4.pfork4(lambda do
                 begin
                   Switchman.config[:on_fork_proc]&.call
-                  $0 = [$0, ARGV, name].flatten.join(' ')
+
+                  # set a pretty name for the process title, up to 128 characters
+                  # (we don't actually know the limit, depending on how the process
+                  # was started)
+                  # first, simplify the binary name by stripping directories,
+                  # then truncate arguments as necessary
+                  bin = File.basename($0)  # Process.argv0 doesn't work on Ruby 2.5 (https://bugs.ruby-lang.org/issues/15887)
+                  max_length = 128 - bin.length - name.length - 3
+                  args = ARGV.join(" ")
+                  if max_length >= 0
+                    args = args[0..max_length]
+                  end
+                  new_title = [bin, args, name].join(" ")
+                  Process.setproctitle(new_title)
+
                   with_each_shard(subscope, categories, options) { yield }
                   exception_pipe.last.close
                 rescue => e

data/lib/switchman/active_record/association.rb

@@ -76,15 +76,30 @@ module Switchman
 
     module Preloader
       module Association
-        if ::Rails.version >= "5.2"
+        if ::Rails.version >= "5.2" and ::Rails.version < "6.0"
           def run(preloader)
-            # TODO - can move associated_records_by_owner into this after 5.1 is gonzo
             associated_records_by_owner(preloader).each do |owner, records|
               associate_records_to_owner(owner, records)
             end
           end
         end
 
+        if ::Rails.version >= "6.0"
+          # Copypasta from Activerecord but with added global_id_for goodness.
+          def records_for(ids)
+            scope.where(association_key_name => ids).load do |record|
+              global_key = Shard.global_id_for(record[association_key_name], record.shard)
+              owner = owners_by_key[global_key.to_s].first
+              association = owner.association(reflection.name)
+              association.set_inverse_instance(record)
+            end
+          end
+
+          def records_by_owner
+            associated_records_by_owner
+          end
+        end
+
         def associated_records_by_owner(preloader = nil)
           owners_map = owners_by_key
 

data/lib/switchman/active_record/calculations.rb

@@ -121,7 +121,9 @@ module Switchman
           group_fields = group_attrs
         end
 
-        group_aliases = group_fields.map { |field| column_alias_for(field) }
+        # .clone below corrects for what I consider a Rails bug. column_alias_for modifies the string in place.
+        # to_s is because Rails 5 returns a string but Rails 6 returns a symbol.
+        group_aliases = group_fields.map { |field| column_alias_for(field.clone).to_s }
         group_columns = group_aliases.zip(group_fields).map { |aliaz, field|
           [aliaz, type_for(field), column_name_for(field)]
         }

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,21 +224,11 @@ 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 || String === field) && columns_hash.key?(field.to_s) && !from_value
-            arel_table[field]
-          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
+
+      def arel_column(columns)
+        connection.with_local_table_name { super }
       end
 
       # semi-private

data/lib/switchman/database_server.rb

@@ -40,8 +40,14 @@ module Switchman
       def database_servers
         unless @database_servers
           @database_servers = {}.with_indifferent_access
-          ::ActiveRecord::Base.configurations.each do |(id, config)|
-            @database_servers[id] = DatabaseServer.new(id, config)
+          if ::Rails.version >= '6.0'
+            ::ActiveRecord::Base.configurations.configurations.each do |config|
+              @database_servers[config.env_name] = DatabaseServer.new(config.env_name, config.config)
+            end
+          else
+            ::ActiveRecord::Base.configurations.each do |(id, config)|
+              @database_servers[id] = DatabaseServer.new(id, config)
+            end
           end
         end
         @database_servers

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.13.0"
+  VERSION = "1.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -21,7 +21,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,21 +51,21 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: shackles
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -238,14 +238,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic