flydata 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de14c5ba0b4b0b3c1b98e93f9e41c59a32db18fd
-  data.tar.gz: 685e70c882291fe387d7aaf14657a879b8c1d73e
+  metadata.gz: 2092338e5191e9b77804e78ba3aef0a667d2fba2
+  data.tar.gz: f2f65e5850da6e1e77be386d8b1fdcf4ab3a6a00
 SHA512:
-  metadata.gz: c735cbf41f4e9448175bb38c5dac9b5e5365e7a8f9710f86e7399feab2eecd5e018165f2224e8749e8c7169941b33bc1a01e122d7eb1d510056010508c0a793a
-  data.tar.gz: efc559f6b9536c45078f63b1416fc5da759bbd99249176b51dc15e7ec4016a5dfb5942262db0e4a87d13ba843d90ae00a91a9b731d670881c5467b5b642fac87
+  metadata.gz: 693815184571882684724fdf9e0eab6f9f16142c335ddc0e47c2cdcd59adf0d8789ac7113f0796f64cbbd7aad3d2939ac325d13ba1a3bdb565f0b5d82b597df0
+  data.tar.gz: a2b9def6f55162b7098d34daa2b881b2919594ab642d772797caa6229d482a2b416fc976ec504010d0f59bd473ed5c2596eecff14112d9f9b072ffe1c0d2b1dc

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/flydata.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.3.14 ruby lib
+# stub: flydata 0.3.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.3.14"
+  s.version = "0.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/flydata/compatibility_check.rb

@@ -102,24 +102,24 @@ module Flydata
     def check_mysql_user_compat
       client = Mysql2::Client.new(@db_opts)
       grants_sql = "SHOW GRANTS"
-      correct_db = ["ON (\\*|#{@db_opts[:database]})","TO '#{@db_opts[:username]}"]
+      correct_db = ["ON (\\*|(`)?#{@db_opts[:database]}(`)?).","TO '#{@db_opts[:username]}"]
       necessary_permission_fields= ["SELECT","RELOAD","LOCK TABLES","REPLICATION SLAVE","REPLICATION CLIENT"]
       all_privileges_field= ["ALL PRIVILEGES"]
       result = client.query(grants_sql)
       # Do not catch MySQL connection problem because check should stop if no MySQL connection can be made.
       client.close
-      missing_priv = []
+      found_priv = []
       result.each do |res|
         # SHOW GRANTS should only return one column
         res_value = res.values.first
         if correct_db.all? {|perm| res_value.match(perm)}
           necessary_permission_fields.each do |priv|
-            missing_priv << priv unless res_value.match(priv)
+            found_priv << priv if res_value.match(priv)
           end
-          return true if missing_priv.empty? or all_privileges_field.all? {|d| res_value.match(d)}
+          return true if (necessary_permission_fields-found_priv).empty? or all_privileges_field.all? {|d| res_value.match(d)}
         end
       end
-      raise MysqlCompatibilityError, "The user '#{@db_opts[:username]}' does not have the correct permissions to run FlyData Sync\n    * These privileges are missing: #{missing_priv.join(", ")}"
+      raise MysqlCompatibilityError, "The user '#{@db_opts[:username]}' does not have the correct permissions to run FlyData Sync\n    * These privileges are missing: #{(necessary_permission_fields-found_priv).join(", ")}"
     end
 
     def check_mysql_protocol_tcp_compat

data/spec/flydata/compatibility_check_spec.rb

@@ -44,6 +44,66 @@ module Flydata
         "database" => "test_db"
       }
     end
+    describe "#check_mysql_user_compat" do
+      let(:client) { double('client') }
+      subject { MysqlCompatibilityCheck.new({},:default_mysql_cred) }
+      before do
+        allow(Mysql2::Client).to receive(:new).and_return(client)
+        allow(client).to receive(:close)
+      end
+
+      context "with all privileges for privileges all in one database" do
+        before do
+          allow(client).to receive(:query).and_return([{"Grants for test"=>"GRANT SELECT, LOCK TABLES, RELOAD, REPLICATION SLAVE, REPLICATION CLIENT ON `test_db`.* TO 'test'@'host"}])
+        end
+        it do
+          expect{subject.check_mysql_user_compat}
+        end
+      end
+      context "with missing privileges for privileges all in one database" do
+        before do
+          allow(client).to receive(:query).and_return([{"Grants for test"=>"GRANT SELECT, RELOAD, REPLICATION CLIENT ON `test_db`.* TO 'test'@'host"}])
+        end
+        it do
+          expect{subject.check_mysql_user_compat}.to raise_error(Flydata::MysqlCompatibilityCheck::MysqlCompatibilityError, /LOCK TABLES, REPLICATION SLAVE/)
+        end
+      end
+      context "with all privileges for privileges in between all and specific databases" do
+        before do
+          allow(client).to receive(:query).and_return([{"Grants for test"=>"GRANT RELOAD, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'test'@'host"},
+                                                       {"Grants for test"=>"GRANT SELECT, LOCK TABLES ON `test_db`.* TO 'test'@'host"}])
+        end
+        it do
+          expect{subject.check_mysql_user_compat}
+        end
+      end
+      context "with missing privileges for privileges in between all and specific databases" do
+        before do
+          allow(client).to receive(:query).and_return([{"Grants for test"=>"GRANT REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'test'@'host"},
+                                                       {"Grants for test"=>"GRANT SELECT, LOCK TABLES ON `test_db`.* TO 'test'@'host"}])
+        end
+        it do
+          expect{subject.check_mysql_user_compat}.to raise_error(Flydata::MysqlCompatibilityCheck::MysqlCompatibilityError, /RELOAD/)
+        end
+      end
+      context "with all privileges for privileges in all databases" do
+        before do
+          allow(client).to receive(:query).and_return([{"Grants for test"=>"GRANT SELECT, LOCK TABLES, RELOAD, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'test'@'host"}])
+        end
+        it do
+          expect{subject.check_mysql_user_compat}
+        end
+      end
+      context "with missing privileges for privileges in all databases" do
+        before do
+          allow(client).to receive(:query).and_return([{"Grants for test"=>"GRANT RELOAD, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'test'@'host"}])
+        end
+        it do
+          expect{subject.check_mysql_user_compat}.to raise_error(Flydata::MysqlCompatibilityCheck::MysqlCompatibilityError, /SELECT, LOCK TABLES/)
+        end
+      end
+
+    end
     describe "#check_mysql_binlog_retention" do
       context "on on-premise mysql server" do
         subject { MysqlCompatibilityCheck.new({},:default_mysql_cred) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Koichi Fujikawa