sqlstmt 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 171563e5033c5838b9c8a2055d841b0ab97a7b59
-  data.tar.gz: 6aab01e8dc7fd4ace0d64d4f5514036cc605ba9d
+  metadata.gz: eea31417385f00ff44f3de6c5b3f4189dee5fc1a
+  data.tar.gz: 75f4bc36ea768d7adc4c22257edc46507d00928d
 SHA512:
-  metadata.gz: 0adcff0c4693dc8c2cbebfe74b3e88a47db21c943dce993e970bb6792cb74f1ba200133f955812872b673085f2ead5e886f9db1bb7413efaa09e8d47f618faba
-  data.tar.gz: 13c6f5d0b69919ff840cebf92aaf35c0603c7a59ad8430a0cdd81485416986d2a70f6c98c74e83cf8971fbf2b940dc93215ced7a81e1341c7a2ca8619f18ba7b
+  metadata.gz: 0c88c7be9a31bd556031b6caa3ea35f06f7f7f0d1b0056dad45b92bd2154a047b6ce511c94a95597916d49033db714b8108e5bdf43d05614c74b7f1f3d90f6d2
+  data.tar.gz: 7ce5bfee85d705899e425970d9824885ca8007b7b3fba31c9f3f2dd240bce4e4bb3e5449a0a2e0e84af8cce0274e2fbaeccd35755f24bef7a084aaa718151224

data/lib/sqlstmt/query.rb

@@ -67,13 +67,20 @@ class Query
   end
 
   def includes_table?(table_to_find)
-    return true if @tables.include?(table_to_find)
-    @joins.find do |_, table, _|
-      table_to_find == table
-    end
+    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"

data/test/select.dt.rb

@@ -3,6 +3,13 @@ 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 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Makani Mason