mysqlknife 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53677c0c444917af983ac901c03052cdb29ed3e6
-  data.tar.gz: b87aee8249871d370a69661c93dc8e02a120f5b3
+  metadata.gz: 637c07907f66dc0ccc6d540823276a176f2d5d45
+  data.tar.gz: d24487597eda4c6b1d218230fdd0b97acf9f6100
 SHA512:
-  metadata.gz: 805c9aa77e5152d8971b3b6c9b214426917405463cd2fe77923e136ba46ae695b09e0eb0dc962e373294a5d980ee8be17e5bf196aacd51ab714e178e77d6bd4b
-  data.tar.gz: 126e56a02a2b9032016fdfd1ad8eaf0b009208a01d95a115a3e82ed707f8a3236740b60ca0787202824ab86da95591ab1b5116b3856512c555160defc6f306a2
+  metadata.gz: 922805c201c6072786be0af0ac1ff0c92c8575b204a23fa5c5e413a7c2c154bcf29fda6a7bd6aeaaed45cb6d25935e51e00a000cd66a7e53526c706c473d0c67
+  data.tar.gz: f7c8bcbd18d3eae2bce59fd14541821878281113c5002f6ce35a2cfce9ffbd9e5dbce7de50c34c62445440727bc6b1a1b529561c616b2381b6d19deee5967bd8

data/lib/mysqlknife/swap.rb

@@ -20,6 +20,8 @@ module Mysqlknife
       tables_from = tables_from.map { |f| f['name'] } if tables_from
       tables_to   = @conn_to.execute(@to.tables)
       tables_to   = tables_to.map { |t| t['name'] } if tables_to
+      views_from  = @conn_from.execute(@from.views)
+      views_to    = @conn_to.execute(@to.views)
 
       if tables_from && tables_to
         swap      = tables_from & tables_to
@@ -43,20 +45,22 @@ module Mysqlknife
       end
 
       # Drop views and create new views in another DB.
-      sql.concat(swap_views(@conn_from, @from, @to))
-      sql.concat(swap_views(@conn_to, @to, @from))
-    end
+      sql << @from.use
+      views_from.each do | view |
+        sql << @from.drop_view(view['name'])
+      end
+      views_to.each do | view |
+        sql << @from.create_view(view['name'], view['code'])
+      end
 
-    def swap_views(conn, from, to)
-      sql   = []
-      views = conn.execute(to.views)
-      if views
-        sql << to.use
-        views.each do | view |
-          sql << to.drop_view(view['name'])
-          sql << from.create_view(view['name'], view['code'])
-        end
+      sql << @to.use
+      views_to.each do | view |
+        sql << @to.drop_view(view['name'])
+      end
+      views_from.each do | view |
+        sql << @to.create_view(view['name'], view['code'])
       end
+
       sql
     end
   end

data/lib/mysqlknife/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Mysqlknife
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysqlknife
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Nicola Strappazzon C.