active_house 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ce9f4613cd0dcd9620da942c301d828f2c29fe
-  data.tar.gz: 813e819830b425a3483d6d859c96d35293576f10
+  metadata.gz: 50733d5482718e12146c8c79d9c4d372df311268
+  data.tar.gz: e3d33e478537b2a0a04e9f02dd970d4c823432c4
 SHA512:
-  metadata.gz: e0ed42cf6fbb9f1f002fe0f7187e224bc20ad595dede752be19b563566e2afe259e3a4424fc9c8b5421e0af87b0bd1a1478987e3b98fd56ea580c67acfd74520
-  data.tar.gz: 8947212b75c06e47f4e3e0cdf6d602dff157b6885bc4ead3f8e7e4fc7a74e84e2c77e4608ad544d2467fe8f57473924201411f444cc132944439de1b928deaab
+  metadata.gz: c52e1158125f806bdd6f8547ba2cd64cc6b2426c9b5c1a3993fc00cf6802b890d3c8d490ccbb3968042778a4a6b1709ff95bb0f28d1572c07530dcb71d00bdc7
+  data.tar.gz: 77f1afc5c493e9ca5fd372763dedaf5036eb0bf22a59c10a5117c435b7abfdd45c04dc63fbb2029b6d0c7cea8210a51673b4bff3f9015e100a722e4e279ea46c

data/lib/active_house/querying/from.rb

@@ -8,8 +8,8 @@ module ActiveHouse
       end
 
       def from_subquery
-        return model_class._table_name if values[:subquery].nil?
-        query = values[:subquery].is_a?(ActiveHouse::QueryBuilder) ? values[:subquery].to_query : values[:subquery].to_s
+        return model_class._table_name if values[:from].nil?
+        query = values[:from].is_a?(ActiveHouse::QueryBuilder) ? values[:from].to_query : values[:from].to_s
         "( #{query} )"
       end
 
@@ -18,7 +18,7 @@ module ActiveHouse
       end
 
       def from!(table_or_subquery)
-        values[:subquery] = table_or_subquery.dup
+        values[:from] = table_or_subquery.dup
         self
       end
 

data/lib/active_house/querying/select.rb

@@ -10,15 +10,15 @@ module ActiveHouse
       end
 
       def build_select_query_part
-        if !values[:fields].empty?
-          "SELECT\n#{values[:fields].join(",\n")}"
+        if !values[:select].empty?
+          "SELECT\n#{values[:select].join(",\n")}"
         else
           'SELECT *'
         end
       end
 
       def initial_values
-        super.merge fields: []
+        super.merge select: []
       end
 
       def select(*fields)
@@ -27,7 +27,7 @@ module ActiveHouse
 
       def select!(*fields)
         formatted_fields = ActiveHouse::PreparedStatement.format_fields(model_class, fields)
-        values[:fields] = (values[:fields] + formatted_fields).uniq
+        values[:select] = (values[:select] + formatted_fields).uniq
         self
       end
     end

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.6.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel