rusql 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ff1b4a10ef306cabe203f2af5da46b99e11b1f6
-  data.tar.gz: cece6f6999111a263632519870d48bd54f9d3a63
+  metadata.gz: 7de70ccbf6676684b58192eeb8801799bc4b045d
+  data.tar.gz: 67a793c131ce5ca49d099d8bbccccda3f8e5f9da
 SHA512:
-  metadata.gz: dfd7287e5e4040c15ba79c2ce96d259b722b7825c3604b4dace91f95fa9c627958186571416cbd4ccf04bd36bb43efd26b4b801d2d0f02469d151acae331be46
-  data.tar.gz: 9ffb4d54d0cae07c5de2f8cdd67380fc46b4559a6b217cdf4ff6f0e836b9300ab83808ce32b1d140ae35eeb3e902129c1e129699e89222c34d42c6ce69cd5214
+  metadata.gz: 344a891cb2325191454bc29d05f18f963a17dbad7aad7e3875ab43cca71ab1512ca530a4a2ad8509301bdd48b98dbcddffb2a5b5a5889798ace858aa6636b87e
+  data.tar.gz: db12ee071da15bb594a64724cf72c3922c4df3f8ec0a3aed7f2e8ae44afa34df6bf9cf1dcae77479308d57bf954b6ba5a244476febd839b159c42e9ba88db7c0

data/lib/rusql/join.rb

@@ -11,12 +11,14 @@ module Rusql
     )
 
     def initialize(type, table, condition)
+      final_table = table.is_a?(Table) ? table : ( table.respond_to?(:as_rusql_table) ? table.as_rusql_table : nil )
+
       raise Exception.new("Expected type to be one of #{ TYPES.map(&:to_s).join(",") }") unless TYPES.include?(type)
-      raise TypeException.new(Table, table.class) unless table.is_a?(Table)
+      raise TypeException.new(Table, table.class) if final_table.nil?
       raise TypeException.new(BasicCondition, condition.class) unless condition.is_a?(BasicCondition)
 
       @type = type
-      @table = table
+      @table = final_table
       @condition = condition
     end
 

data/lib/rusql/query.rb

@@ -44,10 +44,12 @@ module Rusql
     end
 
     def from(t)
-      raise TypeException.new(Table, t.class) unless t.is_a?(Table)
+      # so that we can have ActiveRecord hacks :/ 
+      final_table = t.is_a?(Table) ? t : ( t.respond_to?(:as_rusql_table) ? t.as_rusql_table : nil )
+      raise TypeException.new(Table, t.class) if final_table.nil?
 
       new_one = self.duplicate
-      new_one.instance_variable_set(:@from_table, t)
+      new_one.instance_variable_set(:@from_table, final_table)
 
       new_one
     end

data/lib/rusql/version.rb

@@ -1,3 +1,3 @@
 module Rusql
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rusql
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ajith Hussain