dataduck 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4c2dcce049fc3bf3c8d9825b07154ffe0bdf5c
-  data.tar.gz: 0759d5be8059eb22e08f85367fb15df1c601bb47
+  metadata.gz: 3699a208eb034218604e769002f04ccf9abdb1cc
+  data.tar.gz: e2be32191496db32f1102515ff139d00a00dc888
 SHA512:
-  metadata.gz: dc9a7a2a94b204ecc367da5666520dfdfc06129ff7118821c873b275a8fe6f55bffa5bda78380dd6b34aa603612e68b35e646c9d4e40b6f817875f7bd9d50ce2
-  data.tar.gz: 91b3769be124f595411bf55b53359d6fc2914db6c44752bd514750ac1be848b94b8ee2317a0546eecf04303ccc18e4a58279ec6a24a5b67c4e49e2b6903ebb5b
+  metadata.gz: 058285c16c15488abc3bc721fa8ed27c6a4b13330d0e6cfaf272a7912566690518ac4aafd8a22d3a44304795a073e80e40fd8d6a8f92811fd1a0d0b05f5c87d0
+  data.tar.gz: 9cc2c2335d8c49b685b7825c00f4515139ee3fa46d266c825755f686df4fed43cb35aea63eb1102306bd7ce9cd964585e835bdcdf9b991ce9f10ec98d86ea0a8

data/lib/dataduck/table.rb

@@ -120,8 +120,8 @@ module DataDuck
       base_query = source_spec.has_key?(:query) ? source_spec[:query] :
          "SELECT #{ escape_char }#{ source_spec[:columns].sort.join(escape_char + ',' + escape_char) }#{ escape_char } FROM #{ source_spec[:table_name] }"
 
-      extract_by_clause = ""
-      limit_clause = ""
+      extract_part = ""
+      limit_part = self.limit_clause
 
       if self.extract_by_column
         if destination.table_names.include?(self.building_name)
@@ -129,15 +129,27 @@ module DataDuck
           extract_by_value = destination.query("SELECT MAX(#{ extract_by_column_without_table }) AS val FROM #{ self.building_name }").first
           extract_by_value = extract_by_value.nil? ? nil : extract_by_value[:val]
 
-          if extract_by_value
-            extract_by_clause = "WHERE #{ self.extract_by_column } >= '#{ extract_by_value }'"
-          end
+          extract_part = self.extract_by_clause(extract_by_value)
         end
+      end
+
+      [base_query, extract_part, limit_part].join(' ').strip
+    end
 
-        limit_clause = self.batch_size ? "ORDER BY #{ self.extract_by_column } LIMIT #{ self.batch_size }" : ""
+    def extract_by_clause(value)
+      if value
+        "WHERE #{ self.extract_by_column } >= '#{ value }'"
+      else
+        ""
       end
+    end
 
-      [base_query, extract_by_clause, limit_clause].join(' ').strip
+    def limit_clause
+      if self.extract_by_column && self.batch_size
+        "ORDER BY #{ self.extract_by_column } LIMIT #{ self.batch_size }"
+      else
+        ""
+      end
     end
 
     def indexes

data/lib/dataduck/version.rb

@@ -1,6 +1,6 @@
 module DataDuck
   VERSION_MAJOR = 0
   VERSION_MINOR = 5
-  VERSION_PATCH = 2
+  VERSION_PATCH = 3
   VERSION = [VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataduck
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jeff Pickhardt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler