qx 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da84281b0de741a1780f3fa643daf02e3b691671
-  data.tar.gz: 65c38257753df4fb129630522ca3934c5d2943ba
+  metadata.gz: db585fa41cbb9f2c67f375cac4081cb4b4a7c3f2
+  data.tar.gz: 601b4cc468ec989ac5392ea66b80a3c4b48af75c
 SHA512:
-  metadata.gz: 62f33a4c224b0bc9d4603f01f3a868083308c535afb02af57a5d36e9f9dff989732f2dfe04e116b6ca24104aa8e56ffb7893bbc325e32c4f2ac74632e41536ee
-  data.tar.gz: 7616b07ac34d57f16651ad54e116de428213a9b768e5783cfcf45a220683d85d0382edce24e0377c26087049e6a7899d15a3568d0dc353bc962e23a97519a70c
+  metadata.gz: b24084742d4c6c918ad274258a3e4242c760af4499a83b50e135bb0f3b9f53b6c2cdc8b91625e212dbdbfd1f9a07bff2310872e4a87e3affc839eec0e1cf2f3d
+  data.tar.gz: 7144420b1b4b48bc65de1241deffe8102e098f2a34f174a80a74e77f26fe452586efcabf448316bf456fc997644214e653ee8f5f88f6b314d18fe7c5b67ada55

data/lib/qx.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'colorize'
+
 class Qx
 
   ## 
@@ -28,7 +29,11 @@ class Qx
 
   def self.parse_select(expr)
     str =  'SELECT'
-    str += " DISTINCT ON (#{expr[:DISTINCT_ON].map(&:to_s).join(', ')})" if expr[:DISTINCT_ON]
+    if expr[:DISTINCT_ON]
+      str += " DISTINCT ON (#{expr[:DISTINCT_ON].map(&:to_s).join(', ')})"
+    elsif expr[:DISTINCT]
+      str += " DISTINCT"
+    end
     str += ' ' + expr[:SELECT].map{|expr| expr.is_a?(Qx) ? expr.parse : expr}.join(", ")
     throw ArgumentError.new("FROM clause is missing for SELECT") unless expr[:FROM]
     str += ' FROM ' + expr[:FROM]
@@ -65,14 +70,16 @@ class Qx
       str = parse_select(expr)
     elsif expr[:DELETE_FROM]
       str =  'DELETE FROM ' + expr[:DELETE_FROM]
-      str += ' WHERE ' + expr[:WHERE].map{|w| "(#{w})"}.join(" AND ") if expr[:WHERE]
+      throw ArgumentError.new("WHERE clause is missing for DELETE FROM") unless expr[:WHERE]
+      str += ' WHERE ' + expr[:WHERE].map{|w| "(#{w})"}.join(" AND ")
       str += " RETURNING " + expr[:RETURNING].join(", ") if expr[:RETURNING]
     elsif expr[:UPDATE]
       str =  'UPDATE ' + expr[:UPDATE]
       throw ArgumentError.new("SET clause is missing for UPDATE") unless expr[:SET]
+      throw ArgumentError.new("WHERE clause is missing for UPDATE") unless expr[:WHERE]
       str += ' SET ' + expr[:SET]
       str += ' FROM ' + expr[:FROM] if expr[:FROM]
-      str += ' WHERE ' + expr[:WHERE].map{|w| "(#{w})"}.join(" AND ") if expr[:WHERE]
+      str += ' WHERE ' + expr[:WHERE].map{|w| "(#{w})"}.join(" AND ")
       str += " RETURNING " + expr[:RETURNING].join(", ") if expr[:RETURNING]
     end
     return str
@@ -101,6 +108,9 @@ class Qx
   #   format: 'csv' | 'hash'    give data csv style with Arrays -- good for exports or for saving memory
   def self.execute_raw(expr, options={})
     puts expr if options[:verbose]
+    if options[:copy_csv]
+      expr = "COPY (#{expr}) TO '#{options[:copy_csv]}' DELIMITER ',' CSV HEADER"
+    end
     result = ActiveRecord::Base.connection.execute(expr)
     result.map_types!(@@type_map) if @@type_map
     if options[:format] == 'csv'
@@ -114,6 +124,10 @@ class Qx
     return data
   end
 
+  def self.execute_file(path, data={}, options={})
+    Qx.execute_raw(Qx.interpolate_expr(File.open(path, 'r').read, data), options)
+  end
+
   # helpers for JSON conversion
   def to_json(name)
     name = name.to_s
@@ -129,6 +143,10 @@ class Qx
     @tree[:SELECT] = cols
     self
   end
+  def add_select(*cols)
+    @tree[:SELECT].push(cols)
+    self
+  end
   def self.insert_into(table_name, cols=[])
     self.new(INSERT_INTO: Qx.quote_ident(table_name), INSERT_COLUMNS: cols.map{|c| Qx.quote_ident(c)})
   end
@@ -156,6 +174,11 @@ class Qx
 
   # - SELECT sub-clauses
 
+  def distinct
+    @tree[:DISTINCT] = true
+    self
+  end
+
   def distinct_on(*cols)
     @tree[:DISTINCT_ON] = cols
     self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qx
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jay R Bolton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize