switchman 3.5.3 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6fdd3a18ba6864a5a47f6b151f397fb244ac7357c5474fe7195eba633a74a59
-  data.tar.gz: 93f9d372028f3807e5396a8d9a75e6f6b267f18d6aa8d46588e471609ce5ac9f
+  metadata.gz: a1565732de1d00cf5e04683eb1d14da6e7a6407aab14dc036ff85b400de8fded
+  data.tar.gz: 6b47f28566414d1bacb7089d5a836c72246ddcdd864f0635950823a80418b09e
 SHA512:
-  metadata.gz: 05c39ae962b7585a60e1f896702fbdc0a600c183d4a2c31173d74d710b9616ecb7cedb2ad36b1b65c62a4ee7d6eb0438eb50d482d8fa05a8d6d06469bc9e0643
-  data.tar.gz: '020828a35e723d21186d51acdf60c507fb3a1622bc94a43c560cdbd3945a026d6510c395d5308afb42f2029e95972799b67891d11ed5e60ae88b790a84011b6c'
+  metadata.gz: 41352fccd2fe5346655e06820b8d0afe5f560480b3978f3bbca500dbc62e198a38b3fda435bef7d6d0836887343970a0a35b4fc866132e8331f7dcbfd6ba6cc8
+  data.tar.gz: 3d3fb827b20c7495b6bb70eaa054ed0a972a1ad823861abe7a00b5cf77d80cbbc58e3f9077d02acd3847e2b59ea24501abd525b7116d794dc626fded8430537b

data/lib/switchman/active_record/tasks/database_tasks.rb

@@ -10,6 +10,11 @@ module Switchman
           Switchman.cache.delete("default_shard")
           Shard.default(reload: true)
         end
+
+        def raise_for_multi_db(*)
+          # ignore; Switchman doesn't use namespaced tasks for multiple shards; it uses
+          # environment variables to filter which shards you want to target
+        end
       end
     end
   end

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = "3.5.3"
+  VERSION = "3.5.5"
 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.3
+  version: 3.5.5
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2023-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord