idata 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e01ecdfe5b0d94ddb4f503305f73177fcbeabc4
-  data.tar.gz: 0a053ddd16efb8b99f91a967a99a448dcd878e64
+  metadata.gz: f09fd4a5e2e638192e76b3ca2b703a78a2c8f53b
+  data.tar.gz: c23665e7c90d463a7b9df4fec2d1ef64c794ea9b
 SHA512:
-  metadata.gz: 334419ae0fbbfeebf3b3db0b91381007d78e9f4fb162346a6edb7755b0fe57aca5dd059e6cc74ed9d16241087ed9afe1f4c6b8e3d11c05a55faaa6f47a51ee9c
-  data.tar.gz: f4468fde70bb3ac1ff0218bc6d7d1392e23f3d67837358667460ebd0a54408adc74ee759a4a356a0133fdf9a022dfd9df0ab658b79443bddcacea4b76586d9f1
+  metadata.gz: 548ecde59f31bdc4afc5eb3bf674ffc858c19c1bc78f36f42a60a4e07d80e9cc103965fec1353718fba8254222f50dc4e363aa5aa811da47e9471b78f7e29ebe
+  data.tar.gz: 24f64401382182e5fb549d962ca7e9bac9ea403ff7ce447b0d353b5ccfe41f88229c6aff54a98ff12212b6d137c7dcba1b134e16838984b9966064585d4957ef

data/bin/ivalidate

@@ -25,7 +25,7 @@ $options = {
   :cross_reference => [],
   :query => [],
   :rquery => [],
-  :unique_by => []
+  :consistent_by => []
 }
 parser = OptionParser.new("", 24) do |opts|
   opts.banner = "\nProgram: Data Validator\nAuthor: MCKI\n\n"
@@ -34,10 +34,10 @@ parser = OptionParser.new("", 24) do |opts|
     $options[:unique] << v
   end
   
-  opts.on("--unique-by FIELD1|FIELD2", "Check if FIELD1 is unique within the scope of FIELD2") do |v|
-    $options[:unique_by] << v
+  opts.on("--consistent-by F1|F2,F3,F4...", "") do |v|
+    $options[:consistent_by] << v
   end
-
+  
   opts.on("--not-null FIELD", "Check if FIELD is not null or empty") do |v|
     $options[:not_null] << v
   end
@@ -164,6 +164,18 @@ ActiveRecord::Base.establish_connection(
   'timeout' => 15000
 )
 
+class String
+  def not_null_sql
+    a = self.split(/\s*,\s*/)
+    sql = a.map{|s|
+      "#{s} IS NOT NULL AND length(trim(#{s}::text)) <> 0"
+    }.join(" AND ")
+    
+    "(#{sql})"
+  end
+end
+
+
 puts "\nValidating #{$options[:table]}"
 puts "------------------------------------------"
 
@@ -193,11 +205,11 @@ $options[:unique].each do |field|
     puts "Checking uniqueness: #{field}"
 
     uniq_sql = <<-eos
-      UPDATE #{$options[:table]} SET #{$options[:log_to]} = array_to_string(string_to_array(#{$options[:log_to]}, ' || ') || string_to_array('#{field} is not unique', ' || '), ' || ')
-      WHERE #{field} IN (
-        SELECT #{field} FROM #{$options[:table]} GROUP BY #{field}
+      UPDATE #{$options[:table]} SET #{$options[:log_to]} = array_to_string(string_to_array(#{$options[:log_to]}, ' || ') || string_to_array('[#{field}] is not unique', ' || '), ' || ')
+      WHERE id IN (
+        SELECT unnest(array_agg(id)) FROM #{$options[:table]} GROUP BY #{field}
         HAVING count(*) > 1
-      ) AND #{field} IS NOT NULL AND length(trim(#{field})) <> 0;
+      ) AND #{field.not_null_sql};
     eos
     
     ActiveRecord::Base.connection.execute(uniq_sql)
@@ -207,9 +219,9 @@ $options[:unique].each do |field|
 end
 
 # --------------------------------------------------------------------
-# Check unique within scope
+# Check consitent by scope
 # --------------------------------------------------------------------
-$options[:unique_by].each do |fields|
+$options[:consistent_by].each do |fields|
   begin
     fields = fields.split(/\s*\|\s*/)
     
@@ -221,13 +233,14 @@ $options[:unique_by].each do |fields|
     puts "Checking uniqueness: #{f1} | #{f2}"
 
     uniq_sql = <<-eos
-      UPDATE #{$options[:table]} SET #{$options[:log_to]} = array_to_string(string_to_array(#{$options[:log_to]}, ' || ') || string_to_array('same #{f2} but with different #{f1}', ' || '), ' || ')
-      WHERE #{f2} IN
+      UPDATE #{$options[:table]} SET #{$options[:log_to]} = array_to_string(string_to_array(#{$options[:log_to]}, ' || ') || string_to_array('same [#{f2}] but with different #{f1}', ' || '), ' || ')
+      WHERE id IN
       (
-        SELECT #{f2} FROM #{$options[:table]}
+        SELECT unnest(array_agg(id)) FROM #{$options[:table]}
+        WHERE #{f1.not_null_sql} AND #{f2.not_null_sql}
         GROUP BY #{f2}
         HAVING COUNT(distinct #{f1}) > 1
-      ) AND #{f1} IS NOT NULL AND length(trim(#{f1})) <> 0 AND #{f2} IS NOT NULL AND length(trim(#{f2})) <> 0;
+      );
     eos
     
     ActiveRecord::Base.connection.execute(uniq_sql)
@@ -236,7 +249,6 @@ $options[:unique_by].each do |fields|
   end
 end
 
-
 # --------------------------------------------------------------------
 # Check not-null field
 # --------------------------------------------------------------------

data/lib/idata/version.rb

@@ -1,3 +1,3 @@
 module Idata
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idata
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Nghi Pham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler