sqlstmt 0.1.0 → 0.1.1

data/lib/sqlstmt/delete.rb

@@ -0,0 +1,34 @@
+require 'sqlstmt/from_query'
+
+module SqlStmt
+
+class Delete < FromQuery
+  def initialize
+    super
+    @from_table = nil
+  end
+
+  def from(table)
+    @from_table = table
+    @tables.push(table)
+    self
+  end
+
+private
+  def verify_minimum_requirements
+    super
+    combined_table_count = @tables.size + @joins.size
+    raise SqlStmt::Error, "unable to build sql - must call :from when including multiple tables" if @from_table.nil? && (combined_table_count > 1)
+  end
+
+  def build_stmt
+    if @from_table
+      table_clause = " #@from_table"
+    else
+      table_clause = ''
+    end
+    "DELETE#{table_clause}#{build_from_clause}"
+  end
+end
+
+end

data/lib/sqlstmt/from_query.rb

@@ -0,0 +1,71 @@
+require 'sqlstmt/query'
+
+module SqlStmt
+
+class FromQuery < Query
+  force_deep_copy :joins
+
+  def initialize
+    super
+    @joins = []
+    @group_by = nil
+    @order_by = nil
+    @limit = nil
+  end
+
+  def join(table, expr)
+    @joins.push("JOIN #{table} ON #{expr}")
+    self
+  end
+
+  def join_using(table, *fields)
+    @joins.push("JOIN #{table} USING (#{fields.join(',')})")
+    self
+  end
+
+  def left_join(table, expr)
+    @joins.push("LEFT JOIN #{table} ON #{expr}")
+    self
+  end
+
+  def left_join_using(table, *fields)
+    @joins.push("LEFT JOIN #{table} USING (#{fields.join(',')})")
+    self
+  end
+
+  def group_by(clause)
+    @group_by = clause
+    self
+  end
+
+  def order_by(clause)
+    @order_by = clause
+    self
+  end
+
+  def limit(clause)
+    @limit = clause
+    self
+  end
+
+private
+  def verify_minimum_requirements
+    super
+    raise SqlStmt::Error, "unable to build sql - must call :table or :join (or one if it's variants)" if @tables.empty? && @joins.empty?
+    raise SqlStmt::Error, "unable to build sql - must call :table if using :join (or one if it's variants)" if @tables.empty? && !@joins.empty?
+  end
+
+  def simple_clause(keywords, value)
+    if value then " #{keywords} #{value}" else '' end
+  end
+
+  def build_from_clause
+    join_clause = if @joins.empty? then '' else " #{@joins.join(' ')}" end
+    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}"
+  end
+end
+
+end

data/lib/sqlstmt/insert_select.rb

@@ -1,10 +1,15 @@
-require 'sqlstmt/query'
+require 'sqlstmt/from_query'
+require 'sqlstmt/value_util'
 
 module SqlStmt
 
-class InsertSelect < FieldValueQuery
+class InsertSelect < FromQuery
+  force_deep_copy :values
+  include ValueUtil
+
   def initialize
     super
+    @values = []
     @into_table = nil
   end
 
@@ -16,13 +21,14 @@ class InsertSelect < FieldValueQuery
 private
   def verify_minimum_requirements
     super
-    raise SqlStmt::Error, "unable to build sql - must first call :into" if @into_table.nil?
+    raise SqlStmt::Error, "unable to build sql - must call :into" if @into_table.nil?
+    raise SqlStmt::Error, "unable to build sql - must call :field or :fieldq" if @fields.empty?
   end
 
   def build_stmt
     into_str = @fields.join(',')
     select_str = @values.join(',')
-    "INSERT INTO #@into_table (#{into_str}) SELECT #{select_str} FROM #{build_table_list}#{build_where_clause}"
+    "INSERT INTO #@into_table (#{into_str}) SELECT #{select_str}#{build_from_clause}"
   end
 end
 

data/lib/sqlstmt/query.rb

@@ -1,11 +1,11 @@
-require 'doh/core_ext/class/force_deep_copy'
+require 'doh/core_ext/force_deep_copy'
 require 'sqlstmt/error'
-require 'sqlstmt/to_sql'
 
 module SqlStmt
 
 class Query
   force_deep_copy :fields, :tables, :wheres
+  attr_reader :fields, :tables, :wheres
 
   def initialize
     @fields = []
@@ -34,27 +34,10 @@ class Query
     build_stmt
   end
 
-  def group_by(clause)
-    @group_by = clause
-    self
-  end
-
-  def order_by(clause)
-    @order_by = clause
-    self
-  end
-
-  def limit(clause)
-    @limit = clause
-    self
-  end
-
 private
   def verify_minimum_requirements
-    raise SqlStmt::Error, "unable to build sql - must first call :field" if @fields.empty?
-    raise SqlStmt::Error, "unable to build sql - must first call :table" if @tables.empty?
-    raise SqlStmt::Error, "unable to build sql - must first call :where or :no_where" if @use_wheres && @wheres.empty?
-    raise SqlStmt::Error, "unable to build sql - :where and :no_where must not be called on same builder instance" if !@use_wheres && !@wheres.empty?
+    raise SqlStmt::Error, "unable to build sql - must call :where or :no_where" if @use_wheres && @wheres.empty?
+    raise SqlStmt::Error, "unable to build sql - :where and :no_where must not both be called" if !@use_wheres && !@wheres.empty?
   end
 
   def build_table_list
@@ -66,24 +49,4 @@ private
   end
 end
 
-class FieldValueQuery < Query
-  force_deep_copy :values
-
-  def initialize
-    super
-    @values = []
-  end
-
-  def field(field, value)
-    raise "trying to include field #{field} again" if @fields.include?(field)
-    @fields.push(field)
-    @values.push(if value.is_a?(String) then value else value.to_sql end)
-    self
-  end
-
-  def fieldq(field, value)
-    field(field, value.to_sql)
-  end
-end
-
 end

data/lib/sqlstmt/select.rb

@@ -1,70 +1,22 @@
-require 'sqlstmt/query'
+require 'sqlstmt/from_query'
 
 module SqlStmt
 
-class Select < Query
-  force_deep_copy :joins
-
-  def initialize
-    super
-    @joins = []
-    @group_by = nil
-    @order_by = nil
-    @limit = nil
-  end
-
+class Select < FromQuery
   def field(*field_exprs)
     @fields.concat(field_exprs)
     self
   end
 
-  def join(table, expr)
-    @joins.push("JOIN #{table} ON #{expr}")
-    self
-  end
-
-  def join_using(table, *fields)
-    @joins.push("JOIN #{table} USING (#{fields.join(',')})")
-    self
-  end
-
-  def left_join(table, expr)
-    @joins.push("LEFT JOIN #{table} ON #{expr}")
-    self
-  end
-
-  def left_join_using(table, *fields)
-    @joins.push("LEFT JOIN #{table} USING (#{fields.join(',')})")
-    self
-  end
-
-  def group_by(clause)
-    @group_by = clause
-    self
-  end
-
-  def order_by(clause)
-    @order_by = clause
-    self
-  end
-
-  def limit(clause)
-    @limit = clause
-    self
-  end
-
 private
-  def simple_clause(keywords, value)
-    if value then " #{keywords} #{value}" else '' end
+  def verify_minimum_requirements
+    super
+    raise SqlStmt::Error, "unable to build sql - must call :field" if @fields.empty?
   end
 
   def build_stmt
     select_str = @fields.join(',')
-    join_clause = if @joins.empty? then '' else " #{@joins.join(' ')}" end
-    group_clause = simple_clause('GROUP BY', @group_by)
-    order_clause = simple_clause('ORDER BY', @order_by)
-    limit_clause = simple_clause('LIMIT', @limit)
-    "SELECT #{select_str} FROM #{build_table_list}#{join_clause}#{build_where_clause}#{group_clause}#{order_clause}#{limit_clause}"
+    "SELECT #{select_str}#{build_from_clause}"
   end
 end
 

data/lib/sqlstmt/update.rb

@@ -1,9 +1,24 @@
 require 'sqlstmt/query'
+require 'sqlstmt/value_util'
 
 module SqlStmt
 
-class Update < FieldValueQuery
+class Update < Query
+  force_deep_copy :values
+  include ValueUtil
+
+  def initialize
+    super
+    @values = []
+  end
+
 private
+  def verify_minimum_requirements
+    super
+    raise SqlStmt::Error, "unable to build sql - must call :table" if @tables.empty?
+    raise SqlStmt::Error, "unable to build sql - must call :field or :fieldq" if @fields.empty?
+  end
+
   def build_set_clause
     set_exprs = []
     @fields.each_with_index do |field, index|

data/lib/sqlstmt/value_util.rb

@@ -0,0 +1,14 @@
+require 'sqlstmt/to_sql'
+
+module ValueUtil
+  def field(field, value)
+    raise "trying to include field #{field} again" if @fields.include?(field)
+    @fields.push(field)
+    @values.push(if value.is_a?(String) then value else value.to_sql end)
+    self
+  end
+
+  def fieldq(field, value)
+    field(field, value.to_sql)
+  end
+end

data/lib/sqlstmt.rb

@@ -0,0 +1,4 @@
+require 'sqlstmt/select'
+require 'sqlstmt/update'
+require 'sqlstmt/insert_select'
+require 'sqlstmt/delete'

data/test/delete.dt.rb

@@ -0,0 +1,17 @@
+require 'sqlstmt/delete'
+
+module SqlStmt
+
+class TestDelete < DohTest::TestGroup
+  def test_minimum_requirements
+    assert_raises(SqlStmt::Error) { Delete.new.table('target').to_s }
+  end
+
+  def test_simple
+    assert_equal('DELETE target FROM target,other_table', Delete.new.from('target').table('other_table').no_where.to_s)
+    assert_equal('DELETE FROM target', Delete.new.table('target').no_where.to_s)
+    assert_equal('DELETE FROM target WHERE target_id = 1', Delete.new.table('target').where('target_id = 1').to_s)
+  end
+end
+
+end

data/test/insert_select.dt.rb

@@ -2,7 +2,7 @@ require 'sqlstmt/insert_select'
 
 module SqlStmt
 
-class TC_insert_select < DohTest::TestGroup
+class TestInsertSelect < DohTest::TestGroup
   def test_minimum_requirements
     assert_raises(SqlStmt::Error) { InsertSelect.new.into('target').to_s }
     assert_raises(SqlStmt::Error) { InsertSelect.new.into('target').no_where.to_s }

data/test/select.dt.rb

@@ -2,10 +2,10 @@ require 'sqlstmt/select'
 
 module SqlStmt
 
-class Test_Select < DohTest::TestGroup
-  def notest_minimum_requirements
-    assert_raises(SqlStmt::Error) { Select.new('target').to_s }
-    assert_raises(SqlStmt::Error) { Select.new('target').no_where.to_s }
+class TestSelect < DohTest::TestGroup
+  def test_minimum_requirements
+    assert_raises(SqlStmt::Error) { Select.new.table('target').to_s }
+    assert_raises(SqlStmt::Error) { Select.new.table('target').no_where.to_s }
   end
 
   def test_stuff

data/test/update.dt.rb

@@ -2,7 +2,7 @@ require 'sqlstmt/update'
 
 module SqlStmt
 
-class TC_update < DohTest::TestGroup
+class TestUpdate < DohTest::TestGroup
   def test_minimum_requirements
     assert_raises(SqlStmt::Error) { Update.new.table('target').to_s }
     assert_raises(SqlStmt::Error) { Update.new.table('target').no_where.to_s }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,19 +10,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70289917880740 !ruby/object:Gem::Requirement
+  requirement: &70104173090000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70289917880740
+  version_requirements: *70104173090000
+- !ruby/object:Gem::Dependency
+  name: dohtest
+  requirement: &70104173071680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+  type: :development
+  prerelease: false
+  version_requirements: *70104173071680
 description: mysql centric (for now) object helpers for building SQL statements
 email:
 - devinfo@atpsoft.com
@@ -31,12 +42,17 @@ extensions: []
 extra_rdoc_files:
 - MIT-LICENSE
 files:
+- lib/sqlstmt/delete.rb
 - lib/sqlstmt/error.rb
+- lib/sqlstmt/from_query.rb
 - lib/sqlstmt/insert_select.rb
 - lib/sqlstmt/query.rb
 - lib/sqlstmt/select.rb
 - lib/sqlstmt/to_sql.rb
 - lib/sqlstmt/update.rb
+- lib/sqlstmt/value_util.rb
+- lib/sqlstmt.rb
+- test/delete.dt.rb
 - test/insert_select.dt.rb
 - test/select.dt.rb
 - test/to_sql.dt.rb
@@ -68,6 +84,7 @@ signing_key:
 specification_version: 3
 summary: helper for building SQL statements
 test_files:
+- test/delete.dt.rb
 - test/insert_select.dt.rb
 - test/select.dt.rb
 - test/to_sql.dt.rb