jro_apps/redmine Commit - r13610:c3b91d6f0443

Fixed assertions for SQLServer that format dates with MM/DD/YYYY in queries....

Jean-Philippe Lang -

r13610:c3b91d6f0443

parent child

Context file:

r13610:c3b91d6f0443

Collapse all files

test/test_helper.rb +5 0

                  ActiveRecord::Base.connection.adapter_name =~ /postgresql/i
                end
+               def quoted_date(date)
+                 date = Date.parse(date) if date.is_a?(String)
+                 ActiveRecord::Base.connection.quoted_date(date)
+               end
                def assert_save(object)
                  saved = object.save
                  message = "#{object.class} could not be saved"

test/unit/query_test.rb +12 -8

                def test_operator_date_equals
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '=', ['2011-07-10'])
-                 assert_match /issues\.due_date > '2011-07-09 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
+                 assert_match /issues\.due_date > '#{quoted_date "2011-07-09"} 23:59:59(\.\d+)?' AND issues\.due_date <= '#{quoted_date "2011-07-10"} 23:59:59(\.\d+)?/,
+                   query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_lesser_than
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '<=', ['2011-07-10'])
-                 assert_match /issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
+                 assert_match /issues\.due_date <= '#{quoted_date "2011-07-10"} 23:59:59(\.\d+)?/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_lesser_than_with_timestamp
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('updated_on', '<=', ['2011-07-10T19:13:52'])
-                 assert_match /issues\.updated_on <= '2011-07-10 19:13:52/, query.statement
+                 assert_match /issues\.updated_on <= '#{quoted_date "2011-07-10"} 19:13:52/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_greater_than
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '>=', ['2011-07-10'])
-                 assert_match /issues\.due_date > '2011-07-09 23:59:59(\.9+)?'/, query.statement
+                 assert_match /issues\.due_date > '#{quoted_date "2011-07-09"} 23:59:59(\.\d+)?'/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_greater_than_with_timestamp
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('updated_on', '>=', ['2011-07-10T19:13:52'])
-                 assert_match /issues\.updated_on > '2011-07-10 19:13:51(\.0+)?'/, query.statement
+                 assert_match /issues\.updated_on > '#{quoted_date "2011-07-10"} 19:13:51(\.0+)?'/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_between
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '><', ['2011-06-23', '2011-07-10'])
-                 assert_match /issues\.due_date > '2011-06-22 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?'/, query.statement
+                 assert_match /issues\.due_date > '#{quoted_date "2011-06-22"} 23:59:59(\.\d+)?' AND issues\.due_date <= '#{quoted_date "2011-07-10"} 23:59:59(\.\d+)?'/,
+                   query.statement
                  find_issues_with_query(query)
                end
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 'w', [''])
-                 assert query.statement.match(/issues\.due_date > '2011-04-24 23:59:59(\.9+)?' AND issues\.due_date <= '2011-05-01 23:59:59(\.9+)?/), "range not found in #{query.statement}"
+                 assert_match /issues\.due_date > '#{quoted_date "2011-04-24"} 23:59:59(\.\d+)?' AND issues\.due_date <= '#{quoted_date "2011-05-01"} 23:59:59(\.\d+)?/,
+                   query.statement
                  I18n.locale = :en
                end
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 'w', [''])
-                 assert query.statement.match(/issues\.due_date > '2011-04-23 23:59:59(\.9+)?' AND issues\.due_date <= '2011-04-30 23:59:59(\.9+)?/), "range not found in #{query.statement}"
+                 assert_match /issues\.due_date > '#{quoted_date "2011-04-23"} 23:59:59(\.\d+)?' AND issues\.due_date <= '#{quoted_date "2011-04-30"} 23:59:59(\.\d+)?/,
+                   query.statement
                end
                def test_operator_does_not_contains

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages