Author: mtredinnick
Date: 2007-09-16 05:04:26 -0500 (Sun, 16 Sep 2007)
New Revision: 6354
Modified:
django/trunk/tests/regressiontests/backends/models.py
Log:
Rewrote the backends test to be more portable. Was previously failing on MySQL.
Modified: django/trunk/tests/regressiontests/backends/models.py
===================================================================
--- django/trunk/tests/regressiontests/backends/models.py 2007-09-16
10:04:03 UTC (rev 6353)
+++ django/trunk/tests/regressiontests/backends/models.py 2007-09-16
10:04:26 UTC (rev 6354)
@@ -1,4 +1,5 @@
from django.db import models
+from django.db import connection
class Square(models.Model):
root = models.IntegerField()
@@ -7,18 +8,27 @@
def __unicode__(self):
return "%s ** 2 == %s" % (self.root, self.square)
+if connection.features.uses_case_insensitive_names:
+ t_convert = lambda x: x.upper()
+else:
+ t_convert = lambda x: x
+qn = connection.ops.quote_name
+
__test__ = {'API_TESTS': """
#4896: Test cursor.executemany
>>> from django.db import connection
>>> cursor = connection.cursor()
->>> cursor.executemany('INSERT INTO BACKENDS_SQUARE (ROOT, SQUARE) VALUES (%s,
%s)',
-... [(i, i**2) for i in range(-5, 6)]) and None or None
+>>> opts = Square._meta
+>>> f1, f2 = opts.get_field('root'), opts.get_field('square')
+>>> query = ('INSERT INTO %s (%s, %s) VALUES (%%s, %%s)'
+... % (t_convert(opts.db_table), qn(f1.column), qn(f2.column)))
+>>> cursor.executemany(query, [(i, i**2) for i in range(-5, 6)]) and None or
None
>>> Square.objects.order_by('root')
[<Square: -5 ** 2 == 25>, <Square: -4 ** 2 == 16>, <Square: -3 ** 2 == 9>,
<Square: -2 ** 2 == 4>, <Square: -1 ** 2 == 1>, <Square: 0 ** 2 == 0>, <Square:
1 ** 2 == 1>, <Square: 2 ** 2 == 4>, <Square: 3 ** 2 == 9>, <Square: 4 ** 2 ==
16>, <Square: 5 ** 2 == 25>]
#4765: executemany with params=[] does nothing
->>> cursor.executemany('INSERT INTO BACKENDS_SQUARE (ROOT, SQUARE) VALUES (%s,
%s)', []) and None or None
+>>> cursor.executemany(query, []) and None or None
>>> Square.objects.count()
11
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
