alterity 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b468009cfd8631b397ea59fcb1750aada7238d5b8910f6cc492cf4778bdc2fa6
-  data.tar.gz: 02e17258c42233d8198ad62cf15841d6c3fe78b4b2730f64100e1771693686a1
+  metadata.gz: 1e235d55d20337f7ff9bf2b4eed178c3585c4ff682bda637a34339c507644438
+  data.tar.gz: b41b2d051afdbb66a42f5ce00e2daff2b8e9b4f8935fa3c9f01e64ab0148d9e4
 SHA512:
-  metadata.gz: 8929653022fbcec5f31c5583c619d252547928319276b020021404ad38cdbf2a2fae1861f9748009fcc97f99c0bc7a07f698397d6c8d20d41bbd96251b7a3693
-  data.tar.gz: ec349e1dfee9361ef937e55fe8911da437fad1c7dfc74446ff7f7ce2608943e0755f238297e5073f8786b2a6a0d9dc71c6785a1b91f1d7b04efe4b4a548a1b46
+  metadata.gz: 749cd02d5f7b2b6feb3e5e3b63c52274f701946cc03fd067b51f5c4214d7a2c73fab365ca329323058d1fb7c09999d3c1c7a8608bcb9574faa406bc244ad08cd
+  data.tar.gz: a0234815613fe77cf4db1950b8ef72de5c0def70b6abe45394c4efa1d5c7b1154d99454f81d9babcd8f00f58cbdf63edcd2f9cb181c22102e08cbaf7aa15691e

data/lib/alterity.rb

@@ -54,6 +54,10 @@ class Alterity
     def prepare_replicas_dsns_table
       return if config.replicas_dsns_table.blank?
 
+      dsns = config.replicas_dsns.dup
+      # Automatically remove master
+      dsns.reject! { |dsn| dsn.split(",").include?("h=#{config.host}") }
+
       database = config.replicas_dsns_database
       table = "#{database}.#{config.replicas_dsns_table}"
       connection = ActiveRecord::Base.connection
@@ -67,11 +71,11 @@ class Alterity
         ) ENGINE=InnoDB
       SQL
       connection.execute "TRUNCATE #{table}"
-      return if config.replicas_dsns.empty?
+      return if dsns.empty?
 
       connection.execute <<~SQL
         INSERT INTO #{table} (dsn) VALUES
-         #{config.replicas_dsns.map { |dsn| "('#{dsn}')" }.join(',')}
+         #{dsns.map { |dsn| "('#{dsn}')" }.join(',')}
       SQL
     end
   end

data/lib/alterity/configuration.rb

@@ -23,9 +23,6 @@ class Alterity
             parts = dsn.split(",")
             # automatically add default port
             parts << "P=3306" unless parts.any? { |part| part.start_with?("P=") }
-            # automatically remove master
-            next if parts.include?("h=#{host}") && parts.include?("P=#{port}")
-
             parts.join(",")
           end.compact
         end

data/lib/alterity/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Alterity
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/bin/custom_config.rb

@@ -15,7 +15,12 @@ Alterity.configure do |config|
     table: "replicas_dsns",
     dsns: [
       "h=host1",
-      "h=host2"
+      "h=host2",
+      # we may encounter an app where the replica host is actually pointing to master;
+      # pt-osc doesn't deal well with this and will wait forever.
+      # So we're testing here that Alterity will detect that this is master (same as config.host),
+      # and will not insert it into the `replicas_dsns` table.
+      "h=#{ENV['MYSQL_HOST']}"
     ]
   )
 end

data/spec/bin/rails_app_migration_test.sh

@@ -56,7 +56,7 @@ bundle e rails g migration add_color_to_shirts color:string
 
 # Test default configuration works as expected
 bundle e rails db:migrate --trace
-rails runner 'Shirt.columns.map(&:name).include?("color") || exit(1)'
+bundle e rails runner 'Shirt.columns.map(&:name).include?("color") || exit(1)'
 
 # Now test custom command and replication setup
 cp ../spec/bin/custom_config.rb config/initializers/alterity.rb
@@ -66,3 +66,6 @@ bundle e rails g migration add_color2_to_shirts color2:string
 bundle e rails db:migrate --trace
 
 ruby ../spec/bin/test_custom_config_result.rb
+
+# Also testing what's in replicas_dsns, also checking that master was detected and removed.
+bundle e rails runner 'res=ActiveRecord::Base.connection.execute("select dsn from percona.replicas_dsns").to_a.flatten;p(res); res == ["h=host1,P=3306", "h=host2,P=3306"] || exit(1)'

data/spec/bin/test_custom_config_result.rb

@@ -2,7 +2,7 @@
 
 result = File.read("/tmp/custom_command_result.txt").downcase.strip
 
-expected_result = %({:host=>"127.0.0.1", :port=>nil, :username=>"root", :database=>"alterity_test", :replicas_dsns_database=>"percona", :replicas_dsns_table=>"replicas_dsns", :replicas_dsns=>["h=host1,P=3306", "h=host2,P=3306"]}
+expected_result = %({:host=>"127.0.0.1", :port=>nil, :username=>"root", :database=>"alterity_test", :replicas_dsns_database=>"percona", :replicas_dsns_table=>"replicas_dsns", :replicas_dsns=>["h=host1,P=3306", "h=host2,P=3306", "h=127.0.0.1,P=3306"]}
 shirts
 "ADD \\`color2\\` VARCHAR(255)").downcase.strip
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alterity
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Maximin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2