sqlstmt 0.1.28 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53ed3823c5c9a4102f77886a5c06af3ce9a8d662
-  data.tar.gz: 9e8bfa9c05c72ad5d8000d2a0aae8dd49eb2e872
+  metadata.gz: 2b7746931f2110ac0ed453789e2374c05b4233ee
+  data.tar.gz: 46c5f8f2a3baa4023d08541c47eb7f45a7fd9cb1
 SHA512:
-  metadata.gz: 48ce946d78bc93dfe48ff4790113292cd8a3faaa4a756eda857850ec5f62de2054ab92e77d3d7d72109d795e4d2f8d348464be03dc96b1530cca055867026637
-  data.tar.gz: f6c805c20e1ba95458e3812f8a331ac33e8b52114763232ccff52361ec7a2fbe9a8c14e1307500d9f7ea44fdbb9d3277253f43681bfa6adb3c34baedc00a57cd
+  metadata.gz: 0d5a0ad3df986f73d4729334bab6353b3b77372f1bb78d65f2a5ff5ae626cc5a3a616f5be7ebe32887ea059da6452dbd5e8c1c9a9cf37a71df88ac77f5b9a08d
+  data.tar.gz: 840fdd50d95167f638d5fbb78e5fedeb72d42910a45781b3a50af50feb968121b790d9c7a954de653ee3d408deda9782cd18ac49e80d5fef1659dce94082dfbe

data/lib/sqlstmt/error.rb

@@ -1,5 +1 @@
-module SqlStmt
-
-class Error < StandardError; end
-
-end
+class SqlStmtError < StandardError; end

data/lib/sqlstmt/sqlstmt.rb

@@ -0,0 +1,343 @@
+require 'sqlstmt/error'
+require 'sqlstmt/to_sql'
+
+class SqlStmt
+  attr_reader :fields, :tables, :joins, :wheres
+
+  def initialize
+    @stmt_type = nil
+    @tables = []
+    @joins = []
+    @wheres = []
+    @where_behavior = :require
+    @fields = []
+    @values = []
+    @group_by = nil
+    @order_by = nil
+    @limit = nil
+    @having = []
+    @into_table = nil
+    @rows = []
+    @tables_to_delete = []
+    @distinct = nil
+    @straight_join = nil
+    @replace = nil
+    @ignore = ''
+    @outfile = ''
+  end
+
+  def initialize_copy(orig)
+    super
+    @tables = @tables.dup
+    @joins = @joins.dup
+    @wheres = @wheres.dup
+    @fields = @fields.dup
+    @values = @values.dup
+    @having = @having.dup
+    @rows = @rows.dup
+  end
+
+  ###### pick statement type
+
+  def select
+    ensure_no_statement_type
+    @stmt_type = 'select'
+    return self
+  end
+
+  def update
+    ensure_no_statement_type
+    @stmt_type = 'update'
+    return self
+  end
+
+  def insert
+    ensure_no_statement_type
+    @stmt_type = 'insert'
+    return self
+  end
+
+  def delete(*tables)
+    ensure_no_statement_type
+    @stmt_type = 'delete'
+    @tables_to_delete = tables
+    return self
+  end
+
+  ###### common operations
+
+  def table(table)
+    @tables << table
+    return self
+  end
+
+  def join(table, *exprs)
+    return add_join('JOIN', table, exprs)
+  end
+
+  def left_join(table, *exprs)
+    return add_join('LEFT JOIN', table, exprs)
+  end
+
+  def where(*expr)
+    @wheres.concat(expr)
+    return self
+  end
+
+  def no_where
+    @where_behavior = :exclude
+    return self
+  end
+
+  def optional_where
+    @where_behavior = :optional
+    return self
+  end
+
+  def get(*exprs)
+    @fields.concat(exprs)
+    return self
+  end
+
+  def set(field, value)
+    raise "trying to include field #{field} again" if @fields.include?(field)
+    @fields << field
+    value = value.is_a?(String) ? value : value.to_sql
+    @values << value
+    return self
+  end
+
+  def setq(field, value)
+    return set(field, value.to_sql)
+  end
+
+  def group_by(expr)
+    @group_by = expr
+    return self
+  end
+
+  def order_by(expr)
+    @order_by = expr
+    return self
+  end
+
+  def limit(clause)
+    @limit = clause
+    return self
+  end
+
+  def having(*expr)
+    @having.concat(expr)
+    return self
+  end
+
+  # used with INSERT statements only
+  def into(into_table)
+    @into_table = into_table
+    return self
+  end
+
+  # used with INSERT VALUES statements only
+  def add_row(row)
+    @rows << row
+  end
+
+  def to_s
+    verify_minimum_requirements
+    return build_stmt
+  end
+  alias_method :to_sql, :to_s
+
+  ###### less commonly used methods
+
+  def distinct
+    @distinct = true
+    return self
+  end
+
+  def straight_join
+    @straight_join = true
+    return self
+  end
+
+  def replace
+    @replace = true
+    return self
+  end
+
+  def ignore
+    @ignore = 'IGNORE '
+    return self
+  end
+
+  def outfile(str)
+    @outfile = " INTO OUTFILE #{str}"
+    return self
+  end
+
+  ###### methods to analyze what the statement contains
+  def includes_table?(table_to_find)
+    retval = @tables.find { |table| table_names_match?(table, table_to_find) }
+    retval ||= @joins.find { |_, table, _| table_names_match?(table, table_to_find) }
+    return retval
+  end
+
+  ###### transition only mechanisms
+  def field(*args)
+    if ['update','insert'].include?(@stmt_type)
+      set(args[0], args[1])
+    else
+      get(*args)
+    end
+  end
+  alias_method :fieldq, :setq
+
+  def optional_join(table, expr)
+    unless includes_table?(table)
+      join(table, expr)
+    end
+  end
+
+private
+  def ensure_no_statement_type
+    if @stmt_type
+      raise "statement type already set to #{@stmt_type}"
+    end
+  end
+
+  def add_join(keyword, table, exprs)
+    @joins << [keyword, table, "ON #{exprs.join(' AND ')}"]
+    return self
+  end
+
+  def table_names_match?(fullstr, tofind)
+    if tofind.index(' ') || !fullstr.index(' ')
+      return fullstr == tofind
+    end
+    orig_name, _, tblas = fullstr.partition(' ')
+    return (orig_name == tofind) || (tblas == tofind)
+  end
+
+  ###### the remainder of the methods are for verifying and building the completed statement string
+
+  def verify_minimum_requirements
+    if !@stmt_type
+      raise SqlStmtError, "unable to build sql - must specify statement type"
+    elsif (@where_behavior == :require) && @wheres.empty?
+      raise SqlStmtError, "unable to build sql - must call :where, :no_where, or :optional_where"
+    elsif (@where_behavior == :exclude) && !@wheres.empty?
+      raise SqlStmtError, "unable to build sql - :where and :no_where must not both be called, consider :optional_where instead"
+    end
+
+    if ['select','insert','delete'].include?(@stmt_type)
+      raise SqlStmtError, "unable to build sql - must call :table or :join (or one if it's variants)" if @tables.empty? && @joins.empty?
+      raise SqlStmtError, "unable to build sql - must call :table if using :join (or one if it's variants)" if @tables.empty? && !@joins.empty?
+    end
+
+    if @stmt_type == 'select'
+      raise SqlStmtError, "unable to build sql - must call :field" if @fields.empty?
+    end
+
+    if @stmt_type == 'insert_values'
+      raise SqlStmtError, "unable to build sql - must call :into" if @into_table.nil?
+      raise SqlStmtError, "unable to build sql - must call :field or :fieldq" if @fields.empty?
+    end
+
+    if @stmt_type == 'insert_select'
+      raise SqlStmtError, "unable to build sql - must call :into" if @into_table.nil?
+      raise SqlStmtError, "unable to build sql - must call :field or :fieldq" if @fields.empty?
+    end
+
+    if @stmt_type == 'update'
+      raise SqlStmtError, "unable to build sql - must call :table" if @tables.empty?
+      raise SqlStmtError, "unable to build sql - must call :field or :fieldq" if @fields.empty?
+    end
+
+    if @stmt_type == 'delete'
+      combined_table_count = @tables.size + @joins.size
+      raise SqlStmtError, "unable to build sql - must call :from when including multiple tables" if @tables_to_delete.empty? && (combined_table_count > 1)
+    end
+  end
+
+  def build_stmt
+    method_name = "build_stmt_#{@stmt_type}"
+    return send(method_name)
+  end
+
+  def build_stmt_select
+    straight_join_str = @straight_join ? 'STRAIGHT_JOIN ' : ''
+    distinct_str = @distinct ? 'DISTINCT ' : ''
+    select_str = @fields.join(',')
+    return "SELECT #{straight_join_str}#{distinct_str}#{select_str}#{build_from_clause}#{@outfile}"
+  end
+
+  def build_stmt_update
+    limit_clause = simple_clause('LIMIT', @limit)
+    return "UPDATE #{build_table_list}#{build_join_clause} SET #{build_set_clause}#{build_where_clause}#{limit_clause}"
+  end
+
+  def build_stmt_insert
+    if !@fields.empty? && !@rows.empty?
+      raise "unable to use INSERT SELECT and INSERT VALUES together, may only call :set or :add_row, but not both"
+    end
+
+    keyword = @replace ? 'REPLACE' : 'INSERT'
+    field_list = @fields.join(',')
+    value_list = @values.join(',')
+    start_str = "#{keyword} #{@ignore}INTO #{@into_table} (#{field_list}) "
+
+    if @rows.empty?
+      distinct_str = @distinct ? 'DISTINCT ' : ''
+      return "#{start_str}SELECT #{distinct_str}#{value_list}#{build_from_clause}"
+    else
+      raise "DISTINCT not supported when inserting values" if @distinct
+      return "#{start_str}VALUES (#{value_list})"
+    end
+  end
+
+  def build_stmt_delete
+    if @tables_to_delete.empty?
+      table_clause = ''
+    else
+      table_clause = ' ' + @tables_to_delete.join(',')
+    end
+    return "DELETE#{table_clause}#{build_from_clause}"
+  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)
+    having_clause = @having.empty? ? '' : " HAVING #{@having.join(' AND ')}"
+    return " FROM #{build_table_list}#{join_clause}#{build_where_clause}#{group_clause}#{having_clause}#{order_clause}#{limit_clause}"
+  end
+
+  def build_set_clause
+    set_exprs = []
+    @fields.each_with_index do |field, index|
+      set_exprs << "#{field} = #{@values[index]}"
+    end
+    return set_exprs.join(', ')
+  end
+
+  def build_table_list
+    return @tables.join(',')
+  end
+
+  def simple_clause(keywords, value)
+    return value ? " #{keywords} #{value}" : ''
+  end
+
+  def build_join_clause
+    if @joins.empty?
+      return ''
+    else
+      return ' ' + @joins.map {|ary| ary.join(' ')}.uniq.join(' ')
+    end
+  end
+
+  def build_where_clause
+    return @wheres.empty? ? '' : " WHERE #{@wheres.join(' AND ')}"
+  end
+end

data/lib/sqlstmt.rb

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

data/test/delete_test.rb

@@ -0,0 +1,14 @@
+require_relative 'helper'
+
+class TestDelete < Minitest::Test
+  def test_minimum_requirements
+    assert_raises(SqlStmtError) { SqlStmt.new.delete.table('target').to_s }
+  end
+
+  def test_simple
+    assert_equal('DELETE t FROM target t,other_table o', SqlStmt.new.delete('t').table('target t').table('other_table o').no_where.to_s)
+    assert_equal('DELETE t,o FROM t JOIN o ON t.id=o.id', SqlStmt.new.delete('t', 'o').table('t').join('o','t.id=o.id').no_where.to_s)
+    assert_equal('DELETE FROM target', SqlStmt.new.delete.table('target').no_where.to_s)
+    assert_equal('DELETE FROM target WHERE target_id = 1', SqlStmt.new.delete.table('target').where('target_id = 1').to_s)
+  end
+end

data/test/helper.rb

@@ -0,0 +1,2 @@
+require 'minitest/autorun'
+require 'sqlstmt'

data/test/{insert_select.dt.rb → insert_select_test.rb}

@@ -1,31 +1,29 @@
-require 'sqlstmt/insert_select'
+require_relative 'helper'
 
-module SqlStmt
-
-class TestInsertSelect < DohTest::TestGroup
+class TestInsertSelect < Minitest::Test
   def test_minimum_requirements
-    assert_raises(SqlStmt::Error) { InsertSelect.new.insert_into('target').to_s }
-    assert_raises(SqlStmt::Error) { InsertSelect.new.insert_into('target').no_where.to_s }
-    assert_raises(SqlStmt::Error) { InsertSelect.new.insert_into('target').no_where.field('blah', 'blee').to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.insert.into('target').to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.insert.into('target').no_where.to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.insert.into('target').no_where.set('blah', 'blee').to_s }
   end
 
   def test_simple
-    assert_equal('INSERT INTO target (blah) SELECT blee FROM source', InsertSelect.new.insert_into('target').table('source').field('blah', 'blee').no_where.to_s)
-    assert_equal('INSERT INTO target (blah) SELECT blee FROM source WHERE source_id = 1', InsertSelect.new.insert_into('target').table('source').field('blah', 'blee').where('source_id = 1').to_s)
+    assert_equal('INSERT INTO target (blah) SELECT blee FROM source', SqlStmt.new.insert.into('target').table('source').set('blah', 'blee').no_where.to_s)
+    assert_equal('INSERT INTO target (blah) SELECT blee FROM source WHERE source_id = 1', SqlStmt.new.insert.into('target').table('source').set('blah', 'blee').where('source_id = 1').to_s)
   end
 
   def test_dup
-    shared_builder = SqlStmt::InsertSelect.new.insert_into('target')
+    shared_builder = SqlStmt.new.insert.into('target')
     first_builder = shared_builder
     other_builder = shared_builder.dup
 
     first_builder.where('status="bad"')
-    first_builder.field('created_at', 'NOW()')
+    first_builder.set('created_at', 'NOW()')
     first_builder.table('some_tbl s')
 
     other_builder.no_where
-    other_builder.field('info', 'o.info')
-    other_builder.field('created_at', 'then')
+    other_builder.set('info', 'o.info')
+    other_builder.set('created_at', 'then')
     other_builder.table('other_tbl o')
 
     assert_equal('INSERT INTO target (created_at) SELECT NOW() FROM some_tbl s WHERE status="bad"', first_builder.to_s)
@@ -33,9 +31,9 @@ class TestInsertSelect < DohTest::TestGroup
   end
 
   def test_complex
-    shared_builder = SqlStmt::InsertSelect.new.insert_into('target')
+    shared_builder = SqlStmt.new.insert.into('target')
     shared_builder.table('shared_tbl')
-    shared_builder.field('created_at', 'NOW()').field('duration', 5).fieldq('is_bad', 'b')
+    shared_builder.set('created_at', 'NOW()').set('duration', 5).setq('is_bad', 'b')
 
     first_builder = shared_builder
     other_builder = shared_builder.dup
@@ -43,13 +41,11 @@ class TestInsertSelect < DohTest::TestGroup
     first_builder.where("status='bad'")
 
     other_builder.table('other_tbl o')
-    other_builder.field('info', 'o.info')
-    other_builder.field('data', 'o.data')
+    other_builder.set('info', 'o.info')
+    other_builder.set('data', 'o.data')
     other_builder.where('s.id=o.shared_id', "status='good'")
 
     assert_equal("INSERT INTO target (created_at,duration,is_bad) SELECT NOW(),5,'b' FROM shared_tbl WHERE status='bad'", first_builder.to_s)
     assert_equal("INSERT INTO target (created_at,duration,is_bad,info,data) SELECT NOW(),5,'b',o.info,o.data FROM shared_tbl,other_tbl o WHERE s.id=o.shared_id AND status='good'", other_builder.to_s)
   end
 end
-
-end

data/test/select_test.rb

@@ -0,0 +1,42 @@
+require_relative 'helper'
+
+class TestSelect < Minitest::Test
+  def test_includes_table
+    sqlb = SqlStmt.new.select.table('target t')
+    assert(sqlb.includes_table?('target'))
+    assert(sqlb.includes_table?('t'))
+    assert(!sqlb.includes_table?('blah'))
+  end
+
+  def test_minimum_requirements
+    assert_raises(SqlStmtError) { SqlStmt.new.select.table('target').to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.select.table('target').no_where.to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.select.table('target').optional_where.to_s }
+    assert_equal('SELECT blah FROM target', SqlStmt.new.select.table('target').optional_where.get('blah').to_sql)
+  end
+
+  def test_stuff
+    assert_equal('SELECT blah FROM source', SqlStmt.new.select.table('source').get('blah').no_where.to_s)
+    assert_equal('SELECT DISTINCT blah FROM source', SqlStmt.new.select.table('source').get('blah').no_where.distinct.to_s)
+    assert_equal('SELECT blah FROM source WHERE source_id = 1', SqlStmt.new.select.table('source').get('blah').where('source_id = 1').to_s)
+    assert_equal('SELECT blah FROM source s', SqlStmt.new.select.table('source s').get('blah').no_where.to_s)
+    assert_equal('SELECT blah FROM source s JOIN other o ON s.blah_id = o.blah_id', SqlStmt.new.select.table('source s').join('other o', 's.blah_id = o.blah_id').get('blah').no_where.to_s)
+    assert_equal('SELECT blah FROM source s LEFT JOIN other o ON s.blah_id = o.blah_id', SqlStmt.new.select.table('source s').left_join('other o', 's.blah_id = o.blah_id').get('blah').no_where.to_s)
+    assert_equal('SELECT blah,blee FROM source', SqlStmt.new.select.table('source').get('blah','blee').no_where.to_s)
+    assert_equal('SELECT blah FROM source HAVING blee > 0', SqlStmt.new.select.table('source').get('blah').no_where.having('blee > 0').to_s)
+  end
+
+  def test_duplicate_joins
+    sqlb = SqlStmt.new.select.table('source s').get('frog').no_where
+    4.times { sqlb.join('other o', 's.blah_id = o.blah_id') }
+    assert_equal('SELECT frog FROM source s JOIN other o ON s.blah_id = o.blah_id', sqlb.to_s)
+  end
+
+  def test_join_with_multiple_conditions
+    %i(join left_join).each do |method|
+      sqlb = SqlStmt.new.select.table('source s').get('frog').no_where.send(method, 'other o', 'z.blee_id = o.blee_id', 'z.other_field = o.other_field')
+      method_sql = method.to_s.upcase.sub('_', ' ')
+      assert_equal("SELECT frog FROM source s #{method_sql} other o ON z.blee_id = o.blee_id AND z.other_field = o.other_field", sqlb.to_s)
+    end
+  end
+end

data/test/{to_sql.dt.rb → to_sql_test.rb}

@@ -1,8 +1,6 @@
-require 'sqlstmt/to_sql'
+require_relative 'helper'
 
-module SqlStmt
-
-class Test_to_sql < DohTest::TestGroup
+class Test_to_sql < Minitest::Test
   def test_stuff
     assert_equal("'blah'", 'blah'.to_sql)
     assert_equal('NULL', nil.to_sql)
@@ -15,6 +13,3 @@ class Test_to_sql < DohTest::TestGroup
     assert_equal("('a','b','c')", ['a', 'b', 'c'].to_sql)
   end
 end
-
-end
-

data/test/{update.dt.rb → update_test.rb}

@@ -1,38 +1,36 @@
-require 'sqlstmt/update'
+require_relative 'helper'
 
-module SqlStmt
-
-class TestUpdate < DohTest::TestGroup
+class TestUpdate < Minitest::Test
   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 }
+    assert_raises(SqlStmtError) { SqlStmt.new.update.table('target').to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.update.table('target').no_where.to_s }
   end
 
   def test_simple
-    assert_equal('UPDATE target SET blah = blee', Update.new.table('target').field('blah', 'blee').no_where.to_s)
-    assert_equal('UPDATE target SET blah = blee LIMIT 3', Update.new.table('target').field('blah', 'blee').no_where.limit(3).to_s)
-    assert_equal('UPDATE target SET blah = blee WHERE target_id = 1', Update.new.table('target').field('blah', 'blee').where('target_id = 1').to_s)
+    assert_equal('UPDATE target SET blah = blee', SqlStmt.new.update.table('target').set('blah', 'blee').no_where.to_s)
+    assert_equal('UPDATE target SET blah = blee LIMIT 3', SqlStmt.new.update.table('target').set('blah', 'blee').no_where.limit(3).to_s)
+    assert_equal('UPDATE target SET blah = blee WHERE target_id = 1', SqlStmt.new.update.table('target').set('blah', 'blee').where('target_id = 1').to_s)
   end
 
   def test_join
-    builder = SqlStmt::Update.new.table('main m').join('other o', 'm.main_id = o.main_id')
-    builder.field('blah', 3)
+    builder = SqlStmt.new.update.table('main m').join('other o', 'm.main_id = o.main_id')
+    builder.set('blah', 3)
     builder.no_where
     assert_equal('UPDATE main m JOIN other o ON m.main_id = o.main_id SET blah = 3', builder.to_s)
   end
 
   def test_dup
-    shared_builder = SqlStmt::Update.new.table('target')
+    shared_builder = SqlStmt.new.update.table('target')
     first_builder = shared_builder
     other_builder = shared_builder.dup
 
     first_builder.where('status="bad"')
-    first_builder.field('created_at', 'NOW()')
+    first_builder.set('created_at', 'NOW()')
     first_builder.table('some_tbl s')
 
     other_builder.no_where
-    other_builder.field('info', 'o.info')
-    other_builder.field('created_at', 'then')
+    other_builder.set('info', 'o.info')
+    other_builder.set('created_at', 'then')
     other_builder.table('other_tbl o')
 
     assert_equal('UPDATE target,some_tbl s SET created_at = NOW() WHERE status="bad"', first_builder.to_s)
@@ -40,9 +38,9 @@ class TestUpdate < DohTest::TestGroup
   end
 
   def test_complex
-    shared_builder = SqlStmt::Update.new.table('target')
+    shared_builder = SqlStmt.new.update.table('target')
     shared_builder.table('shared_tbl')
-    shared_builder.field('created_at', 'NOW()').field('duration', 5).field('is_bad', 1)
+    shared_builder.set('created_at', 'NOW()').set('duration', 5).set('is_bad', 1)
 
     first_builder = shared_builder
     other_builder = shared_builder.dup
@@ -50,8 +48,8 @@ class TestUpdate < DohTest::TestGroup
     first_builder.where('status="bad"')
 
     other_builder.table('other_tbl o')
-    other_builder.field('info', 'o.info')
-    other_builder.field('data', 'o.data')
+    other_builder.set('info', 'o.info')
+    other_builder.set('data', 'o.data')
     other_builder.where('s.id=o.shared_id')
     other_builder.where('status="good"')
 
@@ -59,5 +57,3 @@ class TestUpdate < DohTest::TestGroup
     assert_equal('UPDATE target,shared_tbl,other_tbl o SET created_at = NOW(), duration = 5, is_bad = 1, info = o.info, data = o.data WHERE s.id=o.shared_id AND status="good"', other_builder.to_s)
   end
 end
-
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.2.0
 platform: ruby
 authors:
 - Makani Mason
@@ -9,36 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: dohutil
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.21
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.21
-- !ruby/object:Gem::Dependency
-  name: dohtest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.42
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.42
+date: 2016-01-18 00:00:00.000000000 Z
+dependencies: []
 description: build SQL statements in a modular fashion, one piece at a time; only
   used/tested with MySQL so far
 email:
@@ -50,21 +22,15 @@ extra_rdoc_files:
 files:
 - MIT-LICENSE
 - lib/sqlstmt.rb
-- lib/sqlstmt/delete.rb
 - lib/sqlstmt/error.rb
-- lib/sqlstmt/from_query.rb
-- lib/sqlstmt/insert_select.rb
-- lib/sqlstmt/insert_values.rb
-- lib/sqlstmt/query.rb
-- lib/sqlstmt/select.rb
+- lib/sqlstmt/sqlstmt.rb
 - lib/sqlstmt/to_sql.rb
-- lib/sqlstmt/update.rb
-- lib/sqlstmt/value_util.rb
-- test/delete.dt.rb
-- test/insert_select.dt.rb
-- test/select.dt.rb
-- test/to_sql.dt.rb
-- test/update.dt.rb
+- test/delete_test.rb
+- test/helper.rb
+- test/insert_select_test.rb
+- test/select_test.rb
+- test/to_sql_test.rb
+- test/update_test.rb
 homepage: https://github.com/atpsoft/sqlstmt
 licenses:
 - MIT
@@ -90,8 +56,9 @@ signing_key:
 specification_version: 4
 summary: build SQL statements in a modular fashion, one piece at a time
 test_files:
-- test/delete.dt.rb
-- test/insert_select.dt.rb
-- test/select.dt.rb
-- test/to_sql.dt.rb
-- test/update.dt.rb
+- test/delete_test.rb
+- test/helper.rb
+- test/insert_select_test.rb
+- test/select_test.rb
+- test/to_sql_test.rb
+- test/update_test.rb

data/lib/sqlstmt/delete.rb

@@ -1,35 +0,0 @@
-require 'sqlstmt/from_query'
-
-module SqlStmt
-
-class Delete < FromQuery
-  force_deep_copy :from_tables
-
-  def initialize
-    super
-    @from_tables = []
-  end
-
-  def from(table)
-    @from_tables << 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_tables.empty? && (combined_table_count > 1)
-  end
-
-  def build_stmt
-    if @from_tables.empty?
-      table_clause = ''
-    else
-      table_clause = ' ' + @from_tables.join(',')
-    end
-    "DELETE#{table_clause}#{build_from_clause}"
-  end
-end
-
-end

data/lib/sqlstmt/from_query.rb

@@ -1,52 +0,0 @@
-require 'sqlstmt/query'
-
-module SqlStmt
-
-class FromQuery < Query
-  def initialize
-    super
-    @group_by = nil
-    @order_by = nil
-    @having = []
-  end
-
-  def group_by(clause)
-    @group_by = clause
-    self
-  end
-
-  def order_by(clause)
-    @order_by = clause
-    self
-  end
-
-  def having(*sql)
-    @having.concat(sql)
-    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 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}#{having_clause}#{order_clause}#{limit_clause}"
-  end
-end
-
-end

data/lib/sqlstmt/insert_select.rb

@@ -1,48 +0,0 @@
-require 'sqlstmt/from_query'
-require 'sqlstmt/value_util'
-
-module SqlStmt
-
-class InsertSelect < FromQuery
-  force_deep_copy :values
-  include ValueUtil
-
-  def initialize
-    super
-    @values = []
-    @distinct = @ignore = false
-    @into_table = nil
-  end
-
-  def distinct
-    @distinct = true
-    self
-  end
-
-  def ignore
-    @ignore = true
-    self
-  end
-
-  def insert_into(table)
-    @into_table = table
-    self
-  end
-
-private
-  def verify_minimum_requirements
-    super
-    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
-    distinct_str = if @distinct then 'DISTINCT ' else '' end
-    ignore_str = if @ignore then 'IGNORE ' else '' end
-    into_str = @fields.join(',')
-    select_str = @values.join(',')
-    "INSERT #{ignore_str}INTO #@into_table (#{into_str}) SELECT #{distinct_str}#{select_str}#{build_from_clause}"
-  end
-end
-
-end

data/lib/sqlstmt/insert_values.rb

@@ -1,37 +0,0 @@
-require 'sqlstmt/from_query'
-require 'sqlstmt/value_util'
-
-module SqlStmt
-
-class InsertValues < FromQuery
-  force_deep_copy :values
-  include ValueUtil
-
-  def initialize
-    super
-    @values = []
-    @into_table = nil
-    no_where
-  end
-
-  def into(table)
-    @into_table = table
-    table(table)
-    self
-  end
-
-private
-  def verify_minimum_requirements
-    super
-    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(',')
-    values_str = @values.join(',')
-    "INSERT INTO #@into_table (#{into_str}) VALUES (#{values_str})"
-  end
-end
-
-end

data/lib/sqlstmt/query.rb

@@ -1,110 +0,0 @@
-require 'dohutil/core_ext/force_deep_copy'
-require 'sqlstmt/error'
-
-module SqlStmt
-
-class Query
-  force_deep_copy :fields, :tables, :joins, :wheres
-  attr_reader :fields, :tables, :joins, :wheres
-
-  def initialize
-    @fields = []
-    @tables = []
-    @joins = []
-    @wheres = []
-    @where_behavior = :require
-    @limit = nil
-  end
-
-  def table(table)
-    @tables << table
-    self
-  end
-
-  def join(table, *exprs)
-    @joins << ['JOIN', table, "ON #{exprs.join(' AND ')}"]
-    self
-  end
-
-  def optional_join(table, expr)
-    unless includes_table?(table)
-      join(table, expr)
-    end
-  end
-
-  def left_join(table, *exprs)
-    @joins << ['LEFT JOIN', table, "ON #{exprs.join(' AND ')}"]
-    self
-  end
-
-  def where(*sql)
-    @wheres.concat(sql)
-    self
-  end
-
-  def no_where
-    @where_behavior = :exclude
-    self
-  end
-
-  def optional_where
-    @where_behavior = :optional
-    self
-  end
-
-  def limit(clause)
-    @limit = clause
-    self
-  end
-
-  def to_s
-    verify_minimum_requirements
-    build_stmt
-  end
-  alias_method :to_sql, :to_s
-
-  def includes_table?(table_to_find)
-    retval = @tables.find { |table| table_names_match?(table, table_to_find) }
-    retval ||= @joins.find { |_, table, _| table_names_match?(table, table_to_find) }
-    retval
-  end
-
-private
-  def table_names_match?(fullstr, tofind)
-    if tofind.index(' ') || !fullstr.index(' ')
-      return fullstr == tofind
-    end
-    orig_name, _, tblas = fullstr.partition(' ')
-    (orig_name == tofind) || (tblas == tofind)
-  end
-
-  def verify_minimum_requirements
-    if (@where_behavior == :require) && @wheres.empty?
-      raise SqlStmt::Error, "unable to build sql - must call :where, :no_where, or :optional_where"
-    elsif (@where_behavior == :exclude) && !@wheres.empty?
-      raise SqlStmt::Error, "unable to build sql - :where and :no_where must not both be called, consider :optional_where instead"
-    end
-  end
-
-  def build_table_list
-    @tables.join(',')
-  end
-
-  def simple_clause(keywords, value)
-    if value then " #{keywords} #{value}" else '' end
-  end
-
-  def build_join_clause
-    if @joins.empty?
-      ''
-    else
-      ' ' + @joins.collect{|ary| ary.join(' ')}.uniq.join(' ')
-    end
-  end
-
-  def build_where_clause
-    if @wheres.empty? then '' else " WHERE #{@wheres.join(' AND ')}" end
-  end
-end
-
-end

data/lib/sqlstmt/select.rb

@@ -1,48 +0,0 @@
-require 'sqlstmt/from_query'
-
-module SqlStmt
-
-class Select < FromQuery
-  def initialize
-    super
-    @distinct = false
-    @straight_join = false
-    @into = nil
-  end
-
-  def field(*field_exprs)
-    @fields.concat(field_exprs)
-    self
-  end
-
-  def distinct
-    @distinct = true
-    self
-  end
-
-  def straight_join
-    @straight_join = true
-    self
-  end
-
-  def into_outfile(str)
-    @into = "OUTFILE #{str}"
-    self
-  end
-
-private
-  def verify_minimum_requirements
-    super
-    raise SqlStmt::Error, "unable to build sql - must call :field" if @fields.empty?
-  end
-
-  def build_stmt
-    straight_join_str = if @straight_join then 'STRAIGHT_JOIN ' else '' end
-    distinct_str = if @distinct then 'DISTINCT ' else '' end
-    into_str = if @into then " INTO #{@into}" else '' end
-    select_str = @fields.join(',')
-    "SELECT #{straight_join_str}#{distinct_str}#{select_str}#{build_from_clause}#{into_str}"
-  end
-end
-
-end

data/lib/sqlstmt/update.rb

@@ -1,36 +0,0 @@
-require 'sqlstmt/query'
-require 'sqlstmt/value_util'
-
-module SqlStmt
-
-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|
-      set_exprs.push("#{field} = #{@values[index]}")
-    end
-    set_exprs.join(', ')
-  end
-
-  def build_stmt
-    limit_clause = simple_clause('LIMIT', @limit)
-    "UPDATE #{build_table_list}#{build_join_clause} SET #{build_set_clause}#{build_where_clause}#{limit_clause}"
-  end
-end
-
-end

data/lib/sqlstmt/value_util.rb

@@ -1,14 +0,0 @@
-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/test/delete.dt.rb

@@ -1,18 +0,0 @@
-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 t FROM target t,other_table o', Delete.new.from('t').table('target t').table('other_table o').no_where.to_s)
-    assert_equal('DELETE t,o FROM t JOIN o ON t.id=o.id', Delete.new.from('t').from('o').table('t').join('o','t.id=o.id').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/select.dt.rb

@@ -1,53 +0,0 @@
-require 'sqlstmt/select'
-
-module SqlStmt
-
-class TestSelect < DohTest::TestGroup
-  def test_includes_table
-    sqlb = Select.new.table('target t')
-    assert(sqlb.includes_table?('target'))
-    assert(sqlb.includes_table?('t'))
-    assert(!sqlb.includes_table?('blah'))
-  end
-
-  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 }
-    assert_raises(SqlStmt::Error) { Select.new.table('target').optional_where.to_s }
-    assert_equal('SELECT blah FROM target', Select.new.table('target').optional_where.field('blah').to_sql)
-  end
-
-  def test_stuff
-    assert_equal('SELECT blah FROM source', Select.new.table('source').field('blah').no_where.to_s)
-    assert_equal('SELECT DISTINCT blah FROM source', Select.new.table('source').field('blah').no_where.distinct.to_s)
-    assert_equal('SELECT blah FROM source WHERE source_id = 1', Select.new.table('source').field('blah').where('source_id = 1').to_s)
-    assert_equal('SELECT blah FROM source s', Select.new.table('source s').field('blah').no_where.to_s)
-    assert_equal('SELECT blah FROM source s JOIN other o ON s.blah_id = o.blah_id', Select.new.table('source s').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 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,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
-    sqlb = Select.new.table('source s').field('frog').no_where
-    4.times { sqlb.join('other o', 's.blah_id = o.blah_id') }
-    assert_equal('SELECT frog FROM source s JOIN other o ON s.blah_id = o.blah_id', sqlb.to_s)
-  end
-
-  def test_optional_join
-    sqlb = Select.new.table('source s').field('frog').no_where
-    sqlb.join('other o', 's.blah_id = o.blah_id')
-    sqlb.optional_join('other o', 'z.blee_id = o.blee_id')
-    assert_equal('SELECT frog FROM source s JOIN other o ON s.blah_id = o.blah_id', sqlb.to_s)
-  end
-
-  def test_join_with_multiple_conditions
-    %i(join left_join).each do |method|
-      sqlb = Select.new.table('source s').field('frog').no_where.send(method, 'other o', 'z.blee_id = o.blee_id', 'z.other_field = o.other_field')
-      method_sql = method.to_s.upcase.sub('_', ' ')
-      assert_equal("SELECT frog FROM source s #{method_sql} other o ON z.blee_id = o.blee_id AND z.other_field = o.other_field", sqlb.to_s)
-    end
-  end
-end
-
-end