idata 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e16b69f104f9c8098ea825a6f577d72fc69da11
-  data.tar.gz: 34f311bac4c9a547c2885199de374330c5e6ac5f
+  metadata.gz: 7615b5632f23a4d6a9f12ae44516ba1a985c71d9
+  data.tar.gz: 1de25681e830eba21537288a82a36b5d0a4658e6
 SHA512:
-  metadata.gz: 2b6f9a1013a17610307ca5019811981a83e0c87ba31cc3cf46e371434b244bdd7456f8c3674df11466e5f38a72333cedbe2647136ee06f349e8531c59f90a461
-  data.tar.gz: fc7a3349bc137e8d5d8a60b54fd919a6d7d5bf65bf05ee366095d9cb623e5678c945879c29612901e8f30b54bd3d43c2b2c05f22f3e072c5b0df7b5d8e65c766
+  metadata.gz: 8c38b43eac63a08f792b2fee967ec6aaa59e12e446a92641f4c5c7fb6a783ff210ac2925ba5051d4a27b2e7c0bd7e7f1678a6e7df43d9040d5294c44a0fa13a1
+  data.tar.gz: 7f8a19d9c36edb2a5a1d2521b457cb631671755838f626f13b0f9f12339812c71ceebfb2af445350ef779158e6748fd4320115f537fcd4b3e8b934c800224eff

data/bin/iexport

@@ -219,7 +219,7 @@ end
 
 CSV.open($options[:output], "wb", :quote_char => $options[:quote_char], :col_sep => $options[:delim], :row_sep => $options[:linebreak], :force_quotes => $options[:quotes]) do |csv|
   if $options[:query]
-    scope = Product.find_by_sql($options[:query])
+    scope = ActiveRecord::Base.connection.execute($options[:query])
   else
     scope = Product.select($options[:select]).where($options[:where])
   end
@@ -227,14 +227,25 @@ CSV.open($options[:output], "wb", :quote_char => $options[:quote_char], :col_sep
   first = scope.first
   
   if first
-    csv << first.attributes.delete_if{|k,v| k.nil? || $options[:exclude].include?(k) }.keys if $options[:headers]
+    if $options[:query]
+      csv << first.delete_if{|k,v| k.nil? || $options[:exclude].include?(k) }.keys if $options[:headers]
+    else
+      csv << first.attributes.delete_if{|k,v| k.nil? || $options[:exclude].include?(k) }.keys if $options[:headers]      
+    end
   else
-    # only use .column_names when table is empty, to ensure fields match values
-    csv << Product.column_names if $options[:headers]
+    unless $options[:query]
+      # only use .column_names when table is empty, to ensure fields match values
+      csv << Product.column_names if $options[:headers]
+    end
   end
   
   scope.each do |item|
-    attrs = item.attributes.delete_if{|k,v| k.nil? || $options[:exclude].include?(k) }.values
+    if $options[:query]
+      attrs = item.delete_if{|k,v| k.nil? || $options[:exclude].include?(k) }.values
+    else
+      attrs = item.attributes.delete_if{|k,v| k.nil? || $options[:exclude].include?(k) }.values
+    end
+    
     if !$options[:quote_empty]
       attrs.map!{|e| e == "" ? nil : e }
     end

data/lib/idata/version.rb

@@ -1,3 +1,3 @@
 module Idata
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idata
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Nghi Pham