qdsl 0.0.2 → 0.0.3

data/test/column_test.rb

@@ -1,4 +1,5 @@
 require_relative 'minitest_helper'
+require 'ostruct'
 
 module Qdsl
   class ColumnTest < Minitest::Test
@@ -85,6 +86,16 @@ module Qdsl
       assert_equal 'new_source', result.source
     end
 
+    def test_to_expression
+      result = Column.new('name', 'alias_name', 'source').to_expression
+      assert result.is_a?(IsTrue)
+    end
+
+    def test_true
+      result = Column.new('name', 'alias_name', 'source').true?
+      assert result.is_a?(IsTrue)
+    end
+
     def test_as_string
       result = Column.new('name', 'alias_name', 'source').as('new_name_alias')
       assert_equal 'name', result.name
@@ -99,16 +110,16 @@ module Qdsl
       assert_equal 'source', result.source
     end
 
-    def test_render_name_only
-      column = Column.new('name')
-      result = column.render(Context.new, 'id')
-      assert_equal 'id.name', result
+    def test_render_sql_name_only
+      column = Column.new('name').with_source(OpenStruct.new(id: '__id__'))
+      result = column.render_sql(nil, nil)
+      assert_equal '__id__.name', result.sql
     end
 
-    def test_render_alias_name
-      column = Column.new('name', 'alias_name')
-      result = column.render(Context.new, 'id')
-      assert_equal 'id.name AS alias_name', result
+    def test_render_sql_alias_name
+      column = Column.new('name', 'alias_name').with_source(OpenStruct.new(id: '__id__'))
+      result = column.render_sql(nil, nil)
+      assert_equal '__id__.name AS alias_name', result.sql
     end
   end
 end

data/test/end_to_end_test.rb

@@ -9,9 +9,16 @@ module Qdsl
         Column['first_name'].as(:alias1),
         Column.new(:last_name).as(:alias2)
       ).from(@clients)
+
       result = query.render
 
-      assert_sql 'SELECT _00.id AS alias0, _00.first_name AS alias1, _00.last_name AS alias2 FROM clients AS _00', result
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id AS alias0,
+  _00.first_name AS alias1,
+  _00.last_name AS alias2
+FROM clients AS _00
+      SQL
     end
 
     def test_unknown_column

data/test/expression_test.rb

@@ -7,15 +7,17 @@ module Qdsl
         from(@clients).
         where { |t| t.first_name.equals('Richard').and(t.last_name.equals('Cook')) }
 
-      context = Context.new
-      result = query.render(context)
-
-      assert_sql 'SELECT _00.id ' +
-        'FROM clients AS _00 ' +
-        'WHERE (_00.first_name = :_param00) AND (_00.last_name = :_param01)', result
-      assert_equal 2, context.parameters.size
-      assert_equal 'Richard', context.parameters['_param00']
-      assert_equal 'Cook', context.parameters['_param01']
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE (_00.first_name = :_param00) AND (_00.last_name = :_param01)
+      SQL
+      assert_equal 2, result.parameters.size
+      assert_equal 'Richard', result.parameters['_param00']
+      assert_equal 'Cook', result.parameters['_param01']
     end
 
     def test_multiple_and
@@ -23,16 +25,18 @@ module Qdsl
         from(@clients).
         where { |t| t.first_name.equals('Richard').and(t.last_name.equals('Cook')).and(t.id.equals('ID')) }
 
-      context = Context.new
-      result = query.render(context)
+      result = query.render
 
-      assert_sql 'SELECT _00.id ' +
-        'FROM clients AS _00 ' +
-        'WHERE (_00.first_name = :_param00) AND (_00.last_name = :_param01) AND (_00.id = :_param02)', result
-      assert_equal 3, context.parameters.size
-      assert_equal 'Richard', context.parameters['_param00']
-      assert_equal 'Cook', context.parameters['_param01']
-      assert_equal 'ID', context.parameters['_param02']
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE (_00.first_name = :_param00) AND (_00.last_name = :_param01) AND (_00.id = :_param02)
+      SQL
+      assert_equal 3, result.parameters.size
+      assert_equal 'Richard', result.parameters['_param00']
+      assert_equal 'Cook', result.parameters['_param01']
+      assert_equal 'ID', result.parameters['_param02']
     end
 
     def test_simple_or
@@ -40,15 +44,17 @@ module Qdsl
         from(@clients).
         where { |t| t.first_name.equals('Richard').or(t.last_name.equals('Cook')) }
 
-      context = Context.new
-      result = query.render(context)
+      result = query.render
 
-      assert_sql 'SELECT _00.id ' +
-        'FROM clients AS _00 ' +
-        'WHERE (_00.first_name = :_param00) OR (_00.last_name = :_param01)', result
-      assert_equal 2, context.parameters.size
-      assert_equal 'Richard', context.parameters['_param00']
-      assert_equal 'Cook', context.parameters['_param01']
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE (_00.first_name = :_param00) OR (_00.last_name = :_param01)
+      SQL
+      assert_equal 2, result.parameters.size
+      assert_equal 'Richard', result.parameters['_param00']
+      assert_equal 'Cook', result.parameters['_param01']
     end
 
     def test_multiple_or
@@ -56,31 +62,33 @@ module Qdsl
         from(@clients).
         where { |t| t.first_name.equals('Richard').or(t.last_name.equals('Cook')).or(t.id.equals('ID')) }
 
-      context = Context.new
-      result = query.render(context)
-
-      assert_sql 'SELECT _00.id ' +
-        'FROM clients AS _00 ' +
-        'WHERE (_00.first_name = :_param00) OR (_00.last_name = :_param01) OR (_00.id = :_param02)', result
-      assert_equal 3, context.parameters.size
-      assert_equal 'Richard', context.parameters['_param00']
-      assert_equal 'Cook', context.parameters['_param01']
-      assert_equal 'ID', context.parameters['_param02']
-    end
+      result = query.render
 
-    def big_or(ids, t)
-      ids.collect { |x| t[x].equals(true) }.inject { |acc, x| acc.or(x) }
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE (_00.first_name = :_param00) OR (_00.last_name = :_param01) OR (_00.id = :_param02)
+      SQL
+      assert_equal 3, result.parameters.size
+      assert_equal 'Richard', result.parameters['_param00']
+      assert_equal 'Cook', result.parameters['_param01']
+      assert_equal 'ID', result.parameters['_param02']
     end
 
     def test_multiple_or2
       query = Qdsl::select(:id).
         from(@clients).
         where { |t| big_or([:value0, :value1, :value2, :value3], t) }
+
       result = query.render
 
-      assert_sql 'SELECT _00.id ' +
-        'FROM clients AS _00 ' +
-        'WHERE (_00.value0 = TRUE) OR (_00.value1 = TRUE) OR (_00.value2 = TRUE) OR (_00.value3 = TRUE)', result
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE (_00.value0 = TRUE) OR (_00.value1 = TRUE) OR (_00.value2 = TRUE) OR (_00.value3 = TRUE)
+      SQL
     end
 
     def test_boolean
@@ -88,20 +96,28 @@ module Qdsl
         from(@clients).
         where { |t| t.first_name.equals('Richard').or(t.last_name.equals('Cook')).and(t.id.equals('ID').or(t.id.equals('OTHER_ID'))) }
 
-      context = Context.new
-      result = query.render(context)
-
-      assert_sql 'SELECT _00.id ' +
-        'FROM clients AS _00 ' +
-        'WHERE ((_00.first_name = :_param00) OR ' +
-        '(_00.last_name = :_param01)) ' +
-        'AND ((_00.id = :_param02) OR ' +
-        '(_00.id = :_param03))', result
-      assert_equal 4, context.parameters.size
-      assert_equal 'Richard', context.parameters['_param00']
-      assert_equal 'Cook', context.parameters['_param01']
-      assert_equal 'ID', context.parameters['_param02']
-      assert_equal 'OTHER_ID', context.parameters['_param03']
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE ((_00.first_name = :_param00)
+  OR (_00.last_name = :_param01))
+  AND ((_00.id = :_param02)
+  OR (_00.id = :_param03))
+      SQL
+      assert_equal 4, result.parameters.size
+      assert_equal 'Richard', result.parameters['_param00']
+      assert_equal 'Cook', result.parameters['_param01']
+      assert_equal 'ID', result.parameters['_param02']
+      assert_equal 'OTHER_ID', result.parameters['_param03']
+    end
+
+    private
+
+    def big_or(ids, t)
+      ids.collect { |x| t[x].equals(true) }.inject { |acc, x| acc.or(x) }
     end
   end
 end

data/test/inner_join_test.rb

@@ -6,20 +6,32 @@ module Qdsl
       query = Qdsl::select { |t0, t1| [t0.id, t1.member_id] }.
         from(@clients).
         inner_join(@members).on { |f, j| f.id.equals(j.id) }
+
       result = query.render
 
-      assert_sql 'SELECT _00.id, _01.member_id ' +
-        'FROM clients AS _00 ' +
-        'INNER JOIN members AS _01 ON _00.id = _01.id', result
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id,
+  _01.member_id
+FROM clients AS _00
+INNER JOIN members AS _01 ON _00.id = _01.id
+      SQL
     end
 
     def test_inner_join
       query = Qdsl::select { |t0, t1| [t0.id, t1.member_id] }.
         from(@clients).
         inner_join(@members).on { |t0, t1| t0.id.equals(t1.first_name) }
+
       result = query.render
 
-      assert_sql 'SELECT _00.id, _01.member_id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.first_name', result
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id,
+  _01.member_id
+FROM clients AS _00
+INNER JOIN members AS _01 ON _00.id = _01.first_name
+      SQL
     end
 
     def test_multiple_inner_joins
@@ -27,23 +39,34 @@ module Qdsl
         from(@clients).
         inner_join(@members).on { |f, j| f.id.equals(j.first_name) }.
         inner_join(@colours).on { |f, j| f.first_name.equals(j.name) }
+
       result = query.render
 
-      assert_sql 'SELECT _00.id, _01.member_id, _02.name ' +
-        'FROM clients AS _00 ' +
-        'INNER JOIN members AS _01 ON _00.id = _01.first_name ' +
-        'INNER JOIN colours AS _02 ON _00.first_name = _02.name', result
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id,
+  _01.member_id,
+  _02.name
+FROM clients AS _00
+INNER JOIN members AS _01 ON _00.id = _01.first_name
+INNER JOIN colours AS _02 ON _00.first_name = _02.name
+      SQL
     end
 
     def test_multiple_inner_join_same
       query = Qdsl::select { |t0, t1| [t0.id, t1.id] }.
         from(@clients).
         inner_join(@clients).on { |f, j| f.id.equals(j.first_name) }
+
       result = query.render
 
-      assert_sql 'SELECT _00.id, _01.id FROM ' +
-        'clients AS _00 ' +
-        'INNER JOIN clients AS _01 ON _00.id = _01.first_name', result
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id,
+  _01.id
+FROM clients AS _00
+INNER JOIN clients AS _01 ON _00.id = _01.first_name
+      SQL
     end
 
     def test_multiple_inner_join_same_where
@@ -52,13 +75,18 @@ module Qdsl
         inner_join(@clients).on { |f, j| f.id.equals(j.first_name) }.
         inner_join(@clients).on { |f, j| f.id.equals(j.first_name) }.
         where { |t0, t1, t2| t0.id.equals(t1.id) }
+
       result = query.render
 
-      assert_sql 'SELECT _00.id, _01.id FROM ' +
-        'clients AS _00 ' +
-        'INNER JOIN clients AS _01 ON _00.id = _01.first_name ' +
-        'INNER JOIN clients AS _02 ON _00.id = _02.first_name ' +
-        'WHERE _00.id = _01.id', result
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id,
+  _01.id
+FROM clients AS _00
+INNER JOIN clients AS _01 ON _00.id = _01.first_name
+INNER JOIN clients AS _02 ON _00.id = _02.first_name
+WHERE _00.id = _01.id
+       SQL
     end
   end
 end

data/test/is_true_test.rb

@@ -0,0 +1,68 @@
+require_relative 'minitest_helper'
+
+module Qdsl
+  class IsTrueTest < QueryTest
+    def test_explicit
+      query = Qdsl::select(:id).from(@clients).where { |t| t.id.true? }
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE _00.id
+      SQL
+    end
+
+    def test_implicit_method
+      query = Qdsl::select(:id).from(@clients).where { |t| t.id }
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE _00.id
+      SQL
+    end
+
+    def test_implicit_string
+      query = Qdsl::select(:id).from(@clients).where { |t| t['id'] }
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE _00.id
+      SQL
+    end
+
+    def test_implicit_symbol
+      query = Qdsl::select(:id).from(@clients).where { |t| t[:id] }
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE _00.id
+      SQL
+    end
+
+    def test_operators
+      query = Qdsl::select(:id).from(@clients).where do |t|
+        t.id.true?.and(t.id.true?.or(t.id.true?))
+      end
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+WHERE (_00.id) AND ((_00.id) OR (_00.id))
+      SQL
+    end
+  end
+end
+

data/test/minitest_helper.rb

@@ -4,3 +4,5 @@ require 'qdsl'
 require 'minitest/autorun'
 require 'minitest/pride'
 
+require_relative 'query_test'
+

data/test/query_test.rb

@@ -8,6 +8,7 @@ module Qdsl
         :id,
         :first_name,
         :last_name,
+        :birthdate,
         :value0,
         :value1,
         :value2,

data/test/select_test.rb

@@ -5,91 +5,165 @@ module Qdsl
     def test_single_table_select_single_column_string
       query = Qdsl::select('id').from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00', result
+      assert_sql 'SELECT _00.id FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_single_column_symbol
       query = Qdsl::select(:id).from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00', result
+      assert_sql 'SELECT _00.id FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_single_column_method
       query = Qdsl::select { |t| t.id }.from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00', result
+      assert_sql 'SELECT _00.id FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_single_column_name_string
       query = Qdsl::select { |t| t['id'] }.from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00', result
+      assert_sql 'SELECT _00.id FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_single_column_name_symbol
       query = Qdsl::select { |t| t[:id] }.from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00', result
+      assert_sql 'SELECT _00.id FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_two_columns_string
       query = Qdsl::select('id', 'first_name').from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result
+      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_two_columns_symbol
       query = Qdsl::select(:id, :first_name).from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result
+      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_two_columns_method
       query = Qdsl::select { |t| [t.id, t.first_name] }.from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result
+      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_two_columns_name_string
       query = Qdsl::select { |t| [t['id'], t['first_name']] }.from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result
+      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result.sql
     end
 
     def test_single_table_select_two_columns_name_symbol
       query = Qdsl::select { |t| [t[:id], t[:first_name]] }.from(@clients)
       result = query.render
-      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result
+      assert_sql 'SELECT _00.id, _00.first_name FROM clients AS _00', result.sql
     end
 
     def test_two_tables_select_single_column_string
       query = Qdsl::select('id').from(@clients).inner_join(@members).on { |t0, t1| t0.id.equals(t1.id) }
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result
+      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result.sql
     end
 
     def test_two_tables_select_single_column_symbol
       query = Qdsl::select(:id).from(@clients).inner_join(@members).on { |t0, t1| t0.id.equals(t1.id) }
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result
+      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result.sql
     end
 
     def test_two_tables_select_single_column_method
       query = Qdsl::select { |t0, t1| t0.id }.from(@clients).inner_join(@members).on { |t0, t1| t0.id.equals(t1.id) }
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result
+      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result.sql
     end
 
     def test_two_tables_select_single_column_name_string
       query = Qdsl::select { |t0, t1| t0['id'] }.from(@clients).inner_join(@members).on { |t0, t1| t0.id.equals(t1.id) }
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result
+      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result.sql
     end
 
     def test_two_tables_select_single_column_name_symbol
       query = Qdsl::select { |t0, t1| t0[:id] }.from(@clients).inner_join(@members).on { |t0, t1| t0.id.equals(t1.id) }
       result = query.render
-      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result
+      assert_sql 'SELECT _00.id FROM clients AS _00 INNER JOIN members AS _01 ON _00.id = _01.id', result.sql
+    end
+
+    def test_limit
+      query = Qdsl::select(:id).from(@clients).limit(5)
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT _00.id
+FROM clients AS _00
+LIMIT 5
+      SQL
+    end
+
+    def test_order_by_string
+      query = Qdsl::select(:id).from(@clients).limit(5).order_by('first_name')
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT _00.id
+FROM clients AS _00
+ORDER BY _00.first_name
+LIMIT 5
+      SQL
+    end
+
+    def test_order_by_symbol
+      query = Qdsl::select(:id).from(@clients).limit(5).order_by(:first_name)
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT _00.id
+FROM clients AS _00
+ORDER BY _00.first_name
+LIMIT 5
+      SQL
+    end
+
+    def test_order_by_method
+      query = Qdsl::select(:id).from(@clients).limit(5).order_by { |t| t.first_name }
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.id
+FROM clients AS _00
+ORDER BY _00.first_name
+LIMIT 5
+      SQL
+    end
+
+    def test_call
+      query = Qdsl::select { |t| [t.first_name, t._call('AGE', t.birthdate).as(:age)] }.
+        from(@clients)
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.first_name,
+  AGE(_00.birthdate) AS age
+FROM clients AS _00
+      SQL
+    end
+
+    def test_formatcall
+      query = Qdsl::select { |t| [t.first_name, t._formatcall('EXTRACT(year FROM %1)', t._call('AGE', t.birthdate)).as(:age)] }.
+        from(@clients)
+      result = query.render
+
+      assert_sql <<-SQL, result.sql
+SELECT
+  _00.first_name,
+  EXTRACT(year FROM AGE(_00.birthdate)) AS age
+FROM clients AS _00
+      SQL
     end
   end
 end