qdsl 0.0.2 → 0.0.3

data/test/subquery_test.rb

@@ -6,61 +6,209 @@ module Qdsl
       subquery = Qdsl::select(:id, :first_name, :last_name).from(@clients)
       query = Qdsl::select(:first_name).from(subquery)
 
-      assert_sql <<-EOL, query.render
-SELECT _00.first_name
+      result = query.render
+
+      assert_nil result.id
+      assert_equal ['first_name'], result.column_names
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.first_name
 FROM (
-  SELECT _01.id, _01.first_name, _01.last_name
+  SELECT
+    _01.id,
+    _01.first_name,
+    _01.last_name
   FROM clients AS _01
 ) AS _00
-      EOL
+      SQL
+      assert_equal({}, result.parameters)
     end
 
-    def test_subquery_inner_join
+    def test_inner_join
       subquery = Qdsl::select(:id, :first_name, :last_name).from(@clients)
       query = Qdsl::select { |t0, t1| [t0.first_name, t1.last_name] }.
         from(subquery).
         inner_join(subquery).on { |t0, t1| t0.id.equals(t1.id) }
 
-      assert_sql <<-EOL, query.render
-SELECT _00.first_name, _01.last_name
+      result = query.render
+
+      assert_nil result.id
+      assert_equal ['first_name', 'last_name'], result.column_names
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.first_name,
+  _02.last_name
 FROM (
-  SELECT _02.id, _02.first_name, _02.last_name
-  FROM clients AS _02
+  SELECT
+    _01.id,
+    _01.first_name,
+    _01.last_name
+  FROM clients AS _01
 ) AS _00
 INNER JOIN (
-  SELECT _03.id, _03.first_name, _03.last_name
+  SELECT
+    _03.id,
+    _03.first_name,
+    _03.last_name
   FROM clients AS _03
-) AS _01
-ON _00.id = _01.id
-      EOL
+) AS _02
+ON _00.id = _02.id
+      SQL
+      assert_equal({}, result.parameters)
     end
 
-    def test_subquery_inner_join_where
+    def test_inner_join_where
       subquery = Qdsl::select(:id, :first_name, :last_name).from(@clients)
       query = Qdsl::select { |t0, t1| [t0.first_name, t1.last_name] }.
         from(subquery).
         inner_join(subquery).on { |t0, t1| t0.id.equals(t1.id) }.
         where { |t0, t1| t0.first_name.equals('str0').and(t1.last_name.equals('str1')) }
 
-      context = Context.new
-      assert_sql <<-EOL, query.render(context)
-SELECT _00.first_name, _01.last_name
+      result = query.render
+
+      assert_nil result.id
+      assert_equal ['first_name', 'last_name'], result.column_names
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.first_name,
+  _02.last_name
 FROM (
-  SELECT _02.id, _02.first_name, _02.last_name
-  FROM clients AS _02
+  SELECT
+    _01.id,
+    _01.first_name,
+    _01.last_name
+  FROM clients AS _01
 ) AS _00
 INNER JOIN (
-  SELECT _03.id, _03.first_name, _03.last_name
+  SELECT
+    _03.id,
+    _03.first_name,
+    _03.last_name
   FROM clients AS _03
-) AS _01
-ON _00.id = _01.id
-WHERE (_00.first_name = :_param00) AND (_01.last_name = :_param01)
-        EOL
-
-        assert_equal 2, context.parameters.size
-        assert_equal 'str0', context.parameters['_param00']
-        assert_equal 'str1', context.parameters['_param01']
-      end
+) AS _02
+ON _00.id = _02.id
+WHERE (_00.first_name = :_param00) AND (_02.last_name = :_param01)
+        SQL
+      assert_equal({'_param00' => 'str0', '_param01' => 'str1'}, result.parameters)
+    end
+
+    def test_computed_column
+      subquery = Qdsl::select(:id) do |t| [
+        t.first_name,
+        t.last_name,
+        age_in_years(t, :birthdate, :age)
+      ] end.from(@clients)
+
+      query = Qdsl::select(:first_name, :last_name, :age).from(subquery)
+
+      result = query.render
+
+      assert_nil result.id
+      assert_equal ['first_name', 'last_name', 'age'], result.column_names
+      assert_equal <<-SQL, result.sql
+SELECT
+  _00.first_name,
+  _00.last_name,
+  _00.age
+FROM (
+  SELECT
+    _01.id,
+    _01.first_name,
+    _01.last_name,
+    EXTRACT(year FROM AGE(_01.birthdate)) AS age
+  FROM clients AS _01
+) AS _00
+  SQL
+    end
+
+    def test_computed_column_inner_join
+      subquery = Qdsl::select(:id) do |t| [
+        t.first_name,
+        t.last_name,
+        age_in_years(t, :birthdate, :age)
+      ] end.from(@clients)
+
+      query = Qdsl::select(:first_name, :last_name, :age).from(subquery).
+        inner_join(subquery).on { |t0, t1| t0.id.equals(t1.id) }
+
+      result = query.render
+
+      assert_nil result.id
+      assert_equal ['first_name', 'last_name', 'age'], result.column_names
+      assert_equal <<-SQL, result.sql
+SELECT
+  _00.first_name,
+  _00.last_name,
+  _00.age
+FROM (
+  SELECT
+    _01.id,
+    _01.first_name,
+    _01.last_name,
+    EXTRACT(year FROM AGE(_01.birthdate)) AS age
+  FROM clients AS _01
+) AS _00
+INNER JOIN (
+  SELECT
+    _03.id,
+    _03.first_name,
+    _03.last_name,
+    EXTRACT(year FROM AGE(_03.birthdate)) AS age
+  FROM clients AS _03
+) AS _02
+ON _00.id = _02.id
+      SQL
+    end
+
+    def test_computed_column_complex_select
+      subquery = Qdsl::select(:id) do |t| [
+        t.first_name,
+        t.last_name,
+        age_in_years(t, :birthdate, :age)
+      ] end.from(@clients)
+
+      query = Qdsl::select(:first_name, :last_name) do |t0, t1|
+        [t0.age, t1.first_name]
+      end.from(subquery).
+        inner_join(subquery).on { |t0, t1| t0.id.equals(t1.id) }
+
+      result = query.render
+
+      assert_nil result.id
+      assert_equal ['first_name', 'last_name', 'age', 'first_name'], result.column_names
+      assert_equal <<-SQL, result.sql
+SELECT
+  _00.first_name,
+  _00.last_name,
+  _00.age,
+  _02.first_name
+FROM (
+  SELECT
+    _01.id,
+    _01.first_name,
+    _01.last_name,
+    EXTRACT(year FROM AGE(_01.birthdate)) AS age
+  FROM clients AS _01
+) AS _00
+INNER JOIN (
+  SELECT
+    _03.id,
+    _03.first_name,
+    _03.last_name,
+    EXTRACT(year FROM AGE(_03.birthdate)) AS age
+  FROM clients AS _03
+) AS _02
+ON _00.id = _02.id
+      SQL
+    end
+
+    private
+
+    def age_in_years(t, column_name, name)
+      t._formatcall(
+        'EXTRACT(year FROM %1)',
+        t._call('AGE', t[column_name])).as(name)
+    end
   end
 end
 

data/test/where_test.rb

@@ -7,14 +7,16 @@ module Qdsl
         from(@clients).
         where { |t| t.id.equals('Cook') }
 
-      context = Context.new
-      result = query.render(context)
+      result = query.render
 
-      assert_sql 'SELECT _00.first_name ' +
-        'FROM clients AS _00 ' +
-        'WHERE _00.id = :_param00', result
-      assert_equal 1, context.parameters.size
-      assert_equal 'Cook', context.parameters['_param00']
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.first_name
+FROM clients AS _00
+WHERE _00.id = :_param00
+      SQL
+      assert_equal 1, result.parameters.size
+      assert_equal 'Cook', result.parameters['_param00']
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdsl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Richard Cook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,25 +67,33 @@ files:
 - Rakefile
 - lib/and.rb
 - lib/boolean.rb
+- lib/call.rb
 - lib/column.rb
+- lib/column_proxy.rb
+- lib/column_set.rb
 - lib/context.rb
 - lib/equals.rb
 - lib/expression.rb
-- lib/funky_proxy.rb
+- lib/format_call.rb
 - lib/inner_join.rb
 - lib/inner_join_builder.rb
+- lib/is_true.rb
 - lib/or.rb
 - lib/qdsl.rb
 - lib/qdsl/version.rb
+- lib/render_result.rb
 - lib/select.rb
+- lib/select_query.rb
+- lib/simple_render_result.rb
 - lib/table.rb
 - lib/table_query.rb
+- lib/util.rb
 - qdsl.gemspec
 - test/column_test.rb
-- test/context_test.rb
 - test/end_to_end_test.rb
 - test/expression_test.rb
 - test/inner_join_test.rb
+- test/is_true_test.rb
 - test/minitest_helper.rb
 - test/query_test.rb
 - test/select_test.rb
@@ -117,10 +125,10 @@ specification_version: 4
 summary: SQL query builder DSL for Ruby
 test_files:
 - test/column_test.rb
-- test/context_test.rb
 - test/end_to_end_test.rb
 - test/expression_test.rb
 - test/inner_join_test.rb
+- test/is_true_test.rb
 - test/minitest_helper.rb
 - test/query_test.rb
 - test/select_test.rb

data/test/context_test.rb

@@ -1,19 +0,0 @@
-require_relative 'minitest_helper'
-require_relative 'query_test'
-
-module Qdsl
-  class ContextTest < QueryTest
-    def test_simple
-      query = Qdsl::select(:first_name).from(@clients).where { |t| t.id.equals('Cook') }
-      context = Context.new
-      result = query.render(context)
-
-      assert_sql 'SELECT _00.first_name ' +
-        'FROM clients AS _00 ' +
-        'WHERE _00.id = :_param00', result
-      assert_equal 1, context.parameters.size
-      assert_equal 'Cook', context.parameters['_param00']
-    end
-  end
-end
-