dump 1.0.8 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDIxYTMyY2NlYzQxMmQwNTI5YjA1YTY3NGY5ZTRmOThkNGUwY2M2Zg==
+    ZmVhZTUyMjdlMGE4YWY5ODViOGNhMDA2NDljZTljZTA3MGNmMGVkNw==
   data.tar.gz: !binary |-
-    ZTE0MDYxNmY2Yzg4MWVlYTlkNTcwMzBlZTUwOWI2M2JhN2ZjNTVlNA==
+    NzJkMGE4NjAxYThiYzZhYWFmNTU0ODdmMWVkZTkwMjVjY2Q3NTBhMg==
 SHA512:
   metadata.gz: !binary |-
-    NmYzODJlMTkyYzEzNjUxMTE1MmZhZTE3ZjRlZTBjMWY0MDhjZTAzYzZiOWY1
-    YTdiNWEzMjA1NmRjNzBhZTBlMjJlNTVjZDNhMmI4NmViZmY1MTUwMmFjMzE3
-    MmViZmRjODUyMGFjMzAzZjE3MmM5NTI3MmRhYjk2MTA2YjRkYWU=
+    ZTAyZGM3YzNjNDk2YjJkMDAwMzIxMTY0OGRkZTdhMmRmOTQ1MGQyZmNiOWEy
+    Mjk1YmJjOGMwNzJmMjk2ZDUyZTcxZGJlN2U5ZDMzMTlmNTg1OWU1YjE4NmQ2
+    OWM5YWI2ODY0YWE4MjFkMDBlNzlmODliZjg3OWQ0YzdjODYxODI=
   data.tar.gz: !binary |-
-    OGM4YTJhMmMzOTYxNmQwZDE2MDJmY2I3NjYyMzU1ZmUxNzk2ZmVjNmM0YTY5
-    ZmU4ZjJjZWVjYWIwZTUyMGVkYTNmYjQ2ZGM3ZTU5NWM3OTEzOGRhYTNlNTYy
-    MDQxNTQzNWNjYzdhY2QyMzk5MzI0ZjhlNGUwYTBhYmVhZmJjNWY=
+    NzM2OWM4NjljYzY4YTg5YmM0NDg1ZWExYWQ1YjExMTNlYWExZjA4M2Y2MjMx
+    M2ZmYTdmMDQzZWY2ZDAwNTdkYTZkZTgyZjRhYWU1NGY2Njg4ZGIwMTgxMjk5
+    NGUxMTc1ZGY2NTdhODdjYzQxYmMwZTEwNDNlYjgzZmFiNzY1Nzk=

data/Gemfile

@@ -13,6 +13,7 @@ else
   if RUBY_VERSION == '1.8.7'
     gem 'pg', '0.17.1'
     gem 'i18n', '0.6.11'
+    gem 'highline', '~> 1.6.21'
   else
     gem 'pg'
   end

data/dump.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dump'
-  s.version     = '1.0.8'
+  s.version     = '1.1.0'
   s.summary     = %q{Rails app rake and capistrano tasks to create and restore dumps of database and assets}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/dump/table_manipulation.rb

@@ -112,13 +112,8 @@ module Dump
       if table_has_primary_column?(table) && row_count > chunk_size
         # adapted from ActiveRecord::Batches
         primary_key = table_primary_key(table)
-        quoted_primary_key =
-          "#{quote_table_name(table)}.#{quote_column_name(primary_key)}"
         select_where_primary_key =
-          "SELECT * FROM #{quote_table_name(table)}" \
-            " WHERE #{quoted_primary_key} %s" \
-            " ORDER BY #{quoted_primary_key} ASC" \
-            " LIMIT #{chunk_size}"
+          sql_select_where_primary_key_by_adapter(table, primary_key, chunk_size)
         rows = select_all_by_sql(select_where_primary_key % '>= 0')
         until rows.blank?
           rows.each(&block)
@@ -144,5 +139,21 @@ module Dump
     def connection
       ActiveRecord::Base.connection
     end
+
+    def sql_select_where_primary_key_by_adapter(table, primary_key, chunk_size)
+      quoted_primary_key =
+        "#{quote_table_name(table)}.#{quote_column_name(primary_key)}"
+      case connection.adapter_name.downcase
+      when 'sqlserver'
+        "SELECT TOP #{chunk_size} * FROM #{quote_table_name(table)}" \
+          " WHERE #{quoted_primary_key} %s" \
+          " ORDER BY #{quoted_primary_key} ASC"
+      else
+        "SELECT * FROM #{quote_table_name(table)}" \
+          " WHERE #{quoted_primary_key} %s" \
+          " ORDER BY #{quoted_primary_key} ASC" \
+          " LIMIT #{chunk_size}"
+      end
+    end
   end
 end

data/spec/dump/table_manipulation_spec.rb

@@ -205,20 +205,30 @@ describe Dump::TableManipulation do
       expect(i).to eq(@row_count)
     end
 
-    it 'gets rows in chunks if table has primary column and chunk size is less than row count' do
-      expect(self).to receive(:table_has_primary_column?).with('first').and_return(true)
-      expect(self).to receive(:table_chunk_size).with('first').and_return(100)
-      quoted_table_name = quote_table_name('first')
-      quoted_primary_key = "#{quoted_table_name}.#{quote_column_name(table_primary_key('first'))}"
-      sql = "SELECT * FROM #{quoted_table_name} WHERE #{quoted_primary_key} %s ORDER BY #{quoted_primary_key} ASC LIMIT 100"
-
-      expect(self).to receive(:select_all_by_sql).with(sql % '>= 0').and_return(@rows[0, 100])
-      5.times do |i|
-        last_primary_key = 100 + i * 100
-        expect(self).to receive(:select_all_by_sql).with(sql % "> #{last_primary_key}").and_return(@rows[last_primary_key, 100])
-      end
+    {
+      'whatever' =>
+        'SELECT * FROM [TN] WHERE [PK] %s ORDER BY [PK] ASC LIMIT 100',
+      'SQLServer' =>
+        'SELECT TOP 100 * FROM [TN] WHERE [PK] %s ORDER BY [PK] ASC',
+    }.each do |adapter_name, sql_template|
+      it 'gets rows in chunks if table has primary column and chunk size is less than row count' do
+        allow(connection).to receive(:adapter_name).and_return(adapter_name)
+        expect(self).to receive(:table_has_primary_column?).with('first').and_return(true)
+        expect(self).to receive(:table_chunk_size).with('first').and_return(100)
+        replacements = {
+          '[TN]' => quote_table_name('first'),
+          '[PK]' => "#{quote_table_name('first')}.#{quote_column_name(table_primary_key('first'))}",
+        }
+        sql = sql_template.gsub(/\[[A-Z]+\]/){ |m| replacements[m] }
+
+        expect(self).to receive(:select_all_by_sql).with(sql % '>= 0').and_return(@rows[0, 100])
+        5.times do |i|
+          last_primary_key = 100 + i * 100
+          expect(self).to receive(:select_all_by_sql).with(sql % "> #{last_primary_key}").and_return(@rows[last_primary_key, 100])
+        end
 
-      verify_getting_rows
+        verify_getting_rows
+      end
     end
 
     def verify_getting_rows_in_one_pass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dump
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar