activerecord-mysql-structure 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e8079dbc65050e8cd8e2533b2580eb1c6931ea3
-  data.tar.gz: e72fac50dbe88c0db284679643405d7d0a396e14
+  metadata.gz: fb2cc4a45fe2ff12dbbc37559613548fd347c3c2
+  data.tar.gz: 796b0354d817c2d1dcbe262bd13afec01f61a89a
 SHA512:
-  metadata.gz: cc78a906a23c9009aba879cdb885b5db1bfedd9fa53154d13bfb117904dc10e513ef849d17577d4c70c6259be80cb87701933fdd4467ce95a63416243e25fcc7
-  data.tar.gz: 1df09131d3bb0c325a1dd1a73320e0e2b2bae84f6933505945c07fea7c0af432c8e742fc3b979fea2696d723ff8ff2b9f1208785f05bb3386fafc6ccee83955e
+  metadata.gz: ad93e0ae55774a145eddcb6724857008d2bf0d7b1e784d0968259e7899c29b9eda835ae418a827407ee2890f98099405089051b1e00449ef65efd9d4d835f2f2
+  data.tar.gz: 9ec8b022a26ee1cef07503939f7b22716be498a08d8ce23c7735b282e9139b46155710ce2078349183a494540a88e1e8a9db8e57d01b0de5c351226c99423a0e

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+before_install:
+- travis_retry gem install bundler -v 1.7
 rvm:
   - 1.9.3
   - 2.1.2

data/lib/activerecord-mysql-structure/active_record/v3/connection_adapters/abstract_mysql_adapter.rb

@@ -3,20 +3,24 @@ require 'active_record/connection_adapters/abstract_mysql_adapter'
 module ActiveRecord
   module ConnectionAdapters
     class AbstractMysqlAdapter < AbstractAdapter
-
-      # Override this to add DROP TABLE IF EXISTS statements to each CREATE TABLE
+      # Override this to disable FOREIGN_KEY_CHECK at the start of the structure file
+      # and re-enable it at the end and to add DROP TABLE IF EXISTS statements to each CREATE TABLE
       def structure_dump #:nodoc:
         if supports_views?
           sql = "SHOW FULL TABLES WHERE Table_type = 'BASE TABLE'"
         else
           sql = "SHOW TABLES"
         end
-
-        select_all(sql).map { |table|
+        # https://lists.mysql.com/announce/166
+        # only disable FOREIGN_KEY_CHECK when mysql version is 4.0.14 or later
+        structure = "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n\n"
+        structure += select_all(sql).map { |table|
           table.delete('Table_type')
           sql = "SHOW CREATE TABLE #{quote_table_name(table.to_a.first.last)}"
           "DROP TABLE IF EXISTS #{quote_table_name(table.to_a.first.last)};\n\n" + exec_query(sql).first['Create Table'] + ";\n\n" # CHANGE 1 of 2 FROM RAILS
         }.join.gsub(/\s+AUTO_INCREMENT=\d+\s+/, ' ') # CHANGE 2 of 2 FROM RAILS
+        structure += "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;\n\n"
+        structure
       end
 
       def dump_schema_information #:nodoc:

data/lib/activerecord-mysql-structure/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Mysql
     module Structure
-      VERSION = '0.0.2'
+      VERSION = '0.0.3'
     end
   end
 end

data/spec/activerecord/mysql/structure_spec.rb

@@ -26,6 +26,14 @@ describe ActiveRecord::Mysql::Structure do
         }]
       end
 
+      it 'starts with FOREIGN_KEY_CHECKS disable' do
+        expect(adapter.structure_dump.lines.to_a[0]).to eq "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n"
+      end
+
+      it 'includes FOREIGN_KEY_CHECKS re-enable at the end' do
+        expect(adapter.structure_dump.lines.to_a[-2]).to eq "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;\n"
+      end
+
       it 'adds DROP TABLE IF EXISTS statements' do
         expect(adapter.structure_dump).to include 'DROP TABLE IF EXISTS `foobar`'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-structure
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Steve Rice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Cleaner structure.sql for MySQL.