sqlstmt 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 072940a8a22b7a409ac52eaa593fba523a4e03f1
-  data.tar.gz: d426eaf488465c1ba60e7f0af6709202b2572962
+  metadata.gz: cc9dca98f890921dd47fb0fd1930456ae42ab28b
+  data.tar.gz: 43eb016ff2365a7a810721cb182800a763662233
 SHA512:
-  metadata.gz: 84e55aeb1540111d0d70b2a974bda49acd6012d9d7f02e2120841af1f7e825cfcd2460f1ad06d62ea656354a2285ce5b8c5c5d240ff068f7f2f23ef87127b9f7
-  data.tar.gz: 2612756ffaa5877231f18b3f8ad9573c349145c4c1c0c9070e13164944c6929fffbfca5db33146ebe3b0a74bc809791ad97afa517de1b179e38a2d075bf21f16
+  metadata.gz: 46ca30c60e9e094770b38bdbe56cc95b725c47a463e49554fcc7aaab8594fffcabf7b94c020962cbc2ec7995268c1ebd1b0ab596bbdf0923e9f1aae482c89e53
+  data.tar.gz: d59e1ef5a4e09351086e8463cf611a2db94e91d4e60e66e75ae1a94ce0ff873cf94157fb54b5094e2adc5d7e076fc46fe7e6635ecf93fa3d30ee4500f8cae2af

data/lib/sqlstmt/from_query.rb

@@ -8,6 +8,7 @@ class FromQuery < Query
     @group_by = nil
     @order_by = nil
     @limit = nil
+    @having = []
   end
 
   def group_by(clause)
@@ -25,6 +26,11 @@ class FromQuery < Query
     self
   end
 
+  def having(*sql)
+    @having.concat(sql)
+    self
+  end
+
 private
   def verify_minimum_requirements
     super
@@ -36,12 +42,20 @@ private
     if value then " #{keywords} #{value}" else '' end
   end
 
+  def having_clause
+    if @having.empty?
+      ''
+    else
+      " HAVING #{@having.join(' AND ')}"
+    end
+  end
+
   def build_from_clause
     join_clause = build_join_clause
     group_clause = simple_clause('GROUP BY', @group_by)
     order_clause = simple_clause('ORDER BY', @order_by)
     limit_clause = simple_clause('LIMIT', @limit)
-    " FROM #{build_table_list}#{join_clause}#{build_where_clause}#{group_clause}#{order_clause}#{limit_clause}"
+    " FROM #{build_table_list}#{join_clause}#{build_where_clause}#{group_clause}#{order_clause}#{limit_clause}#{having_clause}"
   end
 end
 

data/test/select.dt.rb

@@ -20,6 +20,7 @@ class TestSelect < DohTest::TestGroup
     assert_equal('SELECT blah FROM source s LEFT JOIN other o ON s.blah_id = o.blah_id', Select.new.table('source s').left_join('other o', 's.blah_id = o.blah_id').field('blah').no_where.to_s)
     assert_equal('SELECT blah FROM source s LEFT JOIN other o USING (blah_id)', Select.new.table('source s').left_join_using('other o', 'blah_id').field('blah').no_where.to_s)
     assert_equal('SELECT blah,blee FROM source', Select.new.table('source').field('blah','blee').no_where.to_s)
+    assert_equal('SELECT blah FROM source HAVING blee > 0', Select.new.table('source').field('blah').no_where.having('blee > 0').to_s)
   end
 
   def test_duplicate_joins

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.15
 - !ruby/object:Gem::Dependency
   name: dohtest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.24
 description: build SQL statements in a modular fashion, one piece at a time; only
   used/tested with MySQL so far
 email:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: build SQL statements in a modular fashion, one piece at a time