influxdb-arel 0.0.1 → 0.1.0

data/lib/influxdb/arel/nodes.rb

@@ -1,27 +1,20 @@
 require 'influxdb/arel/nodes/node'
+require 'influxdb/arel/nodes/unary'
+require 'influxdb/arel/nodes/binary'
 require 'influxdb/arel/nodes/now'
 require 'influxdb/arel/nodes/select_statement'
-# require 'influxdb/arel/nodes/update_statement'
-
-# unary
-require 'influxdb/arel/nodes/unary'
+require 'influxdb/arel/nodes/delete_statement'
+require 'influxdb/arel/nodes/attribute'
+require 'influxdb/arel/nodes/table'
 require 'influxdb/arel/nodes/grouping'
 require 'influxdb/arel/nodes/time'
-
-
-# binary
-require 'influxdb/arel/nodes/binary'
 require 'influxdb/arel/nodes/duration'
 require 'influxdb/arel/nodes/equality'
 require 'influxdb/arel/nodes/in'
-# require 'influxdb/arel/nodes/delete_statement'
 require 'influxdb/arel/nodes/table_alias'
 require 'influxdb/arel/nodes/infix_operation'
-
-# nary
 require 'influxdb/arel/nodes/and'
-
-
 require 'influxdb/arel/nodes/function'
-# require 'influxdb/arel/nodes/named_function'
 require 'influxdb/arel/nodes/sql_literal'
+require 'influxdb/arel/nodes/ordering'
+require 'influxdb/arel/nodes/merge'

data/lib/influxdb/arel/nodes/attribute.rb

@@ -0,0 +1,20 @@
+module Influxdb
+  module Arel
+    module Nodes
+      class Attribute < Unary
+        include Extensions::Expressions
+        include Extensions::Predications
+        include Extensions::AliasPredication
+        include Extensions::Math
+
+        def time?
+          value.to_s == 'time'
+        end
+
+        def sequence_number?
+          value.to_s == 'sequence_number'
+        end
+      end
+    end
+  end
+end

data/lib/influxdb/arel/nodes/binary.rb

@@ -6,14 +6,16 @@ module Influxdb
 
         def initialize(left, right)
           super()
+          left = left.to_s if Symbol === left
+          right = right.to_s if Symbol === right
           self.left = left
           self.right = right
         end
 
         def initialize_copy(other)
           super
-          self.left = left.clone if left
-          self.right = right.clone if right
+          self.left = left.safe_clone if left
+          self.right = right.safe_clone if right
         end
 
         def hash
@@ -36,7 +38,6 @@ module Influxdb
         LessThan
         LessThanOrEqual
         Matches
-        Merge
         NotEqual
         Or
       }.each do |name|

data/lib/influxdb/arel/nodes/delete_statement.rb

@@ -0,0 +1,37 @@
+module Influxdb
+  module Arel
+    module Nodes
+      class DeleteStatement < Node
+        attr_accessor :wheres, :tables, :regexp
+
+        def initialize
+          super
+          self.wheres = []
+          self.tables = []
+          self.regexp = nil
+        end
+
+        def initialize_copy(other)
+          super
+          self.wheres = wheres.map{|where| where.clone }
+          self.tables = tables.map{|table| table.clone }
+          self.regexp = regexp.clone
+        end
+
+        def table
+          regexp || tables
+        end
+
+        def hash
+          [wheres,  tables].hash
+        end
+
+        def eql?(other)
+          self.class == other.class && wheres == other.wheres && table == other.table
+        end
+
+        alias :== :eql?
+      end
+    end
+  end
+end

data/lib/influxdb/arel/nodes/duration.rb

@@ -14,15 +14,15 @@ module Influxdb
         end
 
         def time
-          Arel.time(self)
+          Time.new(self)
         end
 
         def ago
-          Arel.now - self
+          Now.new - self
         end
 
         def since
-          Arel.now + self
+          Now.new + self
         end
       end
     end

data/lib/influxdb/arel/nodes/function.rb

@@ -2,8 +2,8 @@ module Influxdb
   module Arel
     module Nodes
       class Function < Node
-        include AliasPredication
-        include Math
+        include Extensions::AliasPredication
+        include Extensions::Math
 
         attr_accessor :expressions
 

data/lib/influxdb/arel/nodes/grouping.rb

@@ -2,9 +2,9 @@ module Influxdb
   module Arel
     module Nodes
       class Grouping < Unary
-        include Predications
-        include AliasPredication
-        include Expressions
+        include Extensions::Predications
+        include Extensions::AliasPredication
+        include Extensions::Expressions
       end
     end
   end

data/lib/influxdb/arel/nodes/infix_operation.rb

@@ -2,10 +2,9 @@ module Influxdb
   module Arel
     module Nodes
       class InfixOperation < Binary
-        include Expressions
-        include Predications
-        include AliasPredication
-        include Math
+        include Extensions::Expressions
+        include Extensions::Predications
+        include Extensions::Math
 
         attr_reader :operator
 
@@ -39,12 +38,20 @@ module Influxdb
         def initialize(left, right)
           super(:+, left, right)
         end
+
+        def as(name)
+          Grouping.new(self).as(name)
+        end
       end
 
       class Subtraction < InfixOperation
         def initialize(left, right)
           super(:-, left, right)
         end
+
+        def as(name)
+          Grouping.new(self).as(name)
+        end
       end
     end
   end

data/lib/influxdb/arel/nodes/merge.rb

@@ -0,0 +1,13 @@
+module Influxdb
+  module Arel
+    module Nodes
+      class Merge < Binary
+        def initialize(left, right)
+          left = left.unalias if left.respond_to?(:unalias)
+          right = right.unalias if right.respond_to?(:unalias)
+          super(left, right)
+        end
+      end
+    end
+  end
+end

data/lib/influxdb/arel/nodes/node.rb

@@ -2,17 +2,29 @@ module Influxdb
   module Arel
     module Nodes
       class Node
-        def or(right)
-          Nodes::Grouping.new(Nodes::Or.new(self, right))
-        end
+        include Extensions::BooleanPredications
 
-        def and(right)
-          Nodes::And.new([self, right])
-        end
+        ENTENSIONS = {
+          alias: :AliasPrediction,
+          table_alias: :TableAliasPrediction,
+          math: :Math,
+          expressions: :Expressions,
+          predications: :Predications
+        }
 
         def to_sql
           Visitor.new.accept(self)
         end
+
+        def extend(*extensions)
+          extensions.each do |extension|
+            if module_name = EXTENSIONS[extension]
+              singleton_class.send(:include, Influxdb::Arel::Extensions.const_get(module_name))
+            end
+          end
+
+          self
+        end
       end
     end
   end

data/lib/influxdb/arel/nodes/now.rb

@@ -2,7 +2,7 @@ module Influxdb
   module Arel
     module Nodes
       class Now < Node
-        include Math
+        include Extensions::Math
 
         def eql?(other)
           self.class == other.class

data/lib/influxdb/arel/nodes/ordering.rb

@@ -0,0 +1,15 @@
+module Influxdb
+  module Arel
+    module Nodes
+      class Ordering < Unary
+        alias :direction :expr
+
+        REVERSALS = { asc: :desc, desc: :asc }.freeze
+
+        def invert
+          Ordering.new(REVERSALS[direction.to_sym])
+        end
+      end
+    end
+  end
+end

data/lib/influxdb/arel/nodes/select_statement.rb

@@ -2,14 +2,15 @@ module Influxdb
   module Arel
     module Nodes
       class SelectStatement < Node
-        attr_accessor :limit, :order, :wheres, :groups, :columns, :series, :join, :merge, :fill, :into
+        attr_accessor :limit, :order, :wheres, :groups, :attributes, :tables, :join, :merge, :regexp, :fill, :into
 
         def initialize
           super
           self.wheres = []
           self.groups = []
-          self.columns = []
-          self.series = []
+          self.attributes = []
+          self.tables = []
+          self.regexp = nil
           self.merge = nil
           self.join = nil
           self.order = nil
@@ -22,10 +23,11 @@ module Influxdb
           super
           self.wheres = wheres.map{|where| where.clone }
           self.groups = groups.map{|group| group.clone }
-          self.columns = columns.map{|column| column.clone }
-          self.series = series.map{|series| series.clone }
+          self.attributes = attributes.map{|attribute| attribute.clone }
+          self.tables = tables.map{|table| table.clone }
           self.join = join.clone if join
           self.merge = merge.clone if merge
+          self.regexp = regexp.clone if regexp
           self.order = order.clone if order
           self.limit = limit.clone if limit
           self.fill = fill.clone if fill
@@ -33,16 +35,16 @@ module Influxdb
         end
 
         def table
-          join || merge || series.map(&:unalias).uniq
+          join || merge || regexp || tables.map(&:unalias).uniq
         end
 
         def hash
-          [limit, order, wheres, groups, columns, table, fill, into].hash
+          [limit, order, wheres, groups, attributes, table, fill, into].hash
         end
 
         def eql?(other)
           self.class == other.class &&
-            columns == other.columns &&
+            attributes == other.attributes &&
             wheres == other.wheres &&
             groups == other.groups &&
             table == other.table &&

data/lib/influxdb/arel/nodes/sql_literal.rb

@@ -2,20 +2,17 @@ module Influxdb
   module Arel
     module Nodes
       class SqlLiteral < String
-        include Expressions
-        include Predications
-        include AliasPredication
+        include Extensions::Expressions
+        include Extensions::Predications
+        include Extensions::AliasPredication
+        include Extensions::BooleanPredications
 
         def name
           self
         end
 
-        def unalias
-          self
-        end
-
         def eql?(other)
-          Table.comparable_classes.include?(other.class) && name == other.name
+          self.class == other.class && name == other.name
         end
       end
     end

data/lib/influxdb/arel/nodes/table.rb

@@ -0,0 +1,19 @@
+module Influxdb
+  module Arel
+    module Nodes
+      class Table < Unary
+        include Extensions::JoiningMerging
+
+        alias :name :value
+
+        def as(name)
+          TableAlias.new(self, name)
+        end
+
+        def unalias
+          self
+        end
+      end
+    end
+  end
+end

data/lib/influxdb/arel/nodes/table_alias.rb

@@ -2,14 +2,12 @@ module Influxdb
   module Arel
     module Nodes
       class TableAlias < Binary
+        include Extensions::JoiningMerging
+
         alias :name :right
         alias :relation :left
         alias :table_alias :name
 
-        def [](name)
-          Attribute.new(self, name)
-        end
-
         def table_name
           relation.respond_to?(:name) ? relation.name : name
         end

data/lib/influxdb/arel/nodes/unary.rb

@@ -7,9 +7,15 @@ module Influxdb
 
         def initialize(expr)
           super()
+          expr = expr.to_s if Symbol === expr
           self.expr = expr
         end
 
+        def initialize_copy(other)
+          super
+          self.expr = expr.safe_clone if expr
+        end
+
         def hash
           self.expr.hash
         end
@@ -25,7 +31,6 @@ module Influxdb
         Group
         Limit
         Fill
-        Ordering
         Into
       }.each do |name|
         const_set(name, Class.new(Unary))

data/lib/influxdb/arel/quoter.rb

@@ -0,0 +1,85 @@
+require 'bigdecimal'
+
+module Influxdb
+  module Arel
+    module Quoter
+      extend self
+
+      class Repository
+        def initialize
+          @types = {}
+        end
+
+        def add(type, &block)
+          @types[type] = block
+        end
+
+        def quote(value)
+          block = @types[value.class]
+          block ? block.call(value) : value.inspect
+        end
+      end
+
+      def repository
+        @repository ||= Repository.new
+      end
+
+      def repository=(value)
+        @repository = value
+      end
+
+      def quote(value)
+        repository.quote(value)
+      end
+
+      def add_type(type, &block)
+        repository.add(type, &block)
+      end
+    end
+
+    Quoter.add_type(String) do |value|
+      "'#{value}'"
+    end
+
+    Quoter.add_type(Time) do |value|
+      "'#{value.utc.strftime('%Y-%m-%d %H:%M:%S')}'"
+    end
+
+    Quoter.add_type(Date) do |value|
+      "'#{value.to_time.utc.strftime('%Y-%m-%d')}'"
+    end
+
+    Quoter.add_type(DateTime) do |value|
+      "'#{value.to_time.utc.strftime('%Y-%m-%d %H:%M:%S')}'"
+    end
+
+    Quoter.add_type(BigDecimal) do |value|
+      value.to_s('F')
+    end
+
+    Quoter.add_type(NilClass) do |value|
+      'null'
+    end
+
+    Quoter.add_type(Hash) do |value|
+      value = value.to_json if value.respond_to?(:to_json)
+      value.to_s
+    end
+
+    Quoter.add_type(Nodes::SqlLiteral) do |value|
+      value
+    end
+
+    if defined?(ActiveSupport::Multibyte::Chars)
+      Quoter.add_type(ActiveSupport::Multibyte::Chars) do |value|
+        "'#{value}'"
+      end
+    end
+
+    if defined?(ActiveSupport::StringInquirer)
+      Quoter.add_type(ActiveSupport::StringInquirer) do |value|
+        "'#{value}'"
+      end
+    end
+  end
+end