Detail of the queries

Author: goinnn

example/example/app/templates/test_app/app_index.html

@@ -11,14 +11,14 @@
             </tr>
             <tr>
                 <td>
-                    <pre>User.objects.filter(username__regex="^[uU]..[rR].$")</pre>
+                    <pre>User.objects.filter(username__regex="^[uU].*[rR].$")</pre>
                 </td>
                 <td> {{ users_regex }} </td>
                 <td> {{ time_regex }} </td>
             </tr>
             <tr>
                 <td>
-                    <pre>User.objects.filter(username__ilike="u%%r%")</pre>
+                    <pre>User.objects.filter(username__ilike="u%r%")</pre>
                 </td>
                 <td> {{ users_like }} </td>
                 <td> {{ time_like }} </td>

example/example/app/tests.py

@@ -31,13 +31,13 @@
 class DjangoLikeTestCase(TestCase):
 
     def test_like(self):
-        users_like = User.objects.filter(username__like="u%%r%")
-        users_regex = User.objects.filter(username__regex="^u..r.$")
+        users_like = User.objects.filter(username__like="u%r%")
+        users_regex = User.objects.filter(username__regex="^u.*r.$")
         self.assertEqual(list(users_like), list(users_regex))
         self.assertEqual(users_like.count(), 4)
 
     def test_ilike(self):
-        users_ilike = User.objects.filter(username__ilike="U%%R%")
+        users_ilike = User.objects.filter(username__ilike="U%R%")
         users_regex1 = User.objects.filter(username__regex="^[Uu].*[Rr].$")
         self.assertEqual(list(users_ilike), list(users_regex1))
         self.assertEqual(users_ilike.count(), 4)
@@ -46,12 +46,12 @@ def test_ilike(self):
         self.assertNotEqual(list(users_ilike), list(users_regex2))
         self.assertNotEqual(list(users_regex2), 0)
         if 'sqlite3' not in settings.DATABASES['default']['ENGINE']:
-            users_like = User.objects.filter(username__like="U%%R%")
+            users_like = User.objects.filter(username__like="U%R%")
             self.assertEqual(list(users_like), list(users_regex2))
 
     def test_lookup_error(self):
         try:
-            User.objects.filter(username__error="u%%r%")
+            User.objects.filter(username__error="u%r%")
             raise AssertionError("The before query should have failed")
         except TypeError:
             pass

example/example/app/views.py

@@ -23,11 +23,11 @@
 
 def app_index(request):
     datetime_regex_start = datetime.datetime.now()
-    users_regex = list(User.objects.filter(username__regex="^[uU]..[rR].$"))
+    users_regex = list(User.objects.filter(username__regex="^[uU].*[rR].$"))
     time_regex = (datetime.datetime.now() - datetime_regex_start).total_seconds() * 1000
 
     datetime_like_start = datetime.datetime.now()
-    users_like = list(User.objects.filter(username__ilike="u%%r%"))
+    users_like = list(User.objects.filter(username__ilike="u%r%"))
     time_like = (datetime.datetime.now() - datetime_like_start).total_seconds() * 1000
 
     improvement = (100 * float(time_regex - time_like) / time_like)