active_house 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e74ee14ef20d87860ffb175ba8adeef0488777
-  data.tar.gz: 226c0ae19eb0e1c451ac7bcbcfec035bbd602f16
+  metadata.gz: d444148c72cbef93a8a193e8c73079791e77ecc4
+  data.tar.gz: 9fbcef6e31a2627dbc822dddc64d72b1dcb1a3ec
 SHA512:
-  metadata.gz: aa2e80513b87275dd3996c09f6c6e63c7392fa0ab930468f1ec7fc08ae389b71d9be993cff385d1dcb6b5d98f056115dedbf1c0079164fe55dd807f1d0f09842
-  data.tar.gz: 35c22b8dc84e426b967a10169aa707979e3ed6a5ffb472c25c6092f4dccaadd384facc4c09de719e8e9fadafe29bfd3da9c3c7e8d458a06f571045497420d8ce
+  metadata.gz: 92e3a2d335222804ef4f09ce2ed8037ffee60b496d6a3d70e1dabfeb86fa87242900a91b72f538c227eb30c9a4241e4707ef92fa5bfd95d9455a835b409bd660
+  data.tar.gz: 1e744dc7fa583e5d1861bf8561b4a7165f3624369af37110f05b493825dff5b5d9778c4ab0b5468838647875960e9b70705d57548af4d93db8d68bc59bd20c14

data/lib/active_house/chainable.rb

@@ -4,6 +4,8 @@ require_relative 'whereable'
 require_relative 'orderable'
 require_relative 'groupable'
 require_relative 'limitable'
+require_relative 'havingable'
+require_relative 'unionable'
 require 'active_support/concern'
 
 module ActiveHouse
@@ -15,7 +17,9 @@ module ActiveHouse
     include ActiveHouse::Whereable
     include ActiveHouse::Orderable
     include ActiveHouse::Groupable
+    include ActiveHouse::Havingable
     include ActiveHouse::Limitable
+    include ActiveHouse::Unionable
 
     included do
       protected
@@ -26,7 +30,8 @@ module ActiveHouse
 
       def data=(other_data)
         chain_methods.values.each do |var|
-          instance_variable_set(:"@#{var}", other_data.fetch(var).dup)
+          value = other_data.fetch(var)
+          instance_variable_set(:"@#{var}", value.nil? ? nil : value.dup)
         end
       end
 
@@ -36,8 +41,10 @@ module ActiveHouse
             build_from_query_part,
             build_where_query_part,
             build_group_by_query_part,
+            build_having_query_part,
             build_order_by_query_part,
-            build_limit_query_part
+            build_limit_query_part,
+            build_union_query_part
         ]
       end
 
@@ -90,7 +97,23 @@ module ActiveHouse
           where: :conditions,
           group_by: :grouping,
           order_by: :ordering,
-          limit: :limit
+          limit: :limit,
+          having: :having,
+          union: :unions,
+          from: :subquery
+      }
+    end
+
+    def chain_defaults
+      {
+          fields: [],
+          conditions: [],
+          grouping: [],
+          ordering: [],
+          limit: { offset: nil, limit: nil },
+          having: [],
+          union: {},
+          subquery: nil,
       }
     end
 
@@ -103,7 +126,7 @@ module ActiveHouse
 
       new_data = {}
       chain_methods.each do |meth, var|
-        new_data[var] = [] if values.include?(meth)
+        new_data[var] = chain_defaults[var].dup if values.include?(meth)
       end
       chain_query(new_data)
     end

data/lib/active_house/fromable.rb

@@ -5,18 +5,25 @@ module ActiveHouse
     included do
       private
 
+      def from_subquery
+        return model_class._table_name if @subquery.nil?
+        query = @subquery.is_a?(ActiveHouse::Query) ? @subquery.to_query : @subquery
+        "( #{query} )"
+      end
+
       def build_from_query_part
-        "FROM #{table_name}"
+        "FROM #{from_subquery}"
       end
     end
 
     def initialize(*)
-      @table_name = model_class._table_name
+      @subquery = nil
       super
     end
 
-    def table_name
-      @table_name
+    def from(table_or_subquery)
+      raise ArgumentError, '' if !table_or_subquery.is_a?(ActiveHouse::Query) && !table_or_subquery.is_a?(String)
+      chain_query subquery: table_or_subquery.dup
     end
   end
 end

data/lib/active_house/havingable.rb

@@ -0,0 +1,50 @@
+require_relative 'prepared_statement'
+require 'active_support/core_ext/array/wrap'
+
+module ActiveHouse
+  module Havingable
+    extend ActiveSupport::Concern
+
+    included do
+      private
+
+      def format_having(*conditions)
+        raise ArgumentError, 'wrong number of arguments' if conditions.empty?
+        return ActiveHouse::PreparedStatement.prepare_sql(*conditions) if conditions.size > 1
+        condition = conditions.first
+        if condition.is_a?(Hash)
+          condition.map do |field, value|
+            "#{field} #{sign_for_having(value)} #{ActiveHouse::PreparedStatement.format_value(value)}"
+          end
+        else
+          condition.to_s
+        end
+      end
+
+      def sign_for_having(value)
+        if value.is_a?(Array)
+          'IN'
+        elsif value.nil?
+          'IS'
+        else
+          '='
+        end
+      end
+
+      def build_having_query_part
+        "HAVING\n" + @having.join(" AND\n") unless @having.empty?
+      end
+    end
+
+    def initialize(*)
+      @having = []
+      super
+    end
+
+    def having(*conditions)
+      raise ArgumentError, 'wrong number of arguments' if conditions.empty?
+      formatted_conditions = Array.wrap(format_having(*conditions))
+      chain_query having: (@having + formatted_conditions).uniq
+    end
+  end
+end

data/lib/active_house/limitable.rb

@@ -6,22 +6,22 @@ module ActiveHouse
       private
 
       def build_limit_query_part
-        return if @limit.empty?
-        if @limit[1]
-          "LIMIT #{@limit[0]}, #{@limit[1]}"
+        return if @limit[:limit].nil?
+        if @limit[:offset]
+          "LIMIT #{@limit[:limit]}, #{@limit[:offset]}"
         else
-          "LIMIT #{@limit[0]}"
+          "LIMIT #{@limit[:limit]}"
         end
       end
     end
 
     def initialize(*)
-      @limit = []
+      @limit = { offset: nil, limit: nil }
       super
     end
 
     def limit(limit_value, offset_value = nil)
-      chain_query limit: (@limit + [limit_value, offset_value]).uniq
+      chain_query limit: { offset: offset_value || @limit[:offset], limit: limit_value }
     end
   end
 end

data/lib/active_house/modeling.rb

@@ -38,7 +38,7 @@ module ActiveHouse
 
       def attributes(*names)
         options = names.extract_options!
-        names.each { |name| attributes(name, options.dup) }
+        names.each { |name| attribute(name, options.dup) }
       end
 
       def load!(params)

data/lib/active_house/orderable.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/try'
+
 module ActiveHouse
   module Orderable
     extend ActiveSupport::Concern
@@ -25,7 +27,7 @@ module ActiveHouse
         elsif clause.is_a?(Hash)
           if clause.keys.one?
             direction = clause.values.first
-            raise ArgumentError, 'direction must be asc or desc' if [:asc, :desc].exclude?(direction.try!(:to_sym))
+            raise ArgumentError, 'direction must be asc or desc' unless [:asc, :desc].include?(direction.try!(:to_sym))
             "#{clause.keys.first} #{direction.to_s.upcase}"
           else
             clause.assert_valid_keys(:field, :direction, :collate)

data/lib/active_house/querying.rb

@@ -11,7 +11,7 @@ module ActiveHouse
     end
 
     class_methods do
-      delegate :to_a, :select, :where, :group_by, :limit, to: :all
+      delegate :to_a, :select, :where, :group_by, :limit, :order_by, :having, to: :all
 
       def all
         _query_class.new(self)

data/lib/active_house/unionable.rb

@@ -0,0 +1,43 @@
+module ActiveHouse
+  module Unionable
+    extend ActiveSupport::Concern
+
+    included do
+      private
+
+      def build_union_query_part
+        "UNION ALL\n#{@unions.values.map(&:to_query).join("\n")}" unless @unions.values.empty?
+      end
+    end
+
+    def initialize(*)
+      @unions = {}
+      super
+    end
+
+    def union(name, query)
+      query = query.all if query.is_a?(ActiveHouse::Model)
+      raise ArgumentError, 'argument must be model or query object' unless query.is_a?(ActiveHouse::Query)
+      new_unions = @unions.map { |n, q| [n, q.dup] }.to_h
+      new_unions[name] = query.dup
+      chain_query unions: new_unions
+    end
+
+    def update_union(name, &block)
+      raise ArgumentError, "can't find union by name #{name}" unless @unions.key?(name)
+      new_union = block.call union_for(name)
+      union(name, new_union)
+    end
+
+    def union_for(name)
+      raise ArgumentError, "can't find union by name #{name}" unless @unions.key?(name)
+      @unions[name].dup
+    end
+
+    def except_union(name)
+      new_unions = @unions.map { |n, q| [n, q.dup] }.to_h
+      new_unions.delete(name)
+      chain_query unions: new_unions
+    end
+  end
+end

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/active_house/whereable.rb

@@ -8,10 +8,6 @@ module ActiveHouse
     included do
       private
 
-      def format_condition_value(value)
-        ActiveHouse::PreparedStatement.format_value(value)
-      end
-
       def format_condition(*conditions)
         raise ArgumentError, 'wrong number of arguments' if conditions.empty?
         return ActiveHouse::PreparedStatement.prepare_sql(*conditions) if conditions.size > 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -122,6 +122,7 @@ files:
 - lib/active_house/error.rb
 - lib/active_house/fromable.rb
 - lib/active_house/groupable.rb
+- lib/active_house/havingable.rb
 - lib/active_house/limitable.rb
 - lib/active_house/logger.rb
 - lib/active_house/model.rb
@@ -133,6 +134,7 @@ files:
 - lib/active_house/scopeable.rb
 - lib/active_house/scoping.rb
 - lib/active_house/selectable.rb
+- lib/active_house/unionable.rb
 - lib/active_house/version.rb
 - lib/active_house/whereable.rb
 homepage: https://github.com/senid231/active_house