switchman 3.5.4 → 3.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 524551c3432d001d8cbfc030baa81bf534d75b4fd9ac8a5224a018bd31ef40d8
-  data.tar.gz: 0dbb04287be903ca4ec0c08df57fbc2f7913795baf3ae14cde806eb0c145b3a7
+  metadata.gz: b1d87b95f94fe959e18717de83ef0b39415dbf1479e57d4d3dde269aebde2f6e
+  data.tar.gz: 660a121e4d107cf2db3792eab635ee0847fdc7a950d0338281c4b63b77a5d4fc
 SHA512:
-  metadata.gz: 9fc1195f6ae2b2d5c8041610c3bd2bd814a25db507ead5263a5bbe42331d852d21f2b8b9bb143ea8ee78f0d16303386e3f42a2acda8aabbdd862efab3fe17e7e
-  data.tar.gz: c2a6ca3e3347342474a04e882c2b10635219404427b80b3c89d1d7a26686cc15355a8c3fcf60972ce2a8ed44a7fcdb020958c7611046653d5f53e47f087d85ca
+  metadata.gz: e09ee49ddff4718ca169890eff74e9d4bf4b8122e152762a6220b68093c185cbc7dc9c3bc82035a5f336fead51b98847f56ba2291da5ad2f98a355bc1cf04f90
+  data.tar.gz: 15772217715f825b21433adef3548e938ac891770809dc2eed5bf9384fa3e9b8259ccaed696841c5c442d195d73f7f465d0171834021d5d23fec747a0ca72fd4

data/lib/switchman/active_record/predicate_builder.rb

@@ -11,11 +11,11 @@ module Switchman
         end
       end
 
-      module AssociationQueryValue
+      module PolymorphicArrayValue
         def convert_to_id(value)
           case value
           when ::ActiveRecord::Base
-            value.id
+            value.send(primary_key(value))
           else
             super
           end

data/lib/switchman/engine.rb

@@ -87,11 +87,8 @@ module Switchman
         ::ActiveRecord::Relation.include(ActiveRecord::SpawnMethods)
         ::ActiveRecord::Relation.include(CallSuper)
 
-        ::ActiveRecord::PredicateBuilder::AssociationQueryValue.prepend(
-          ActiveRecord::PredicateBuilder::AssociationQueryValue
-        )
         ::ActiveRecord::PredicateBuilder::PolymorphicArrayValue.prepend(
-          ActiveRecord::PredicateBuilder::AssociationQueryValue
+          ActiveRecord::PredicateBuilder::PolymorphicArrayValue
         )
 
         ::ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend(ActiveRecord::Tasks::DatabaseTasks)

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = "3.5.4"
+  VERSION = "3.5.6"
 end

data/lib/tasks/switchman.rake

@@ -209,21 +209,28 @@ module Switchman
 
   module ActiveRecord
     module PostgreSQLDatabaseTasks
-      def structure_dump(filename, extra_flags = nil)
-        set_psql_env
-        args = ["--schema-only", "--no-privileges", "--no-owner", "--file", filename]
-        args.concat(Array(extra_flags)) if extra_flags
-        shard = Shard.current.name
-        serialized_search_path = shard
-        args << "--schema=#{Shellwords.escape(shard)}"
-
-        ignore_tables = ::ActiveRecord::SchemaDumper.ignore_tables
-        args += ignore_tables.flat_map { |table| ["-T", table] } if ignore_tables.any?
-
-        args << db_config.database
-        run_cmd("pg_dump", args, "dumping")
-        remove_sql_header_comments(filename)
-        File.open(filename, "a") { |f| f << "SET search_path TO #{serialized_search_path};\n\n" }
+      if ::Rails.version < "7.0"
+        def structure_dump(filename, extra_flags = nil)
+          set_psql_env
+          args = ["--schema-only", "--no-privileges", "--no-owner", "--file", filename]
+          args.concat(Array(extra_flags)) if extra_flags
+          shard = Shard.current.name
+          serialized_search_path = shard
+          args << "--schema=#{Shellwords.escape(shard)}"
+
+          ignore_tables = ::ActiveRecord::SchemaDumper.ignore_tables
+          args += ignore_tables.flat_map { |table| ["-T", table] } if ignore_tables.any?
+
+          args << db_config.database
+          run_cmd("pg_dump", args, "dumping")
+          remove_sql_header_comments(filename)
+          File.open(filename, "a") { |f| f << "SET search_path TO #{serialized_search_path};\n\n" }
+        end
+      else
+        def structure_dump(...)
+          ::ActiveRecord.dump_schemas = Switchman::Shard.current.name
+          super
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.5.6
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord