sqlstmt 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98430baa411f71f5730952f97c9ccffda3872ee4
-  data.tar.gz: 3fd532738e1c3f4d337e21c9cabaf1c2bb0286af
+  metadata.gz: 00e1c0b2d84d706f5c31a73452924c121058bfa2
+  data.tar.gz: cf52152357734f73abc182e07b03110324bbf7cf
 SHA512:
-  metadata.gz: fc948dcf7eda79d0eb54f168c47f74bb2a920f03b38e0adddb99aa7b1a9b09e8ee799e6ae2ce4aa679c086aec3d3f5a4064e1fdff60342dc49156e1eaa169d4e
-  data.tar.gz: cc247caaa97d7df7195533f8fcba869381c972c4a40521de4528c61d25c93c7f5a8500e47347e49c1b7c255ce76ce8497f5127a348dccbf64c62c364e805b97c
+  metadata.gz: 6af961b7e0b6415fd0716f0c50f6d63246bd7875dcd5d656ba48e98d1c1a801fda67feba9c29685254bc918bac2916332acf66b34f98b8c503797a17e55c2290
+  data.tar.gz: 130e2e8808466ef222ba23e6831db9b9407fda5b78e3b06d0a6e50022a18b50990c5ed0ef0290f4f1b76e3b14c3fca604c2bacf912655b44617c6c241e083478

data/lib/sqlstmt/sqlstmt.rb

@@ -3,6 +3,7 @@ require 'sqlstmt/to_sql'
 
 class SqlStmt
   attr_reader :fields, :tables, :joins, :wheres
+  Table = Struct.new(:str, :name, :alias, :index)
 
   def initialize
     @stmt_type = nil
@@ -68,8 +69,10 @@ class SqlStmt
 
   ###### common operations
 
-  def table(table)
-    @tables << table
+  def table(table_str, use_index = nil)
+    parts = table_str.split(' ')
+    table_obj = Table.new(table_str, parts[0], parts[1], use_index)
+    @tables << table_obj
     return self
   end
 
@@ -184,7 +187,7 @@ class SqlStmt
 
   ###### 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 = @tables.find { |table| (table.name == table_to_find) || (table.alias == table_to_find) }
     retval ||= @joins.find { |_, table, _| table_names_match?(table, table_to_find) }
     return retval
   end
@@ -314,8 +317,15 @@ private
     return set_exprs.join(', ')
   end
 
+  def table_to_str(table)
+    if table.index
+      return "#{table.str} USE INDEX (#{table.index})"
+    end
+    return table.str
+  end
+
   def build_table_list
-    return @tables.join(',')
+    return @tables.map {|table| table_to_str(table) }.join(',')
   end
 
   def simple_clause(keywords, value)

data/test/select_test.rb

@@ -8,6 +8,12 @@ class TestSelect < Minitest::Test
     assert(!sqlb.includes_table?('blah'))
   end
 
+  def test_tables
+    assert_equal('SELECT blah FROM target', SqlStmt.new.select.table('target').no_where.get('blah').to_sql)
+    assert_equal('SELECT t.blah FROM target t', SqlStmt.new.select.table('target t').no_where.get('t.blah').to_sql)
+    assert_equal('SELECT t.blah FROM target t USE INDEX (blee)', SqlStmt.new.select.table('target t', 'blee').no_where.get('t.blah').to_sql)
+  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 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-07-19 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