gratan 0.3.1.beta2 → 0.3.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5425c0a9aa38492a759347509b0d2b85d2d1f2da
-  data.tar.gz: 11d798dab701b73a2d32ed932022df154b07e494
+  metadata.gz: adaa06d400536360b941da3222d0ae6530087401
+  data.tar.gz: e479b4afd4f858d641dbe8e99c21734db7d771b4
 SHA512:
-  metadata.gz: 6d7eea32c84fc8679e390bc02a536b1218a617250c7e2b9359eaf70a9fc4c3aeeae31aab313833f4871619110a9e43812fedbf2fd5074df90e330e1d0d2e2747
-  data.tar.gz: 62bbd5a36c27d1d69ad0c80f6fdfb1283544338a2688c933a66b2ff1c1712ebbac45e742c01dd6a145a1579ad9b7b0bf36a92800966265dd05b75fd49a4cd111
+  metadata.gz: 0ccef9c558666e71ae5ba4c4acd3a43a7475bdcc047fe030e19cee7b7d7e1af8086100f55c191f5112fdbadc89fb3b1ec18d05276cb276f87df069b0c62d4895
+  data.tar.gz: 4f713f1a7e9c57d0bb6f1874f03d4d79f602ebdc25972212d2af2d96fd1d80e4ad38e98e9d6abe0d3dd9d71953394464180fc678af085199643a315e9648c179

data/.travis.yml

@@ -1,26 +1,28 @@
 sudo: true
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-script:
+  - 2.3
+  - 2.4
+  - 2.5
+cache:
+  - bundler
+  - apt
+env:
+  matrix:
+    - MYSQL57=0 MYSQ_PORT=14406 # MySQL 5.6
+    - MYSQL57=1 MYSQ_PORT=14407 # MySQL 5.7
+before_script:
+  - sudo service mysql stop
   - bundle install
+  - docker-compose up -d
+  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -P $MYSQ_PORT ping; }
+  - for i in {1..60}; do mysql_ping && break; sleep 1; done
+script:
   - bundle exec rake
-env:
-  - MYSQL_VERSION=5.6.27
-before_install:
-  - gem update bundler
-install:
-  - "sudo apt-get -y remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5"
-  - "sudo apt-get -y autoremove"
-  - "sudo apt-get -y install libaio1"
-  - "wget -O mysql-$MYSQL_VERSION.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-$MYSQL_VERSION-debian6.0-x86_64.deb/from/http://cdn.mysql.com/"
-  - "sudo dpkg -i mysql-$MYSQL_VERSION.deb"
-  - "sudo cp -f /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server"
-  - "sudo ln -sf /opt/mysql/server-5.6/bin/* /usr/bin/"
-  - "sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf"
-  - "sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf"
-  - "sudo sed -i'' 's/basedir[^=]\\+=.*$/basedir = \\/opt\\/mysql\\/server-5.6/' /etc/mysql/my.cnf"
-  - "sudo sed -i'' 's/^socket *=.*$/socket = \\/tmp\\/mysql.sock/' /etc/mysql/my.cnf"
-  - "sudo /etc/init.d/mysql.server start"
+services:
+  - docker
+addons:
+  apt:
+    packages:
+      - mysql-client-core-5.6
+      - mysql-client-5.6

data/README.md

@@ -65,6 +65,8 @@ Usage: gratan [options]
         --ignore-not-exist
         --ignore-password-secret
         --skip-disable-log-bin
+        --override-sql-mode
+        --use-show-create-user
         --no-color
         --debug
         --auto-identify OUTPUT
@@ -73,7 +75,7 @@ Usage: gratan [options]
     -h, --help
 ```
 
-A default connection to a database can be established by setting the following environment variables:  
+A default connection to a database can be established by setting the following environment variables:
 - `GRATAN_DB_HOST`: database host
 - `GRATAN_DB_PORT`: database port
 - `GRATAN_DB_SOCKET`: database socket
@@ -136,6 +138,15 @@ user 'scott', 'localhost', identified: 'tiger' do
 end
 ```
 
+## Run tests
+
+```sh
+bundle install
+docker-compose up -d
+bundle exec rake
+# MYSQL57=1 bundle exec rake
+```
+
 ## Similar tools
 * [Codenize.tools](http://codenize.tools/)
 

data/bin/gratan

@@ -56,6 +56,8 @@ ARGV.options do |opt|
     opt.on(''  , '--ignore-not-exist')       {|v| options[:ignore_not_exist]       = true          }
     opt.on(''  , '--ignore-password-secret') {|v| options[:ignore_password_secret] = true          }
     opt.on(''  , '--skip-disable-log-bin')   {    options[:skip_disable_log_bin]   = true          }
+    opt.on(''  , '--override-sql-mode')      {    options[:override_sql_mode]      = true          }
+    opt.on(''  , '--use-show-create-user')   {    options[:use_show_create_user]   = true          }
     opt.on(''  , '--no-color')               {    options[:color]                  = false         }
     opt.on(''  , '--debug')                  {    options[:debug]                  = true          }
     opt.on(''  , '--auto-identify OUTPUT')   {|v| options[:identifier] = Gratan::Identifier::Auto.new(v, options) }

data/docker-compose.yml

@@ -0,0 +1,12 @@
+mysql56:
+  image: "mysql:5.6"
+  ports:
+    - "14406:3306"
+  environment:
+    MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+mysql57:
+  image: "mysql:5.7"
+  ports:
+    - "14407:3306"
+  environment:
+    MYSQL_ALLOW_EMPTY_PASSWORD: "yes"

data/lib/gratan/client.rb

@@ -245,6 +245,7 @@ class Gratan::Client
 
     begin
       @driver.disable_log_bin_local
+      @driver.override_sql_mode
       @updated = false
       yield
       updated = @updated

data/lib/gratan/driver.rb

@@ -20,6 +20,10 @@ class Gratan::Driver
     end
   end
 
+  def show_create_user(user, host)
+    query("SHOW CREATE USER #{quote_user(user, host)}").first.values.first
+  end
+
   def show_databases
     query("SHOW DATABASES").map {|i| i.values.first }
   end
@@ -205,6 +209,12 @@ class Gratan::Driver
     end
   end
 
+  def override_sql_mode
+    if @options[:override_sql_mode]
+      query('SET SQL_MODE = ""')
+    end
+  end
+
   private
 
   def query(sql)

data/lib/gratan/exporter.rb

@@ -18,8 +18,12 @@ class Gratan::Exporter
         next unless user =~ @options[:target_user]
       end
 
+      if @options[:use_show_create_user]
+        create_user = @driver.show_create_user(user, host)
+      end
+
       @driver.show_grants(user, host) do |stmt|
-        grants << Gratan::GrantParser.parse(stmt)
+        grants << Gratan::GrantParser.parse(stmt, create_user)
       end
     end
 

data/lib/gratan/grant_parser.rb

@@ -1,11 +1,12 @@
 class Gratan::GrantParser
-  def initialize(stmt)
+  def initialize(stmt, create_user = nil)
     @stmt = stmt.strip
+    @create_user = create_user
     @parsed = {}
   end
 
-  def self.parse(stmt)
-    parser = self.new(stmt)
+  def self.parse(stmt, create_user = nil)
+    parser = self.new(stmt, create_user)
     parser.parse!
   end
 
@@ -32,7 +33,12 @@ class Gratan::GrantParser
     @stmt.slice!(/\s+REQUIRE\s+(.+?)\z/)
     required = $1
 
-    if required
+    if @create_user
+      @create_user.slice!(/\s+REQUIRE\s+(\S+(?:\s+'[^']+')?)(?:\s+.+)?\s+PASSWORD\s+.+\z/)
+      required = $1
+    end
+
+    if required && required != 'NONE'
       @parsed[:require] = required.strip
     end
   end
@@ -41,6 +47,12 @@ class Gratan::GrantParser
     @stmt.slice!(/\s+IDENTIFIED BY\s+(.+?)\z/)
     identified = $1
 
+    if @create_user
+      @create_user.slice!(/\s+IDENTIFIED\s+WITH\s+'[^']+'\s+AS\s+('[^']+')/)
+      identified = $1
+      identified = "PASSWORD #{identified}" if identified
+    end
+
     if identified
       @parsed[:identified] = identified.strip
     end

data/lib/gratan/version.rb

@@ -1,3 +1,3 @@
 module Gratan
-  VERSION = '0.3.1.beta2'
+  VERSION = '0.3.1.beta3'
 end

data/spec/change/change_grants_2_spec.rb

@@ -40,7 +40,7 @@ end
       expect(show_grants).to match_array [
         "GRANT ALL PRIVILEGES ON *.* TO 'bob'@'localhost' IDENTIFIED BY PASSWORD '*531E182E2F72080AB0740FE2F2D689DBE0146E04' WITH GRANT OPTION",
         "GRANT USAGE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*23AE809DDACAF96AF0FD78ED04B6A265E05AA257' REQUIRE SSL",
-      ]
+      ].normalize
     end
   end
 
@@ -67,7 +67,7 @@ end
       expect(show_grants).to match_array [
         "GRANT ALL PRIVILEGES ON *.* TO 'bob'@'localhost' WITH GRANT OPTION",
         "GRANT USAGE ON *.* TO 'scott'@'localhost' REQUIRE SSL",
-      ]
+      ].normalize
     end
   end
 
@@ -94,7 +94,7 @@ end
       expect(show_grants).to match_array [
         "GRANT ALL PRIVILEGES ON *.* TO 'bob'@'localhost' WITH GRANT OPTION",
         "GRANT USAGE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
-      ]
+      ].normalize
     end
   end
 
@@ -121,7 +121,7 @@ end
       expect(show_grants).to match_array [
         "GRANT ALL PRIVILEGES ON *.* TO 'bob'@'localhost' REQUIRE SSL WITH GRANT OPTION",
         "GRANT USAGE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE X509",
-      ]
+      ].normalize
     end
   end
 
@@ -148,7 +148,7 @@ end
       expect(show_grants).to match_array [
         "GRANT ALL PRIVILEGES ON *.* TO 'bob'@'localhost'",
         "GRANT USAGE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL WITH GRANT OPTION MAX_QUERIES_PER_HOUR 1 MAX_UPDATES_PER_HOUR 2 MAX_CONNECTIONS_PER_HOUR 3 MAX_USER_CONNECTIONS 4",
-      ]
+      ].normalize
     end
   end
 end

data/spec/change/change_grants_3_spec.rb

@@ -76,7 +76,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -114,7 +114,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -158,7 +158,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/change/change_grants_expired_spec.rb

@@ -61,7 +61,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT (user) ON `mysql`.`user` TO 'scott'@'localhost'",
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
-      ]
+      ].normalize
     end
   end
 
@@ -96,7 +96,7 @@ end
         "GRANT SELECT (user) ON `mysql`.`user` TO 'scott'@'localhost'",
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -132,7 +132,7 @@ end
         "GRANT SELECT (user) ON `mysql`.`user` TO 'scott'@'localhost'",
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/change/change_grants_ignore_not_exist_spec.rb

@@ -49,7 +49,7 @@ end
 
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
-      ]
+      ].normalize
     end
   end
 

data/spec/change/change_grants_multi_hosts_spec.rb

@@ -64,7 +64,7 @@ end
         "GRANT SELECT, DELETE ON *.* TO 'scott'@'%' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT SELECT, DELETE ON *.* TO 'scott'@'127.0.0.1' REQUIRE SSL",
         "GRANT SELECT, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
-      ]
+      ].normalize
     end
   end
 
@@ -139,7 +139,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'%'",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/change/change_grants_regexp_spec.rb

@@ -80,7 +80,7 @@ end
           "GRANT UPDATE, DELETE ON `gratan_test`.`zoo` TO 'bob'@'localhost'",
           "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
           "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-        ]
+        ].normalize
       end
     end
   end
@@ -137,7 +137,7 @@ end
           "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
           "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
           "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-        ]
+        ].normalize
       end
     end
   end

data/spec/change/change_grants_spec.rb

@@ -76,7 +76,7 @@ end
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -113,7 +113,7 @@ end
         "GRANT SELECT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE (host) ON `mysql`.`user` TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -157,7 +157,7 @@ end
         "GRANT UPDATE (host) ON `mysql`.`user` TO 'scott'@'localhost'",
         "GRANT UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT USAGE ON *.* TO 'mary'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -203,7 +203,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/change/change_grants_target_spec.rb

@@ -76,7 +76,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
       end
   end
 
@@ -126,7 +126,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/change/change_grants_with_ignore_object_spec.rb

@@ -76,7 +76,7 @@ end
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -125,7 +125,7 @@ end
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/create/create_user_2_spec.rb

@@ -32,7 +32,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*6F498C84277BCC2089932690304BD4EDABC74547'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -111,7 +111,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*6F498C84277BCC2089932690304BD4EDABC74547'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 

data/spec/create/create_user_3_spec.rb

@@ -81,7 +81,7 @@ end
       expect(show_grants).to match_array [
         "GRANT ALL PRIVILEGES ON *.* TO 'bob'@'%' REQUIRE SSL",
         "GRANT SELECT ON `test`.* TO 'bob'@'%'",
-      ]
+      ].normalize
     end
   end
 

data/spec/create/create_user_multi_hosts_spec.rb

@@ -30,7 +30,7 @@ end
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'127.0.0.1'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'192.168.%' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'192.168.%'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/create/create_user_regexp_spec.rb

@@ -33,7 +33,7 @@ end
           "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
           "GRANT UPDATE, DELETE ON `gratan_test`.`zoo` TO 'scott'@'localhost'",
           "GRANT USAGE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
-        ]
+        ].normalize
       end
     end
   end

data/spec/create/create_user_spec.rb

@@ -38,7 +38,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -97,7 +97,7 @@ end
         "GRANT SELECT ON `test`.* TO 'bob'@'%'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -128,7 +128,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' WITH GRANT OPTION",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 

data/spec/create/create_user_target_spec.rb

@@ -36,7 +36,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 

data/spec/create/create_user_with_ignore_object_spec.rb

@@ -37,7 +37,7 @@ end
 
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
-      ]
+      ].normalize
     end
   end
 
@@ -70,7 +70,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/create/create_user_with_template_spec.rb

@@ -35,7 +35,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/drop/drop_user_2_spec.rb

@@ -55,7 +55,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -71,7 +71,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/drop/expire_user_spec.rb

@@ -127,7 +127,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -173,7 +173,7 @@ end
         "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
         "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
         "GRANT USAGE ON *.* TO 'bob'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/misc/misc_spec.rb

@@ -31,7 +31,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -40,6 +40,7 @@ end
       logger = Gratan::Logger.send(:new)
       logger.set_debug(true)
       expect(logger).to receive(:debug).with("[DEBUG] SET SQL_LOG_BIN = 0")
+      allow(logger).to receive(:debug).with('[DEBUG] SET SQL_MODE = ""')
       expect(logger).to receive(:debug).with("[DEBUG] SELECT user, host FROM mysql.user")
       expect(logger).to receive(:info).with("GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY 'tiger'")
       expect(logger).to receive(:info).with("GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost' IDENTIFIED BY 'tiger'")
@@ -73,7 +74,7 @@ end
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/misc/require_spec.rb

@@ -33,7 +33,7 @@ require '#{f.path}'
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 
@@ -71,7 +71,7 @@ require '#{f.path.sub(/\.rb\z/, '')}'
       expect(show_grants).to match_array [
         "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
         "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
-      ]
+      ].normalize
     end
   end
 end

data/spec/spec_helper.rb

@@ -23,12 +23,18 @@ RSpec.configure do |config|
   end
 end
 
+def mysql57?
+  ENV['MYSQL57'] == '1'
+end
+
+MYSQL_PORT = mysql57? ? 14407 : 14406
+
 def mysql
   client = nil
   retval = nil
 
   begin
-    client = Mysql2::Client.new(host: 'localhost', username: 'root')
+    client = Mysql2::Client.new(host: '127.0.0.1', username: 'root', port: MYSQL_PORT)
     retval = yield(client)
   ensure
     client.close if client
@@ -127,6 +133,12 @@ def show_grants
       client.query("SHOW GRANTS FOR #{user_host}").each do |row|
         grants << row.values.first
       end
+
+    end
+  end
+
+  if mysql57?
+    grants.each do |grant|
     end
   end
 
@@ -139,12 +151,20 @@ def client(user_options = {})
   end
 
   options = {
-    host: 'localhost',
+    host: '127.0.0.1',
     username: 'root',
+    port: MYSQL_PORT,
     ignore_user: IGNORE_USER,
     logger: Logger.new('/dev/null'),
   }
 
+  if mysql57?
+    options.update(
+      override_sql_mode: true,
+      use_show_create_user: true,
+    )
+  end
+
   if ENV['DEBUG']
     logger = Gratan::Logger.instance
     logger.set_debug(true)
@@ -176,3 +196,17 @@ def apply(cli = client)
     cli.apply(f.path)
   end
 end
+
+class Array
+  def normalize
+    if mysql57?
+      self.map do |i|
+        i.sub(/ IDENTIFIED BY PASSWORD '[^']+'/, '')
+         .sub(/ REQUIRE \w+\b/, '')
+         .sub(/ WITH GRANT OPTION [\w ]+\z/, ' WITH GRANT OPTION')
+      end
+    else
+      self
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.3.1.beta2
+  version: 0.3.1.beta3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -152,6 +152,7 @@ files:
 - README.md
 - Rakefile
 - bin/gratan
+- docker-compose.yml
 - gratan.gemspec
 - lib/gratan.rb
 - lib/gratan/client.rb
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Gratan is a tool to manage MySQL permissions using Ruby DSL.