veritas-sql-generator 0.0.3 → 0.0.4

data/.rvmrc

@@ -0,0 +1 @@
+rvm use @$(basename `pwd`) --create

data/.travis.yml

@@ -0,0 +1,8 @@
+bundler_args: --without guard metrics
+script: "bundle exec rake spec"
+rvm:
+  - ree
+  - 1.8.7
+  - 1.9.2
+  - ruby-head
+  - rbx

data/Gemfile

@@ -1,23 +1,33 @@
+# encoding: utf-8
+
 source :rubygems
 
-gem 'veritas', '0.0.3', :git => 'git://github.com/dkubb/veritas.git'
+gem 'veritas', '0.0.4', :git => 'git://github.com/dkubb/veritas.git'
 
 group :development do
-  gem 'backports', '~> 2.1.0'
-  gem 'jeweler',   '~> 1.5.2'
-  gem 'rake',      '~> 0.8.7'
+  gem 'backports', '~> 2.2.1'
+  gem 'jeweler',   '~> 1.6.0'
+  gem 'rake',      '~> 0.9.0'
   gem 'rspec',     '~> 1.3.2'
-  gem 'yard',      '~> 0.6.8'
+  gem 'yard',      '~> 0.7.1'
+end
+
+group :guard do
+  gem 'growl',         '~> 1.0.3'
+  gem 'guard',         '~> 0.3.4'
+  gem 'guard-bundler', '~> 0.1.3'
+  gem 'guard-ego',     '~> 0.0.1'
+  gem 'guard-rspec',   '~> 0.3.1'
 end
 
-group :jruby do
-  platform :jruby do
-    gem 'jruby-openssl', '~> 0.7.3'
+platform :jruby do
+  group :jruby do
+    gem 'jruby-openssl', '~> 0.7.4'
   end
 end
 
 platforms :mri_18 do
-  group :quality do
+  group :metrics do
     gem 'flay',      '~> 1.4.2'
     gem 'flog',      '~> 2.5.1'
     gem 'heckle',    '~> 1.4.3'
@@ -28,6 +38,6 @@ platforms :mri_18 do
     gem 'reek',      '~> 1.2.8', :git => 'git://github.com/dkubb/reek.git'
     gem 'roodi',     '~> 2.1.0'
     gem 'ruby2ruby', '=  1.2.2'
-    gem 'yardstick', '~> 0.3.0'
+    gem 'yardstick', '~> 0.4.0'
   end
 end

data/Guardfile

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+guard 'ego' do
+  watch('Guardfile')
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+end
+
+guard 'rspec' do
+  # run all specs if the spec_helper or supporting files files are modified
+  watch('spec/spec_helper.rb')                      { 'spec' }
+  watch(%r{\Aspec/(?:lib|support|shared)/.+\.rb\z}) { 'spec' }
+
+  # run unit specs if associated lib code is modified
+  watch(%r{\Alib/(.+)\.rb\z})                                         { |m| Dir["spec/unit/#{m[1]}"] }
+  watch("lib/#{File.basename(File.expand_path('../', __FILE__))}.rb") { 'spec'                       }
+
+  # run a spec if it is modified
+  watch(%r{\Aspec/(?:unit|integration)/.+_spec\.rb\z})
+end

data/README.rdoc

@@ -2,6 +2,8 @@
 
 Relational algebra SQL generator
 
+http://travis-ci.org/dkubb/veritas-sql-generator.png
+
 == Note on Patches/Pull Requests
 
 * If you want your code merged into the mainline, please discuss

data/Rakefile

@@ -1,9 +1,11 @@
+# encoding: utf-8
+
 require 'rake'
 
 require File.expand_path('../lib/veritas/sql/generator/version', __FILE__)
 
 begin
-  gem('jeweler', '~> 1.5.2') if respond_to?(:gem, true)
+  gem('jeweler', '~> 1.6.0') if respond_to?(:gem, true)
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -21,5 +23,5 @@ begin
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.0'
 end

data/TODO

@@ -1,5 +1,5 @@
-* Replace some of the conditional logic with polymorphism, especially
-  where there is special case logic for certain types of generators
+* Replace some of the conditional function with polymorphism, especially
+  where there is special case function for certain types of generators
   within other generators.
   * Replace Equality/Inequality with classes that handle all of the
     special cases.
@@ -15,3 +15,17 @@
   Negation wrapping an Equality/Inclusion) on an *optional* attribute.
   * Add "OR attribute IS NULL" to the statement to ensure cases when
     the value is NULL still matches.
+
+* Handle cases where WHERE clause does and does not reference a function
+  in the SELECT list.
+  * It should collapse the inner subquery when there is no reference, and
+    keep the subquery when it is referenced.
+  * This will likely apply to projection and rename operators too.
+
+* When Restriction wraps a Summarization, and it would normally wrap the
+  statement and apply a WHERE clause, it should apply the clause using
+  HAVING instead.
+
+* Handle case where Extension does not reference a column in the
+  wrapped Summarization or Rename. It should be safe to collapse the query
+  in those cases.

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
-threshold: 3
-total_score: 3
+threshold: 7
+total_score: 10

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 13.3
+threshold: 14.9

data/config/roodi.yml

@@ -1,16 +1,16 @@
 ---
-AbcMetricMethodCheck:            { score: 7.1 }
+AbcMetricMethodCheck:            { score: 9.1 }
 AssignmentInConditionalCheck:    { }
 CaseMissingElseCheck:            { }
-ClassLineCountCheck:             { line_count: 316 }
+ClassLineCountCheck:             { line_count: 369 }
 ClassNameCheck:                  { pattern: !ruby/regexp /\A(?:[A-Z]+|[A-Z][a-z](?:[A-Z]?[a-z])+)\z/ }
 ClassVariableCheck:              { }
 CyclomaticComplexityBlockCheck:  { complexity: 2 }
 CyclomaticComplexityMethodCheck: { complexity: 6 }
 EmptyRescueBodyCheck:            { }
 ForLoopCheck:                    { }
-MethodLineCountCheck:            { line_count: 7 }
-MethodNameCheck:                 { pattern: !ruby/regexp /\A(?:[a-z](?:_?[a-z])+[?!=]?|\[\]=?|==|<=>|[+*&|-])\z/ }
-ModuleLineCountCheck:            { line_count: 345 }
+MethodLineCountCheck:            { line_count: 10 }
+MethodNameCheck:                 { pattern: !ruby/regexp /\A(?:[a-z\d](?:_?[a-z\d])+[?!=]?|\[\]=?|==|<=>|[+*&|-])\z/ }
+ModuleLineCountCheck:            { line_count: 375 }
 ModuleNameCheck:                 { pattern: !ruby/regexp /\A(?:[A-Z]+|[A-Z][a-z](?:[A-Z]?[a-z])+)\z/ }
 ParameterNumberCheck:            { parameter_count: 3 }

data/config/site.reek

@@ -8,13 +8,16 @@ UncommunicativeParameterName:
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
 LargeClass:
-  max_methods: 22  # TODO: reduce this in UnaryRelation
+  max_methods: 26  # TODO: reduce this in UnaryRelation
   exclude: []
   enabled: true
-  max_instance_variables: 9  # TODO: reduce this in UnaryRelation
+  max_instance_variables: 12  # TODO: reduce this in UnaryRelation
 UncommunicativeMethodName:
   accept: []
-  exclude: []
+  exclude: [
+    'Date#iso8601',
+    'DateTime#iso8601'
+  ]
   enabled: true
   reject:
   - !ruby/regexp /^[a-z]$/
@@ -30,16 +33,15 @@ FeatureEnvy:
     # TODO: change these methods to be class methods
     'Veritas::SQL::Generator::Attribute#visit_veritas_attribute',
     'Veritas::SQL::Generator::Identifier#visit_identifier',
-    'Veritas::SQL::Generator::Literal#visit_date_time',
     'Veritas::SQL::Generator::Literal#visit_numeric',
     'Veritas::SQL::Generator::Literal#visit_string',
-    'Veritas::SQL::Generator::Literal#visit_time',
-    'Veritas::SQL::Generator::Logic#visit_veritas_logic_predicate_inequality',
-    'Veritas::SQL::Generator::Logic#exclusive_range_exclusion_sql',
-    'Veritas::SQL::Generator::Logic#exclusive_range_inclusion_sql',
-    'Veritas::SQL::Generator::Logic#new_from_enumerable_predicate',
-    'Veritas::SQL::Generator::Logic#optional?',
-    'Veritas::SQL::Generator::Relation::Unary#collapse_subquery_for?'
+    'Veritas::SQL::Generator::Function::Predicate#visit_veritas_function_predicate_inequality',
+    'Veritas::SQL::Generator::Function::Predicate#exclusive_range_exclusion_sql',
+    'Veritas::SQL::Generator::Function::Predicate#exclusive_range_inclusion_sql',
+    'Veritas::SQL::Generator::Function::Predicate#new_from_enumerable_predicate',
+    'Veritas::SQL::Generator::Function::Predicate#optional?',
+    'Veritas::SQL::Generator::Relation::Unary#collapse_subquery_for?',
+    'Veritas::SQL::Generator::Relation#column_list_for'
   ]
   enabled: true
 ClassVariable:
@@ -66,7 +68,7 @@ NestedIterators:
   enabled: true
   max_allowed_nesting: 1
 LongMethod:
-  max_statements: 7
+  max_statements: 9
   exclude: [
     'Veritas::SQL::Generator::Relation::Unary#to_s'
   ]
@@ -84,11 +86,11 @@ UtilityFunction:
     'Veritas::SQL::Generator::Identifier#visit_identifier',
     'Veritas::SQL::Generator::Literal#visit_numeric',
     'Veritas::SQL::Generator::Literal#visit_string',
-    'Veritas::SQL::Generator::Logic#visit_veritas_logic_predicate_inequality',
-    'Veritas::SQL::Generator::Logic#exclusive_range_exclusion_sql',
-    'Veritas::SQL::Generator::Logic#exclusive_range_inclusion_sql',
-    'Veritas::SQL::Generator::Logic#new_from_enumerable_predicate',
-    'Veritas::SQL::Generator::Logic#optional?',
+    'Veritas::SQL::Generator::Function::Predicate#visit_veritas_function_predicate_inequality',
+    'Veritas::SQL::Generator::Function::Predicate#exclusive_range_exclusion_sql',
+    'Veritas::SQL::Generator::Function::Predicate#exclusive_range_inclusion_sql',
+    'Veritas::SQL::Generator::Function::Predicate#new_from_enumerable_predicate',
+    'Veritas::SQL::Generator::Function::Predicate#optional?',
     'Veritas::SQL::Generator::Relation::Unary#collapse_subquery_for?'
   ]
   enabled: true
@@ -106,11 +108,11 @@ UncommunicativeVariableName:
 SimulatedPolymorphism:
   exclude: []
   enabled: true
-  max_ifs: 1
+  max_ifs: 2
 DataClump:
   exclude: [
     # TODO: split Range handling methods into separate class/module
-    'Veritas::SQL::Generator::Logic'
+    'Veritas::SQL::Generator::Function'
   ]
   enabled: true
   max_copies: 1

data/lib/veritas/sql/generator.rb

@@ -5,7 +5,8 @@ require 'time'
 
 require 'veritas'
 
-require 'veritas/base_relation'
+require 'veritas/sql/generator/core_ext/date'
+require 'veritas/sql/generator/core_ext/date_time'
 
 require 'veritas/sql/generator/visitor'
 
@@ -13,7 +14,14 @@ require 'veritas/sql/generator/identifier'
 require 'veritas/sql/generator/attribute'
 require 'veritas/sql/generator/direction'
 require 'veritas/sql/generator/literal'
-require 'veritas/sql/generator/logic'
+
+require 'veritas/sql/generator/function'
+require 'veritas/sql/generator/function/aggregate'
+require 'veritas/sql/generator/function/connective'
+require 'veritas/sql/generator/function/numeric'
+require 'veritas/sql/generator/function/predicate'
+require 'veritas/sql/generator/function/proposition'
+require 'veritas/sql/generator/function/string'
 
 require 'veritas/sql/generator/relation'
 require 'veritas/sql/generator/relation/unary'
@@ -30,6 +38,21 @@ module Veritas
       # Raised when an invalid relation is visited
       class InvalidRelationError < StandardError; end
 
+      LEFT_PARENTHESIS  = '('.freeze
+      RIGHT_PARENTHESIS = ')'.freeze
+
+      # Return a parenthesized SQL statement (inline modification)
+      #
+      # @param [#to_s] sql
+      #
+      # @return [#to_s]
+      #   same instance as sql
+      #
+      # @api private
+      def self.parenthesize!(sql)
+        sql.insert(0, LEFT_PARENTHESIS) << RIGHT_PARENTHESIS
+      end
+
     end # module Generator
   end # module SQL
 end # module Veritas

data/lib/veritas/sql/generator/core_ext/date.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+# Extend Date with methods available in ruby 1.9
+class Date
+
+  ISO_8601_FORMAT = '%F'.freeze
+
+  # Return the Date in ISO8601 date format
+  #
+  # @return [#to_s]
+  #
+  # @todo Remove once backports adds this method
+  #
+  # @api private
+  def iso8601
+    date = frozen? ? dup : self
+    date.strftime(ISO_8601_FORMAT)
+  end unless method_defined? :iso8601
+
+end # class Date

data/lib/veritas/sql/generator/core_ext/date_time.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+# Extend DateTime with methods available in ruby 1.9
+class DateTime
+
+  SEC_FRACTION_MULTIPLIER = RUBY_VERSION < '1.9' ? 60 * 60 * 24 : 1
+
+  # Return the DateTime in ISO8601 date-time format
+  #
+  # @param [Integer] time_scale
+  #   the number of significant digits to use for fractional seconds
+  #
+  # @return [#to_s]
+  #
+  # @todo Remove once backports adds this method
+  #
+  # @api private
+  def iso8601(time_scale = 0)
+    super() + iso8601_timediv(time_scale)
+  end unless method_defined?(:iso8601) && instance_method(:iso8601).arity == 1
+
+private
+
+  # Return the time with fraction seconds
+  #
+  # @param [Integer] time_scale
+  #   the number of significant digits to use for fractional seconds
+  #
+  # @return [#to_s]
+  #
+  # @api private
+  def iso8601_timediv(time_scale)
+    date_time = frozen? ? dup : self
+
+    fractional_seconds = unless time_scale.zero?
+      '.%0*d' % [
+        time_scale,
+        date_time.sec_fraction * SEC_FRACTION_MULTIPLIER * 10**time_scale
+      ]
+    end
+
+    date_time.strftime("T%T#{fractional_seconds}%Z")
+  end unless method_defined? :iso8601_timediv
+
+end # class Date

data/lib/veritas/sql/generator/direction.rb

@@ -8,6 +8,8 @@ module Veritas
       module Direction
         include Attribute
 
+        DESC = ' DESC'.freeze
+
         # Visit an Ascending Direction
         #
         # @param [Relation::Operation::Order::Ascending] direction
@@ -27,7 +29,7 @@ module Veritas
         #
         # @api private
         def visit_veritas_relation_operation_order_descending(direction)
-          "#{dispatch direction.attribute} DESC"
+          dispatch(direction.attribute) << DESC
         end
 
       end # module Direction

data/lib/veritas/sql/generator/function.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+module Veritas
+  module SQL
+    module Generator
+
+      # Generates an SQL statement for a function expression
+      module Function
+        include Attribute, Literal
+
+      private
+        # Return the SQL for a umary prefix operation
+        #
+        # @param [#to_s] operator
+        #
+        # @param [Function::Unary] function
+        #
+        # @return [#to_s]
+        #
+        # @api private
+        def unary_prefix_operation_sql(operator, function)
+          "#{operator} (#{dispatch(function.operand)})"
+        end
+
+        # Return the SQL for a binary prefix operation
+        #
+        # @param [#to_s] operator
+        #
+        # @param [Function::Binary] function
+        #
+        # @return [#to_s]
+        #
+        # @api private
+        def binary_prefix_operation_sql(operator, function)
+          "#{operator} (#{dispatch(function.left)}, #{dispatch(function.right)})"
+        end
+
+        # Return the SQL for a binary infix operation
+        #
+        # @param [#to_s] operator
+        #
+        # @param [Function::Binary] function
+        #
+        # @return [#to_s]
+        #
+        # @api private
+        def binary_infix_operation_sql(operator, function)
+          "#{dispatch(function.left)} #{operator} #{dispatch(function.right)}"
+        end
+
+      end # module Function
+    end # module Generator
+  end # module SQL
+end # module Veritas