veritas-sql-generator 0.0.4 → 0.0.5

data/.travis.yml

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

data/Gemfile

@@ -2,22 +2,21 @@
 
 source :rubygems
 
-gem 'veritas', '0.0.4', :git => 'git://github.com/dkubb/veritas.git'
+gem 'veritas', '~> 0.0.5', :git => 'git://github.com/dkubb/veritas.git'
 
 group :development do
-  gem 'backports', '~> 2.2.1'
-  gem 'jeweler',   '~> 1.6.0'
-  gem 'rake',      '~> 0.9.0'
+  gem 'backports', '~> 2.3.0'
+  gem 'jeweler',   '~> 1.6.4'
+  gem 'rake',      '~> 0.9.2'
   gem 'rspec',     '~> 1.3.2'
-  gem 'yard',      '~> 0.7.1'
+  gem 'yard',      '~> 0.7.2'
 end
 
 group :guard do
-  gem 'growl',         '~> 1.0.3'
-  gem 'guard',         '~> 0.3.4'
+  gem 'guard',         '~> 0.5.1'
   gem 'guard-bundler', '~> 0.1.3'
   gem 'guard-ego',     '~> 0.0.1'
-  gem 'guard-rspec',   '~> 0.3.1'
+  gem 'guard-rspec',   '~> 0.4.0'
 end
 
 platform :jruby do
@@ -31,7 +30,7 @@ platforms :mri_18 do
     gem 'flay',      '~> 1.4.2'
     gem 'flog',      '~> 2.5.1'
     gem 'heckle',    '~> 1.4.3'
-    gem 'json',      '~> 1.5.1'
+    gem 'json',      '~> 1.5.3'
     gem 'metric_fu', '~> 2.1.1'
     gem 'mspec',     '~> 1.5.17'
     gem 'rcov',      '~> 0.9.9'

data/README.rdoc

@@ -4,6 +4,23 @@ Relational algebra SQL generator
 
 http://travis-ci.org/dkubb/veritas-sql-generator.png
 
+== Usage
+
+  # visit every node in the relation AST
+  generator = Veritas::SQL::Generator::Relation.visit(relation)
+
+  # generate an SQL string
+  sql = generator.to_sql
+
+  # generate an SQL subquery string
+  subquery_sql = generator.to_subquery
+
+== Description
+
+The purpose of this gem is to produce valid SQL from a veritas[https://github.com/dkubb/veritas] relation. A relation is a representation of a query constructed using relational algebra organized into an AST. Each node in the AST corresponds to an operation defined in the algebra.
+
+The SQL produced has been verified and tested against PostgreSQL 9.0.4. Dialects for MySQL, SQLite3, Oracle and SQL Server are planned.
+
 == Note on Patches/Pull Requests
 
 * If you want your code merged into the mainline, please discuss

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake'
 require File.expand_path('../lib/veritas/sql/generator/version', __FILE__)
 
 begin
-  gem('jeweler', '~> 1.6.0') if respond_to?(:gem, true)
+  gem('jeweler', '~> 1.6.2') if respond_to?(:gem, true)
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -23,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.6.0'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.2'
 end

data/TODO

@@ -9,8 +9,6 @@
     * Create Veritas::Literal::Range::Inclusive
     * Create Veritas::Literal::Range::Exclusive
 
-* Adjust reek and roodi scores down to lower thresholds
-
 * Handle cases where an Inequality/Exclusion predicate is used (or a
   Negation wrapping an Equality/Inclusion) on an *optional* attribute.
   * Add "OR attribute IS NULL" to the statement to ensure cases when

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

@@ -3,7 +3,7 @@
 module Veritas
   module SQL
     module Generator
-      VERSION = '0.0.4'
+      VERSION = '0.0.5'
     end # module Generator
   end # module SQL
 end # module Veritas

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@
 
 require 'rubygems'
 require 'backports'
-require 'veritas/sql/generator'
+require 'backports/basic_object'
+require 'veritas-sql-generator'
 require 'spec'
 require 'spec/autorun'
 

data/spec/unit/veritas/sql/generator/literal/visit_time_spec.rb

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe SQL::Generator::Literal, '#visit_time' do
   subject { object.visit_time(time) }
 
-  # Time#iso8601 is currently broken in JRuby 1.6.1 when fractional seconds are not 0
+  # Time#iso8601 is currently broken in JRuby 1.6.2 when fractional seconds are not 0
   def self.time_iso8601_broken?
-    RUBY_PLATFORM =~ /java/ && JRUBY_VERSION <= '1.6.1' && RUBY_VERSION >= '1.9.2'
+    RUBY_PLATFORM.include?('java') && JRUBY_VERSION <= '1.6.2' && RUBY_VERSION >= '1.9.2'
   end
 
   let(:described_class) { Class.new(SQL::Generator::Visitor) { include SQL::Generator::Literal } }

data/spec/unit/veritas/sql/generator/relation/binary/visit_veritas_algebra_join_spec.rb

@@ -55,7 +55,7 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_join' do
   end
 
   context 'when the operands are restrictions' do
-    let(:operand) { base_relation.restrict { |r| r[:id].eq(1) } }
+    let(:operand) { base_relation.restrict { |r| r.id.eq(1) } }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -65,8 +65,8 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_join' do
 
   context 'when the operand is a summarization' do
     context 'summarize per table dee' do
-      let(:summarize_per) { TABLE_DEE                                                                  }
-      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r[:id].count) } }
+      let(:summarize_per) { TABLE_DEE                                                                }
+      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r.id.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -75,8 +75,8 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_join' do
     end
 
     context 'summarize per table dum' do
-      let(:summarize_per) { TABLE_DUM                                                                  }
-      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r[:id].count) } }
+      let(:summarize_per) { TABLE_DUM                                                                }
+      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r.id.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -85,7 +85,7 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_join' do
     end
 
     context 'summarize by a subset of the operand header' do
-      let(:operand) { base_relation.summarize([ :id, :name ]) { |r| r.add(:count, r[:age].count) } }
+      let(:operand) { base_relation.summarize([ :id, :name ]) { |r| r.add(:count, r.age.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -95,7 +95,7 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_join' do
   end
 
   context 'when the operands are ordered' do
-    let(:operand) { base_relation.order }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] } }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -104,7 +104,7 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_join' do
   end
 
   context 'when the operands are reversed' do
-    let(:operand) { base_relation.order.reverse }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.reverse }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -113,7 +113,7 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_join' do
   end
 
   context 'when the operands are limited' do
-    let(:operand) { base_relation.order.take(1) }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.take(1) }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -122,7 +122,7 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_join' do
   end
 
   context 'when the operands are offsets' do
-    let(:operand) { base_relation.order.drop(1) }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.drop(1) }
 
     it_should_behave_like 'a generated SQL SELECT query'
 

data/spec/unit/veritas/sql/generator/relation/binary/visit_veritas_algebra_product_spec.rb

@@ -58,8 +58,8 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_product' do
   end
 
   context 'when the operand is a restriction' do
-    let(:left)  { users.restrict { |r| r[:id].eq(1) }       }
-    let(:right) { other.restrict { |r| r[:other_id].eq(1) } }
+    let(:left)  { users.restrict { |r| r.id.eq(1) }       }
+    let(:right) { other.restrict { |r| r.other_id.eq(1) } }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -69,9 +69,9 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_product' do
 
   context 'when the operand is a summarization' do
     context 'summarize per table dee' do
-      let(:summarize_per) { TABLE_DEE                                                                      }
-      let(:left)          { users.summarize(summarize_per) { |r| r.add(:count, r[:id].count) }             }
-      let(:right)         { other.summarize(summarize_per) { |r| r.add(:other_count, r[:other_id].count) } }
+      let(:summarize_per) { TABLE_DEE                                                                    }
+      let(:left)          { users.summarize(summarize_per) { |r| r.add(:count, r.id.count) }             }
+      let(:right)         { other.summarize(summarize_per) { |r| r.add(:other_count, r.other_id.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -80,9 +80,9 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_product' do
     end
 
     context 'summarize per table dum' do
-      let(:summarize_per) { TABLE_DUM                                                                      }
-      let(:left)          { users.summarize(summarize_per) { |r| r.add(:count, r[:id].count) }             }
-      let(:right)         { other.summarize(summarize_per) { |r| r.add(:other_count, r[:other_id].count) } }
+      let(:summarize_per) { TABLE_DUM                                                                    }
+      let(:left)          { users.summarize(summarize_per) { |r| r.add(:count, r.id.count) }             }
+      let(:right)         { other.summarize(summarize_per) { |r| r.add(:other_count, r.other_id.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -91,8 +91,8 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_product' do
     end
 
     context 'summarize by a subset of the operand header' do
-      let(:left)  { users.summarize([ :id, :name ]) { |r| r.add(:count, r[:age].count) }                         }
-      let(:right) { other.summarize([ :other_id, :other_name ]) { |r| r.add(:other_count, r[:other_age].count) } }
+      let(:left)  { users.summarize([ :id, :name ]) { |r| r.add(:count, r.age.count) }                         }
+      let(:right) { other.summarize([ :other_id, :other_name ]) { |r| r.add(:other_count, r.other_age.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -102,8 +102,8 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_product' do
   end
 
   context 'when the operand is ordered' do
-    let(:left)  { users.order }
-    let(:right) { other.order }
+    let(:left)  { users.sort_by { |r| [ r.id, r.name, r.age ] }                   }
+    let(:right) { other.sort_by { |r| [ r.other_id, r.other_name, r.other_age ] } }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -112,8 +112,8 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_product' do
   end
 
   context 'when the operand is reversed' do
-    let(:left)  { users.order.reverse }
-    let(:right) { other.order.reverse }
+    let(:left)  { users.sort_by { |r| [ r.id, r.name, r.age ] }.reverse                   }
+    let(:right) { other.sort_by { |r| [ r.other_id, r.other_name, r.other_age ] }.reverse }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -122,8 +122,8 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_product' do
   end
 
   context 'when the operand is limited' do
-    let(:left)  { users.order.take(1) }
-    let(:right) { other.order.take(1) }
+    let(:left)  { users.sort_by { |r| [ r.id, r.name, r.age ] }.take(1)                   }
+    let(:right) { other.sort_by { |r| [ r.other_id, r.other_name, r.other_age ] }.take(1) }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -132,8 +132,8 @@ describe SQL::Generator::Relation::Binary, '#visit_veritas_algebra_product' do
   end
 
   context 'when the operand is an offset' do
-    let(:left)  { users.order.drop(1) }
-    let(:right) { other.order.drop(1) }
+    let(:left)  { users.sort_by { |r| [ r.id, r.name, r.age ] }.drop(1)                   }
+    let(:right) { other.sort_by { |r| [ r.other_id, r.other_name, r.other_age ] }.drop(1) }
 
     it_should_behave_like 'a generated SQL SELECT query'
 

data/spec/unit/veritas/sql/generator/relation/set/visit_veritas_algebra_difference_spec.rb

@@ -54,7 +54,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_difference' do
   end
 
   context 'when the operands are restrictions' do
-    let(:operand) { base_relation.restrict { |r| r[:id].eq(1) } }
+    let(:operand) { base_relation.restrict { |r| r.id.eq(1) } }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -67,8 +67,8 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_difference' do
 
   context 'when the operand is a summarization' do
     context 'summarize per table dee' do
-      let(:summarize_per) { TABLE_DEE                                                                  }
-      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r[:id].count) } }
+      let(:summarize_per) { TABLE_DEE                                                                }
+      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r.id.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -77,8 +77,8 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_difference' do
     end
 
     context 'summarize per table dum' do
-      let(:summarize_per) { TABLE_DUM                                                                  }
-      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r[:id].count) } }
+      let(:summarize_per) { TABLE_DUM                                                                }
+      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r.id.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -87,7 +87,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_difference' do
     end
 
     context 'summarize by a subset of the operand header' do
-      let(:operand) { base_relation.summarize([ :id, :name ]) { |r| r.add(:count, r[:age].count) } }
+      let(:operand) { base_relation.summarize([ :id, :name ]) { |r| r.add(:count, r.age.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -97,7 +97,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_difference' do
   end
 
   context 'when the operand is ordered' do
-    let(:operand) { base_relation.order }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] } }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -106,7 +106,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_difference' do
   end
 
   context 'when the operand is reversed' do
-    let(:operand) { base_relation.order.reverse }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.reverse }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -115,7 +115,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_difference' do
   end
 
   context 'when the operand is limited' do
-    let(:operand) { base_relation.order.take(1) }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.take(1) }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -124,7 +124,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_difference' do
   end
 
   context 'when the operands are offsets' do
-    let(:operand) { base_relation.order.drop(1) }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.drop(1) }
 
     it_should_behave_like 'a generated SQL SELECT query'
 

data/spec/unit/veritas/sql/generator/relation/set/visit_veritas_algebra_intersection_spec.rb

@@ -54,7 +54,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_intersection' do
   end
 
   context 'when the operands are restrictions' do
-    let(:operand) { base_relation.restrict { |r| r[:id].eq(1) } }
+    let(:operand) { base_relation.restrict { |r| r.id.eq(1) } }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -64,8 +64,8 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_intersection' do
 
   context 'when the operand is a summarization' do
     context 'summarize per table dee' do
-      let(:summarize_per) { TABLE_DEE                                                                  }
-      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r[:id].count) } }
+      let(:summarize_per) { TABLE_DEE                                                                }
+      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r.id.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -74,8 +74,8 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_intersection' do
     end
 
     context 'summarize per table dum' do
-      let(:summarize_per) { TABLE_DUM                                                                  }
-      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r[:id].count) } }
+      let(:summarize_per) { TABLE_DUM                                                                }
+      let(:operand)       { base_relation.summarize(summarize_per) { |r| r.add(:count, r.id.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -84,7 +84,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_intersection' do
     end
 
     context 'summarize by a subset of the operand header' do
-      let(:operand) { base_relation.summarize([ :id, :name ]) { |r| r.add(:count, r[:age].count) } }
+      let(:operand) { base_relation.summarize([ :id, :name ]) { |r| r.add(:count, r.age.count) } }
 
       it_should_behave_like 'a generated SQL SELECT query'
 
@@ -94,7 +94,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_intersection' do
   end
 
   context 'when the operand is ordered' do
-    let(:operand) { base_relation.order }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] } }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -103,7 +103,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_intersection' do
   end
 
   context 'when the operand is reversed' do
-    let(:operand) { base_relation.order.reverse }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.reverse }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -112,7 +112,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_intersection' do
   end
 
   context 'when the operand is limited' do
-    let(:operand) { base_relation.order.take(1) }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.take(1) }
 
     it_should_behave_like 'a generated SQL SELECT query'
 
@@ -121,7 +121,7 @@ describe SQL::Generator::Relation::Set, '#visit_veritas_algebra_intersection' do
   end
 
   context 'when the operands are offsets' do
-    let(:operand) { base_relation.order.drop(1) }
+    let(:operand) { base_relation.sort_by { |r| [ r.id, r.name, r.age ] }.drop(1) }
 
     it_should_behave_like 'a generated SQL SELECT query'