phenix 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a229b6de3443a5e8f572382ab1bb8600a4f1e9383c37f0283fffcd57a087bf
-  data.tar.gz: 4251712df756ee74b9caae72353c9f7e0b6aa0a92690b3efa700c9037692d037
+  metadata.gz: ae74806ff8278a94e7129e262c977eb9f8a4fe1bdf15f4010aa5c783c726611e
+  data.tar.gz: 257a4f7ad4dc019f64722bed3126147804420e831c9ab4f917027efe9cadf828
 SHA512:
-  metadata.gz: 8b51d7893f9e264814a39c2228d6ac6a4eff7add76727c1d29e61240996dc909bca0de5fdf790b46e31246acb9a90614e024c8625fa7b16cf0f6331c6ea99a3c
-  data.tar.gz: af507ea35341614a845082df406d3b040c9fb1b5ca31f5d510677b3194855c4d4bb5f61403dad35c1d68bfbe72c0e10312a20fcf11af5da98ebb9241aedc1887
+  metadata.gz: 4b399a58479278268d4135cb1014f798e521ed061a50f22995c6a267a04967805bb6a24bd291bc0d50c0c3288b9ca5002959655f487a6615f21beb0d074c1f99
+  data.tar.gz: eb46bf6ddc58543692f264f644a165669066056c5c703b5761a748fe33fd5961c0fdc3a20a187613f5a9db8a36c3c8fb97eebb4bc14fb3e548127c6a2a47da99

data/lib/phenix/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Phenix
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/phenix.rb

@@ -36,15 +36,25 @@ module Phenix
   def load_database_config(config_path = Phenix.database_config_path)
     erb_config = IO.read(config_path)
     yaml_config = ERB.new(erb_config).result
-    ActiveRecord::Base.configurations = Phenix.current_configuration = YAML.load(yaml_config)
+    begin
+      ActiveRecord::Base.configurations = Phenix.current_configuration = YAML.load(yaml_config, aliases: true)
+    rescue ArgumentError
+      ActiveRecord::Base.configurations = Phenix.current_configuration = YAML.load(yaml_config)
+    end
   end
 
   private
 
   def create_databases(with_schema)
+    # Ensure we've created _every_ database before attempting to populte them
+    # This avoids ActiveRecord caching issues if the cache maintains references
+    # to stale databases
     for_each_database do |name, conf|
       run_mysql_command(conf, "CREATE DATABASE IF NOT EXISTS #{conf['database']}")
-      ActiveRecord::Base.establish_connection(name.to_sym)
+    end
+
+    for_each_database do |name, conf|
+      ActiveRecord::Base.establish_connection(conf)
       populate_database if with_schema
     end
   end
@@ -64,7 +74,15 @@ module Phenix
   end
 
   def for_each_database
-    configuration_hashes = if ActiveRecord::VERSION::STRING < '6.1'
+    parse_configuration_hashes.each do |name, conf|
+      next if conf['database'].nil?
+      next if Phenix.skip_database.call(name, conf)
+      yield(name, conf)
+    end
+  end
+
+  def parse_configuration_hashes
+    if ActiveRecord::VERSION::STRING < '6.1'
       ActiveRecord::Base.configurations.to_h
     else
       # We need to get all the configurations and put them back into a hash
@@ -72,13 +90,6 @@ module Phenix
       ActiveRecord::Base.configurations
         .configurations
         .map { |c| [c.env_name, c.configuration_hash.with_indifferent_access] }
-        .to_h
-    end
-
-    configuration_hashes.each do |name, conf|
-      next if conf['database'].nil?
-      next if Phenix.skip_database.call(name, conf)
-      yield(name, conf)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phenix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pierre Schambacher
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler