Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e28cc4a

Browse files
adamcikadamcik
committedFeb 10, 2011
Update tests for 1.2
1 parent c3da6b4 commit e28cc4a

File tree

1 file changed

+54
-63
lines changed

1 file changed

+54
-63
lines changed
 

‎tests/models.py

Lines changed: 54 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from IPy import IP
22

3-
from django.db import models, connection
3+
from django.db import models, connection, DEFAULT_DB_ALIAS
44

55
from netfields import *
66

@@ -15,10 +15,7 @@ class InetTestModel(models.Model):
1515
>>> InetTestModel(inet='').save()
1616
Traceback (most recent call last):
1717
...
18-
IntegrityError: null value in column "inet" violates not-null constraint
19-
<BLANKLINE>
20-
21-
>>> cursor.execute('ROLLBACK')
18+
IntegrityError: inet.inet may not be NULL
2219
2320
>>> InetTestModel(inet='az').save()
2421
Traceback (most recent call last):
@@ -28,100 +25,94 @@ class InetTestModel(models.Model):
2825
>>> InetTestModel(inet=None).save()
2926
Traceback (most recent call last):
3027
...
31-
IntegrityError: null value in column "inet" violates not-null constraint
32-
<BLANKLINE>
33-
34-
>>> cursor.execute('ROLLBACK')
28+
IntegrityError: inet.inet may not be NULL
3529
3630
>>> InetTestModel().save()
3731
Traceback (most recent call last):
3832
...
39-
IntegrityError: null value in column "inet" violates not-null constraint
40-
<BLANKLINE>
41-
42-
>>> cursor.execute('ROLLBACK')
33+
IntegrityError: inet.inet may not be NULL
4334
44-
>>> InetTestModel.objects.filter(inet='10.0.0.1').query.as_sql()
35+
>>> InetTestModel.objects.filter(inet='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
4536
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" = %s ', (u'10.0.0.1',))
4637
47-
>>> InetTestModel.objects.filter(inet__exact='10.0.0.1').query.as_sql()
38+
>>> InetTestModel.objects.filter(inet__exact='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
4839
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" = %s ', (u'10.0.0.1',))
4940
50-
>>> InetTestModel.objects.filter(inet__iexact='10.0.0.1').query.as_sql()
41+
>>> InetTestModel.objects.filter(inet__iexact='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
5142
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" = %s ', (u'10.0.0.1',))
5243
53-
>>> InetTestModel.objects.filter(inet__net_contains='10.0.0.1').query.as_sql()
44+
>>> InetTestModel.objects.filter(inet__net_contains='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
5445
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" >> %s ', (u'10.0.0.1',))
5546
56-
>>> InetTestModel.objects.filter(inet__in=['10.0.0.1', '10.0.0.2']).query.as_sql()
47+
>>> InetTestModel.objects.filter(inet__in=['10.0.0.1', '10.0.0.2']).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
5748
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" IN (%s, %s)', (u'10.0.0.1', u'10.0.0.2'))
5849
59-
>>> InetTestModel.objects.filter(inet__gt='10.0.0.1').query.as_sql()
50+
>>> InetTestModel.objects.filter(inet__gt='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
6051
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" > %s ', (u'10.0.0.1',))
6152
62-
>>> InetTestModel.objects.filter(inet__gte='10.0.0.1').query.as_sql()
53+
>>> InetTestModel.objects.filter(inet__gte='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
6354
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" >= %s ', (u'10.0.0.1',))
6455
65-
>>> InetTestModel.objects.filter(inet__lt='10.0.0.1').query.as_sql()
56+
>>> InetTestModel.objects.filter(inet__lt='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
6657
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" < %s ', (u'10.0.0.1',))
6758
68-
>>> InetTestModel.objects.filter(inet__lte='10.0.0.1').query.as_sql()
59+
>>> InetTestModel.objects.filter(inet__lte='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
6960
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" <= %s ', (u'10.0.0.1',))
7061
71-
>>> InetTestModel.objects.filter(inet__startswith='10.').query.as_sql()
62+
>>> InetTestModel.objects.filter(inet__startswith='10.').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
7263
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE HOST("inet"."inet") ILIKE %s ', (u'10.%',))
7364
74-
>>> InetTestModel.objects.filter(inet__istartswith='10.').query.as_sql()
65+
>>> InetTestModel.objects.filter(inet__istartswith='10.').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
7566
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE HOST("inet"."inet") ILIKE %s ', (u'10.%',))
7667
77-
>>> InetTestModel.objects.filter(inet__endswith='.1').query.as_sql()
68+
>>> InetTestModel.objects.filter(inet__endswith='.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
7869
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE HOST("inet"."inet") ILIKE %s ', (u'%.1',))
7970
80-
>>> InetTestModel.objects.filter(inet__iendswith='.1').query.as_sql()
71+
>>> InetTestModel.objects.filter(inet__iendswith='.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
8172
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE HOST("inet"."inet") ILIKE %s ', (u'%.1',))
8273
83-
>>> InetTestModel.objects.filter(inet__range=('10.0.0.1', '10.0.0.10')).query.as_sql()
74+
>>> InetTestModel.objects.filter(inet__range=('10.0.0.1', '10.0.0.10')).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
8475
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" BETWEEN %s and %s', (u'10.0.0.1', u'10.0.0.10'))
8576
86-
>>> InetTestModel.objects.filter(inet__year=1).query.as_sql()
77+
>>> InetTestModel.objects.filter(inet__year=1).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
8778
Traceback (most recent call last):
8879
...
8980
ValueError: Invalid lookup type "year"
9081
91-
>>> InetTestModel.objects.filter(inet__month=1).query.as_sql()
82+
>>> InetTestModel.objects.filter(inet__month=1).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
9283
Traceback (most recent call last):
9384
...
9485
ValueError: Invalid lookup type "month"
9586
96-
>>> InetTestModel.objects.filter(inet__day=1).query.as_sql()
87+
>>> InetTestModel.objects.filter(inet__day=1).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
9788
Traceback (most recent call last):
9889
...
9990
ValueError: Invalid lookup type "day"
10091
101-
>>> InetTestModel.objects.filter(inet__isnull=True).query.as_sql()
92+
>>> InetTestModel.objects.filter(inet__isnull=True).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
10293
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" IS NULL', ())
10394
104-
>>> InetTestModel.objects.filter(inet__isnull=False).query.as_sql()
95+
>>> InetTestModel.objects.filter(inet__isnull=False).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
10596
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" IS NOT NULL', ())
10697
107-
>>> InetTestModel.objects.filter(inet__search='10').query.as_sql()
98+
>>> InetTestModel.objects.filter(inet__search='10').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
10899
Traceback (most recent call last):
109100
...
110101
ValueError: Invalid lookup type "search"
111102
112-
>>> InetTestModel.objects.filter(inet__regex=u'10').query.as_sql()
103+
>>> InetTestModel.objects.filter(inet__regex=u'10').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
113104
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE HOST("inet"."inet") ~* %s ', (u'10',))
114105
115-
>>> InetTestModel.objects.filter(inet__iregex=u'10').query.as_sql()
106+
>>> InetTestModel.objects.filter(inet__iregex=u'10').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
116107
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE HOST("inet"."inet") ~* %s ', (u'10',))
117108
118-
>>> InetTestModel.objects.filter(inet__net_contains_or_equals='10.0.0.1').query.as_sql()
109+
>>> InetTestModel.objects.filter(inet__net_contains_or_equals='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
119110
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" >>= %s ', (u'10.0.0.1',))
120111
121-
>>> InetTestModel.objects.filter(inet__net_contained='10.0.0.1').query.as_sql()
112+
>>> InetTestModel.objects.filter(inet__net_contained='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
122113
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" << %s ', (u'10.0.0.1',))
123114
124-
>>> InetTestModel.objects.filter(inet__net_contained_or_equal='10.0.0.1').query.as_sql()
115+
>>> InetTestModel.objects.filter(inet__net_contained_or_equal='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
125116
('SELECT "inet"."id", "inet"."inet" FROM "inet" WHERE "inet"."inet" <<= %s ', (u'10.0.0.1',))
126117
'''
127118

@@ -152,87 +143,87 @@ class Meta:
152143

153144
class CidrTestModel(models.Model):
154145
'''
155-
>>> CidrTestModel.objects.filter(cidr='10.0.0.1').query.as_sql()
146+
>>> CidrTestModel.objects.filter(cidr='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
156147
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" = %s ', (u'10.0.0.1',))
157148
158-
>>> CidrTestModel.objects.filter(cidr__exact='10.0.0.1').query.as_sql()
149+
>>> CidrTestModel.objects.filter(cidr__exact='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
159150
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" = %s ', (u'10.0.0.1',))
160151
161-
>>> CidrTestModel.objects.filter(cidr__iexact='10.0.0.1').query.as_sql()
152+
>>> CidrTestModel.objects.filter(cidr__iexact='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
162153
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" = %s ', (u'10.0.0.1',))
163154
164-
>>> CidrTestModel.objects.filter(cidr__net_contains='10.0.0.1').query.as_sql()
155+
>>> CidrTestModel.objects.filter(cidr__net_contains='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
165156
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" >> %s ', (u'10.0.0.1',))
166157
167-
>>> CidrTestModel.objects.filter(cidr__in=['10.0.0.1', '10.0.0.2']).query.as_sql()
158+
>>> CidrTestModel.objects.filter(cidr__in=['10.0.0.1', '10.0.0.2']).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
168159
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" IN (%s, %s)', (u'10.0.0.1', u'10.0.0.2'))
169160
170-
>>> CidrTestModel.objects.filter(cidr__gt='10.0.0.1').query.as_sql()
161+
>>> CidrTestModel.objects.filter(cidr__gt='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
171162
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" > %s ', (u'10.0.0.1',))
172163
173-
>>> CidrTestModel.objects.filter(cidr__gte='10.0.0.1').query.as_sql()
164+
>>> CidrTestModel.objects.filter(cidr__gte='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
174165
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" >= %s ', (u'10.0.0.1',))
175166
176-
>>> CidrTestModel.objects.filter(cidr__lt='10.0.0.1').query.as_sql()
167+
>>> CidrTestModel.objects.filter(cidr__lt='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
177168
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" < %s ', (u'10.0.0.1',))
178169
179-
>>> CidrTestModel.objects.filter(cidr__lte='10.0.0.1').query.as_sql()
170+
>>> CidrTestModel.objects.filter(cidr__lte='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
180171
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" <= %s ', (u'10.0.0.1',))
181172
182-
>>> CidrTestModel.objects.filter(cidr__startswith='10.').query.as_sql()
173+
>>> CidrTestModel.objects.filter(cidr__startswith='10.').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
183174
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE TEXT("cidr"."cidr") ILIKE %s ', (u'10.%',))
184175
185-
>>> CidrTestModel.objects.filter(cidr__istartswith='10.').query.as_sql()
176+
>>> CidrTestModel.objects.filter(cidr__istartswith='10.').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
186177
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE TEXT("cidr"."cidr") ILIKE %s ', (u'10.%',))
187178
188-
>>> CidrTestModel.objects.filter(cidr__endswith='.1').query.as_sql()
179+
>>> CidrTestModel.objects.filter(cidr__endswith='.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
189180
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE TEXT("cidr"."cidr") ILIKE %s ', (u'%.1',))
190181
191-
>>> CidrTestModel.objects.filter(cidr__iendswith='.1').query.as_sql()
182+
>>> CidrTestModel.objects.filter(cidr__iendswith='.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
192183
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE TEXT("cidr"."cidr") ILIKE %s ', (u'%.1',))
193184
194-
>>> CidrTestModel.objects.filter(cidr__range=('10.0.0.1', '10.0.0.10')).query.as_sql()
185+
>>> CidrTestModel.objects.filter(cidr__range=('10.0.0.1', '10.0.0.10')).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
195186
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" BETWEEN %s and %s', (u'10.0.0.1', u'10.0.0.10'))
196187
197-
>>> CidrTestModel.objects.filter(cidr__year=1).query.as_sql()
188+
>>> CidrTestModel.objects.filter(cidr__year=1).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
198189
Traceback (most recent call last):
199190
...
200191
ValueError: Invalid lookup type "year"
201192
202-
>>> CidrTestModel.objects.filter(cidr__month=1).query.as_sql()
193+
>>> CidrTestModel.objects.filter(cidr__month=1).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
203194
Traceback (most recent call last):
204195
...
205196
ValueError: Invalid lookup type "month"
206197
207-
>>> CidrTestModel.objects.filter(cidr__day=1).query.as_sql()
198+
>>> CidrTestModel.objects.filter(cidr__day=1).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
208199
Traceback (most recent call last):
209200
...
210201
ValueError: Invalid lookup type "day"
211202
212-
>>> CidrTestModel.objects.filter(cidr__isnull=True).query.as_sql()
203+
>>> CidrTestModel.objects.filter(cidr__isnull=True).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
213204
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" IS NULL', ())
214205
215-
>>> CidrTestModel.objects.filter(cidr__isnull=False).query.as_sql()
206+
>>> CidrTestModel.objects.filter(cidr__isnull=False).query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
216207
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" IS NOT NULL', ())
217208
218-
>>> CidrTestModel.objects.filter(cidr__search='10').query.as_sql()
209+
>>> CidrTestModel.objects.filter(cidr__search='10').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
219210
Traceback (most recent call last):
220211
...
221212
ValueError: Invalid lookup type "search"
222213
223-
>>> CidrTestModel.objects.filter(cidr__regex=u'10').query.as_sql()
214+
>>> CidrTestModel.objects.filter(cidr__regex=u'10').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
224215
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE TEXT("cidr"."cidr") ~* %s ', (u'10',))
225216
226-
>>> CidrTestModel.objects.filter(cidr__iregex=u'10').query.as_sql()
217+
>>> CidrTestModel.objects.filter(cidr__iregex=u'10').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
227218
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE TEXT("cidr"."cidr") ~* %s ', (u'10',))
228219
229-
>>> CidrTestModel.objects.filter(cidr__net_contains_or_equals='10.0.0.1').query.as_sql()
220+
>>> CidrTestModel.objects.filter(cidr__net_contains_or_equals='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
230221
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" >>= %s ', (u'10.0.0.1',))
231222
232-
>>> CidrTestModel.objects.filter(cidr__net_contained='10.0.0.1').query.as_sql()
223+
>>> CidrTestModel.objects.filter(cidr__net_contained='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
233224
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" << %s ', (u'10.0.0.1',))
234225
235-
>>> CidrTestModel.objects.filter(cidr__net_contained_or_equal='10.0.0.1').query.as_sql()
226+
>>> CidrTestModel.objects.filter(cidr__net_contained_or_equal='10.0.0.1').query.get_compiler(DEFAULT_DB_ALIAS).as_sql()
236227
('SELECT "cidr"."id", "cidr"."cidr" FROM "cidr" WHERE "cidr"."cidr" <<= %s ', (u'10.0.0.1',))
237228
'''
238229

0 commit comments

Comments
 (0)
Please sign in to comment.