Skip to content
This repository has been archived by the owner on Jan 18, 2020. It is now read-only.

Commit

Permalink
Add condition based on Django version for comparing generated SQL
Browse files Browse the repository at this point in the history 
Since the internal SQL generation changed (addressed in 1593463), the tests need
to use SQL relative to the Django version.
  • Loading branch information
@bruth
bruth committed May 6, 2013
1 parent defa72d commit 18e879a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
5 changes: 3 additions & 2 deletions modeltree/tests/regressions/issue6/tests.py
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import django
from django.test import TestCase

from modeltree.tree import trees
from .models import Specimen, Link, Subject

get_join_type = lambda: django.VERSION < (1, 5) and 'INNER JOIN' or 'LEFT OUTER JOIN'

class Test(TestCase):
"""Wrong primary key used when constructing joins.
Expand All @@ -15,4 +16,4 @@ def test(self):
self.assertEqual(str(qs.query), 'SELECT "specimen"."ALIQUOT_ID" FROM "specimen" LEFT OUTER JOIN "link" ON ("specimen"."ALIQUOT_ID" = "link"."ALIQUOT_ID")')

qs, alias = mt.add_joins(Subject)
self.assertEqual(str(qs.query), 'SELECT "specimen"."ALIQUOT_ID" FROM "specimen" LEFT OUTER JOIN "link" ON ("specimen"."ALIQUOT_ID" = "link"."ALIQUOT_ID") LEFT OUTER JOIN "subject" ON ("link"."study_id" = "subject"."study_id")')
self.assertEqual(str(qs.query), 'SELECT "specimen"."ALIQUOT_ID" FROM "specimen" LEFT OUTER JOIN "link" ON ("specimen"."ALIQUOT_ID" = "link"."ALIQUOT_ID") {join} "subject" ON ("link"."study_id" = "subject"."study_id")'.format(join=get_join_type()))
24 changes: 13 additions & 11 deletions modeltree/tests/tree.py
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import django
from django.test import TestCase

from modeltree.tree import trees
from modeltree.tests import models

__all__ = ('LazyTreesTestCase', 'ModelTreeTestCase')

get_join_type = lambda: django.VERSION < (1, 5) and 'INNER JOIN' or 'LEFT OUTER JOIN'


class LazyTreesTestCase(TestCase):
def test(self):
Expand Down Expand Up @@ -106,11 +108,11 @@ def test_query_string_for_field(self):
qstr = self.meeting_mt.query_string_for_field(start_time)
self.assertEqual(qstr, 'start_time')

def test_get_joins(self):
def test_get_join_types(self):
self.office_mt = trees.create(models.Office)

title_qs, alias = self.office_mt.add_joins(models.Title)
self.assertEqual(str(title_qs.query), 'SELECT "tests_office"."id", "tests_office"."location" FROM "tests_office" LEFT OUTER JOIN "tests_employee" ON ("tests_office"."id" = "tests_employee"."office_id") LEFT OUTER JOIN "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id")')
self.assertEqual(str(title_qs.query), 'SELECT "tests_office"."id", "tests_office"."location" FROM "tests_office" LEFT OUTER JOIN "tests_employee" ON ("tests_office"."id" = "tests_employee"."office_id") {join} "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id")'.format(join=get_join_type()))

employee_qs, alias = self.office_mt.add_joins(models.Employee)
self.assertEqual(str(employee_qs.query), 'SELECT "tests_office"."id", "tests_office"."location" FROM "tests_office" LEFT OUTER JOIN "tests_employee" ON ("tests_office"."id" = "tests_employee"."office_id")')
Expand All @@ -125,7 +127,7 @@ def test_get_joins(self):
self.title_mt = trees.create(models.Title)

office_qs, alias = self.title_mt.add_joins(models.Office)
self.assertEqual(str(office_qs.query), 'SELECT "tests_title"."id", "tests_title"."name", "tests_title"."salary" FROM "tests_title" LEFT OUTER JOIN "tests_employee" ON ("tests_title"."id" = "tests_employee"."title_id") LEFT OUTER JOIN "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id")')
self.assertEqual(str(office_qs.query), 'SELECT "tests_title"."id", "tests_title"."name", "tests_title"."salary" FROM "tests_title" LEFT OUTER JOIN "tests_employee" ON ("tests_title"."id" = "tests_employee"."title_id") {join} "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id")'.format(join=get_join_type()))

employee_qs, alias = self.title_mt.add_joins(models.Employee)
self.assertEqual(str(employee_qs.query), 'SELECT "tests_title"."id", "tests_title"."name", "tests_title"."salary" FROM "tests_title" LEFT OUTER JOIN "tests_employee" ON ("tests_title"."id" = "tests_employee"."title_id")')
Expand Down Expand Up @@ -155,10 +157,10 @@ def test_get_joins(self):
self.project_mt = trees.create(models.Project)

title_qs, alias = self.project_mt.add_joins(models.Title)
self.assertEqual(str(title_qs.query), 'SELECT "tests_project"."id", "tests_project"."name", "tests_project"."manager_id", "tests_project"."due_date" FROM "tests_project" LEFT OUTER JOIN "tests_project_employees" ON ("tests_project"."id" = "tests_project_employees"."project_id") LEFT OUTER JOIN "tests_employee" ON ("tests_project_employees"."employee_id" = "tests_employee"."id") LEFT OUTER JOIN "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id")')
self.assertEqual(str(title_qs.query), 'SELECT "tests_project"."id", "tests_project"."name", "tests_project"."manager_id", "tests_project"."due_date" FROM "tests_project" LEFT OUTER JOIN "tests_project_employees" ON ("tests_project"."id" = "tests_project_employees"."project_id") LEFT OUTER JOIN "tests_employee" ON ("tests_project_employees"."employee_id" = "tests_employee"."id") {join} "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id")'.format(join=get_join_type()))

office_qs, alias = self.project_mt.add_joins(models.Office)
self.assertEqual(str(office_qs.query), 'SELECT "tests_project"."id", "tests_project"."name", "tests_project"."manager_id", "tests_project"."due_date" FROM "tests_project" LEFT OUTER JOIN "tests_project_employees" ON ("tests_project"."id" = "tests_project_employees"."project_id") LEFT OUTER JOIN "tests_employee" ON ("tests_project_employees"."employee_id" = "tests_employee"."id") LEFT OUTER JOIN "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id")')
self.assertEqual(str(office_qs.query), 'SELECT "tests_project"."id", "tests_project"."name", "tests_project"."manager_id", "tests_project"."due_date" FROM "tests_project" LEFT OUTER JOIN "tests_project_employees" ON ("tests_project"."id" = "tests_project_employees"."project_id") LEFT OUTER JOIN "tests_employee" ON ("tests_project_employees"."employee_id" = "tests_employee"."id") {join} "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id")'.format(join=get_join_type()))

employee_qs, alias = self.project_mt.add_joins(models.Employee)
self.assertEqual(str(employee_qs.query), 'SELECT "tests_project"."id", "tests_project"."name", "tests_project"."manager_id", "tests_project"."due_date" FROM "tests_project" LEFT OUTER JOIN "tests_project_employees" ON ("tests_project"."id" = "tests_project_employees"."project_id") LEFT OUTER JOIN "tests_employee" ON ("tests_project_employees"."employee_id" = "tests_employee"."id")')
Expand All @@ -170,7 +172,7 @@ def test_get_joins(self):
self.meeting_mt = trees.create(models.Meeting)

title_qs, alias = self.meeting_mt.add_joins(models.Title)
self.assertEqual(str(title_qs.query), 'SELECT "tests_meeting"."id", "tests_meeting"."project_id", "tests_meeting"."office_id", "tests_meeting"."start_time", "tests_meeting"."end_time" FROM "tests_meeting" LEFT OUTER JOIN "tests_meeting_attendees" ON ("tests_meeting"."id" = "tests_meeting_attendees"."meeting_id") LEFT OUTER JOIN "tests_employee" ON ("tests_meeting_attendees"."employee_id" = "tests_employee"."id") LEFT OUTER JOIN "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id")')
self.assertEqual(str(title_qs.query), 'SELECT "tests_meeting"."id", "tests_meeting"."project_id", "tests_meeting"."office_id", "tests_meeting"."start_time", "tests_meeting"."end_time" FROM "tests_meeting" LEFT OUTER JOIN "tests_meeting_attendees" ON ("tests_meeting"."id" = "tests_meeting_attendees"."meeting_id") LEFT OUTER JOIN "tests_employee" ON ("tests_meeting_attendees"."employee_id" = "tests_employee"."id") {join} "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id")'.format(join=get_join_type()))

office_qs, alias = self.meeting_mt.add_joins(models.Office)
self.assertEqual(str(office_qs.query), 'SELECT "tests_meeting"."id", "tests_meeting"."project_id", "tests_meeting"."office_id", "tests_meeting"."start_time", "tests_meeting"."end_time" FROM "tests_meeting" INNER JOIN "tests_office" ON ("tests_meeting"."office_id" = "tests_office"."id")')
Expand All @@ -190,16 +192,16 @@ def test_add_select(self):
fields = [location, salary, name, start_time]

qs = self.office_mt.add_select(*fields)
self.assertEqual(str(qs.query), 'SELECT "tests_office"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_office" LEFT OUTER JOIN "tests_employee" ON ("tests_office"."id" = "tests_employee"."office_id") LEFT OUTER JOIN "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id") LEFT OUTER JOIN "tests_project_employees" ON ("tests_employee"."id" = "tests_project_employees"."employee_id") LEFT OUTER JOIN "tests_project" ON ("tests_project_employees"."project_id" = "tests_project"."id") LEFT OUTER JOIN "tests_meeting" ON ("tests_office"."id" = "tests_meeting"."office_id")')
self.assertEqual(str(qs.query), 'SELECT "tests_office"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_office" LEFT OUTER JOIN "tests_employee" ON ("tests_office"."id" = "tests_employee"."office_id") {join} "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id") LEFT OUTER JOIN "tests_project_employees" ON ("tests_employee"."id" = "tests_project_employees"."employee_id") LEFT OUTER JOIN "tests_project" ON ("tests_project_employees"."project_id" = "tests_project"."id") LEFT OUTER JOIN "tests_meeting" ON ("tests_office"."id" = "tests_meeting"."office_id")'.format(join=get_join_type()))

qs = self.title_mt.add_select(*fields)
self.assertEqual(str(qs.query), 'SELECT "tests_title"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_title" LEFT OUTER JOIN "tests_employee" ON ("tests_title"."id" = "tests_employee"."title_id") LEFT OUTER JOIN "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id") LEFT OUTER JOIN "tests_project_employees" ON ("tests_employee"."id" = "tests_project_employees"."employee_id") LEFT OUTER JOIN "tests_project" ON ("tests_project_employees"."project_id" = "tests_project"."id") LEFT OUTER JOIN "tests_meeting_attendees" ON ("tests_employee"."id" = "tests_meeting_attendees"."employee_id") LEFT OUTER JOIN "tests_meeting" ON ("tests_meeting_attendees"."meeting_id" = "tests_meeting"."id")')
self.assertEqual(str(qs.query), 'SELECT "tests_title"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_title" LEFT OUTER JOIN "tests_employee" ON ("tests_title"."id" = "tests_employee"."title_id") {join} "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id") LEFT OUTER JOIN "tests_project_employees" ON ("tests_employee"."id" = "tests_project_employees"."employee_id") LEFT OUTER JOIN "tests_project" ON ("tests_project_employees"."project_id" = "tests_project"."id") LEFT OUTER JOIN "tests_meeting_attendees" ON ("tests_employee"."id" = "tests_meeting_attendees"."employee_id") LEFT OUTER JOIN "tests_meeting" ON ("tests_meeting_attendees"."meeting_id" = "tests_meeting"."id")'.format(join=get_join_type()))

qs = self.employee_mt.add_select(*fields)
self.assertEqual(str(qs.query), 'SELECT "tests_employee"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_employee" INNER JOIN "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id") INNER JOIN "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id") LEFT OUTER JOIN "tests_project_employees" ON ("tests_employee"."id" = "tests_project_employees"."employee_id") LEFT OUTER JOIN "tests_project" ON ("tests_project_employees"."project_id" = "tests_project"."id") LEFT OUTER JOIN "tests_meeting_attendees" ON ("tests_employee"."id" = "tests_meeting_attendees"."employee_id") LEFT OUTER JOIN "tests_meeting" ON ("tests_meeting_attendees"."meeting_id" = "tests_meeting"."id")')

qs = self.project_mt.add_select(*fields)
self.assertEqual(str(qs.query), 'SELECT "tests_project"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_project" LEFT OUTER JOIN "tests_project_employees" ON ("tests_project"."id" = "tests_project_employees"."project_id") LEFT OUTER JOIN "tests_employee" ON ("tests_project_employees"."employee_id" = "tests_employee"."id") LEFT OUTER JOIN "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id") LEFT OUTER JOIN "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id") LEFT OUTER JOIN "tests_meeting" ON ("tests_project"."id" = "tests_meeting"."project_id")')
self.assertEqual(str(qs.query), 'SELECT "tests_project"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_project" LEFT OUTER JOIN "tests_project_employees" ON ("tests_project"."id" = "tests_project_employees"."project_id") LEFT OUTER JOIN "tests_employee" ON ("tests_project_employees"."employee_id" = "tests_employee"."id") {join} "tests_office" ON ("tests_employee"."office_id" = "tests_office"."id") {join} "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id") LEFT OUTER JOIN "tests_meeting" ON ("tests_project"."id" = "tests_meeting"."project_id")'.format(join=get_join_type()))

qs = self.meeting_mt.add_select(*fields)
self.assertEqual(str(qs.query), 'SELECT "tests_meeting"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_meeting" INNER JOIN "tests_office" ON ("tests_meeting"."office_id" = "tests_office"."id") LEFT OUTER JOIN "tests_meeting_attendees" ON ("tests_meeting"."id" = "tests_meeting_attendees"."meeting_id") LEFT OUTER JOIN "tests_employee" ON ("tests_meeting_attendees"."employee_id" = "tests_employee"."id") LEFT OUTER JOIN "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id") LEFT OUTER JOIN "tests_project" ON ("tests_meeting"."project_id" = "tests_project"."id")')
self.assertEqual(str(qs.query), 'SELECT "tests_meeting"."id", "tests_office"."location", "tests_title"."salary", "tests_project"."name", "tests_meeting"."start_time" FROM "tests_meeting" INNER JOIN "tests_office" ON ("tests_meeting"."office_id" = "tests_office"."id") LEFT OUTER JOIN "tests_meeting_attendees" ON ("tests_meeting"."id" = "tests_meeting_attendees"."meeting_id") LEFT OUTER JOIN "tests_employee" ON ("tests_meeting_attendees"."employee_id" = "tests_employee"."id") {join} "tests_title" ON ("tests_employee"."title_id" = "tests_title"."id") LEFT OUTER JOIN "tests_project" ON ("tests_meeting"."project_id" = "tests_project"."id")'.format(join=get_join_type()))

0 comments on commit 18e879a

Please sign in to comment.