i_dig_sql 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cf46c901868fcef273f122b0dde2d69aa3b45b
-  data.tar.gz: 0d06a069a7a363f35e0bb9192d01dea57a1d6412
+  metadata.gz: a7935c90bb6a2a1905d660337a7e4b5875c5a137
+  data.tar.gz: 9a33d2b2dc1021e457055d4afb1d898365b368df
 SHA512:
-  metadata.gz: ea09f6f7ef88f34014ac5fe5b82a82a17f9f907ad510c42af41635a957398e16cc99edaf2ab18e44e5e1aa30efc508012b15714d0b97e7103de1cd5329258cf0
-  data.tar.gz: 58bd212f61780380a162fc28e4abd7207967e3fdfedcc486924004606ff3e68d8011ce9a82633d32d4bffb299938232c7074dc9715dc6ebc45d8ddcc5f3782b7
+  metadata.gz: 7686a037ab4e9291ea9184f731b29c1e76226376f192a964929f7d91e321c14128e42562607b534430a94b343ec7d9d5aa733bce6d9468b73b1435a6c9c2b94e
+  data.tar.gz: c3df8799043ef5619baa0059fb732e9cd470073a6fcd9c1fc8df7a06036a5fdfccfe71384f0c5b6caa37d463ab88d4121d64cfd7a5b7143221cfa349bc5dd219

data/VERSION

@@ -0,0 +1 @@
+0.0.4

data/i_dig_sql.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", '~> 0'
-  spec.add_development_dependency "bacon", '~> 0'
+  spec.add_development_dependency "bundler" , "~> 1.5"
+  spec.add_development_dependency "rake"    , '~> 0'
+  spec.add_development_dependency "bacon"   , '~> 0'
+  spec.add_development_dependency "pry"     , '~> 0'
 end

data/lib/i_dig_sql/version.rb

@@ -1,3 +1,3 @@
 class I_Dig_Sql
-  VERSION = "0.0.2"
+  VERSION = `cat VERSION`
 end

data/lib/i_dig_sql.rb

@@ -1,19 +1,26 @@
 
 class I_Dig_Sql
 
+  Only_One_Where = Class.new(RuntimeError)
+
   class << self
   end # === class self ===
 
-  def initialize sql = nil, args = nil
+  def initialize sql = nil, *args
     @withs   = []
     @select  = nil
     @as      = nil
     @unions  = []
     @sql     = sql
-    @args    = args || []
+    @args    = args
     yield self if block_given?
   end
 
+  def args
+    @args
+  end
+  protected :args
+
   def AS o = :return
     if o == :return
       return @as if @as
@@ -24,15 +31,14 @@ class I_Dig_Sql
     self
   end
 
-  def WITH o
+  def WITH o, *args
     @withs << o
-
+    @args.concat(o.args) if o.is_a?(I_Dig_Sql)
+    @args.concat args
     self
   end
 
-  def comma o
-    WITH o
-  end
+  alias_method :comma, :WITH
 
   def SELECT str, *args
     @select = {:select=>str, :args=>args, :from=>nil, :where=>nil}
@@ -46,9 +52,21 @@ class I_Dig_Sql
     self
   end
 
-  def WHERE o
-    @select[:where] = o
+  def WHERE o, *args
 
+    if @select[:where]
+      raise Only_One_Where.new("Multiple use of WHERE: #{@select[:where]} |--| #{o}")
+    end
+
+    if args.size == 1 && args.first.is_a?(I_Dig_Sql)
+      sql = args.first.to_sql
+      o = "#{o} ( #{sql[:sql]} )"
+      @args.concat sql[:args]
+    else
+      @args.concat args
+    end
+
+    @select[:where] = o
     self
   end
 
@@ -94,7 +112,7 @@ class I_Dig_Sql
 
     s << "\n"
 
-    {:sql=>s, :args=>[]}
+    {:sql=>s, :args=>@args}
   end
 
 end # === class I_Dig_Sql ===

data/specs/i_dig_sql.rb

@@ -10,6 +10,10 @@ def sql o
   end
 end
 
+def args o
+  o.to_sql[:args]
+end
+
 describe ".new" do
 
   it "returns a I_Dig_Sql if passed a String" do
@@ -38,11 +42,24 @@ describe "#WITH()" do
     ^)
   end
 
+  it "accepts args" do
+    o = I_Dig_Sql.new
+    .WITH(" some_table AS (SELECT * FROM other_table WHERE id = ?) ", 1)
+    args(o).should == [1]
+  end
+
+  it "merges args from other I_Dig_Sql objects" do
+    other = I_Dig_Sql.new("SELECT * FROM main_table WHERE i = ?", 1).AS('cte1')
+
+    o = I_Dig_Sql.new
+    .WITH(other)
+    args(o).should == [1]  end
+
 end # === describe #WITH() ===
 
 describe "#comma" do
 
-  it "saves arg as a WITH statement" do
+  it "acts like a WITH statement" do
     o = I_Dig_Sql.new
     .WITH('cte1 AS ( SELECT * FROM table_1 ) ')
     .comma('cte2 AS ( SELECT * FROM table_2 )')
@@ -54,24 +71,92 @@ describe "#comma" do
                          ^)
   end
 
+  it "saves args" do
+    o = I_Dig_Sql.new
+    .WITH('cte1 AS ( SELECT * FROM table_1 ) ')
+    .comma('cte2 AS ( SELECT * FROM table_2 WHERE id = ?)', 2)
+
+    args(o).should == [2]
+  end
+
 end # === describe #comma ===
 
 describe "#to_sql" do
 
-  it "includes both WITH and SELECT statements" do
-    o = I_Dig_Sql.new
-    o.WITH("cte AS (SELECT * FROM other_table)")
-    o.SELECT(" parent_id ")
-    .FROM("main_table")
-    sql(o).should == sql(%^
-                         WITH cte AS (SELECT * FROM other_table)
-                         SELECT parent_id
-                         FROM main_table
-                         ^)
-  end
+  describe ":sql" do
+
+    it "includes both WITH and SELECT statements" do
+      o = I_Dig_Sql.new
+      o.WITH("cte AS (SELECT * FROM other_table)")
+      o.SELECT(" parent_id ")
+      .FROM("main_table")
+      sql(o).should == sql(%^
+                           WITH cte AS (SELECT * FROM other_table)
+                           SELECT parent_id
+                           FROM main_table
+                           ^)
+    end
+
+  end # === describe :sql ===
+
+  describe ":args" do
+
+    it "returns an array of arguments" do
+      o = I_Dig_Sql.new
+      .SELECT(" parent_id ")
+      .FROM("main_table")
+      .WHERE(" ? = ? AND b = ? ", 1, 2, 3)
+      args(o).should == [1,2,3]
+    end
+
+  end # === describe :args ===
+  
 
 end # === describe #to_sql ===
 
+describe "#WHERE" do
+
+  it "merges sql into string if arg is a I_Dig_Sql" do
+    other = I_Dig_Sql.new.SELECT("*").FROM("other")
+
+    o = I_Dig_Sql.new.SELECT("parent_id")
+    .FROM("main")
+    .WHERE("id IN", other)
+
+    sql(o).should == sql(%~
+      SELECT parent_id
+      FROM main
+      WHERE id IN (
+        SELECT * FROM other
+      )
+    ~)
+  end
+
+  it "merges args if arg is a I_Dig_Sql" do
+    other = I_Dig_Sql.new.SELECT("*").FROM("other")
+    .WHERE("id = ", 1)
+
+    o = I_Dig_Sql.new.SELECT("parent_id")
+    .FROM("main")
+    .WHERE("id IN", other)
+
+    args(o).should == [1]
+  end
+
+  it "raises exception if used more than once" do
+    lambda {
+      I_Dig_Sql.new
+      .SELECT('*')
+      .FROM('main')
+      .WHERE("id = 1")
+      .WHERE("id = 2")
+    }.should.raise(I_Dig_Sql::Only_One_Where)
+    .message.should.match(/Multiple use of WHERE:/)
+  end
+
+end # === describe #WHERE ===
+
+
 describe "String#i_dig_sql" do
 
   it "returns an I_Dig_Sql instance set to String" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i_dig_sql
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "\n  You probably want another gem: arel. Use that\n  to generate SQL
   using Ruby.\n  This gem only generates SELECT and WITH (ie CTE) statements/expressions.\n
   \ "
@@ -68,6 +82,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- VERSION
 - bin/test
 - i_dig_sql.gemspec
 - lib/i_dig_sql.rb