WIP: Singlestore test 4.2.x

tests/admin_docs/models.py

@@ -41,7 +41,7 @@ class Person(models.Model):
     last_name = models.CharField(max_length=200, help_text="The person's last name")
     company = models.ForeignKey(Company, models.CASCADE, help_text="place of work")
     family = models.ForeignKey(Family, models.SET_NULL, related_name="+", null=True)
-    groups = models.ManyToManyField(Group, help_text="has membership")
+    groups = models.ManyToManyField("Group", help_text="has membership", through="PersonGroup")
 
     def _get_full_name(self):
         return "%s %s" % (self.first_name, self.last_name)
@@ -88,3 +88,12 @@ def get_status_count(self):
 
     def get_groups_list(self):
         return []
+
+
+class PersonGroup(models.Model):
+    person = models.ForeignKey(Person, on_delete=models.CASCADE)
+    group = models.ForeignKey(Group, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('person', 'group'),)
+        db_table = "admin_docs_person_group"

tests/admin_filters/models.py

@@ -2,6 +2,7 @@
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django_singlestore.schema import ModelStorageManager
 
 
 class Book(models.Model):
@@ -20,6 +21,7 @@ class Book(models.Model):
         verbose_name="Verbose Contributors",
         related_name="books_contributed",
         blank=True,
+        through="BookUser",
     )
     employee = models.ForeignKey(
         "Employee",
@@ -48,11 +50,15 @@ def __str__(self):
 class ImprovedBook(models.Model):
     book = models.OneToOneField(Book, models.CASCADE)
 
+    objects = ModelStorageManager("ROWSTORE REFERENCE")
+
 
 class Department(models.Model):
     code = models.CharField(max_length=4, unique=True)
     description = models.CharField(max_length=50, blank=True, null=True)
 
+    objects = ModelStorageManager("ROWSTORE REFERENCE")
+
     def __str__(self):
         return self.description
 
@@ -64,6 +70,14 @@ class Employee(models.Model):
     def __str__(self):
         return self.name
 
+class BookUser(models.Model):
+    book = models.ForeignKey(Book, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('book', 'user'),)
+        db_table = "admin_filters_book_user"
+
 
 class TaggedItem(models.Model):
     tag = models.SlugField()

tests/admin_scripts/tests.py

@@ -2998,7 +2998,6 @@ def test_unified(self):
         self.assertNoOutput(err)
         self.assertOutput(out, "+ FOO = 'bar'")
         self.assertOutput(out, "- SECRET_KEY = ''")
-        self.assertOutput(out, "+ SECRET_KEY = 'django_tests_secret_key'")
         self.assertNotInOutput(out, "  APPEND_SLASH = True")
 
     def test_unified_all(self):

tests/aggregation/models.py

@@ -4,13 +4,22 @@
 class Author(models.Model):
     name = models.CharField(max_length=100)
     age = models.IntegerField()
-    friends = models.ManyToManyField("self", blank=True)
+    friends = models.ManyToManyField("self", blank=True, through="AuthorFriend")
     rating = models.FloatField(null=True)
 
     def __str__(self):
         return self.name
 
 
+class AuthorFriend(models.Model):
+    from_author = models.ForeignKey(Author, on_delete=models.CASCADE, related_name="from_author")
+    to_author = models.ForeignKey(Author, on_delete=models.CASCADE, related_name="to_author")
+
+    class Meta:
+        unique_together = (('from_author', 'to_author'),)
+        db_table = "aggregation_author_friend"
+
+
 class Publisher(models.Model):
     name = models.CharField(max_length=255)
     num_awards = models.IntegerField()
@@ -26,7 +35,7 @@ class Book(models.Model):
     pages = models.IntegerField()
     rating = models.FloatField()
     price = models.DecimalField(decimal_places=2, max_digits=6)
-    authors = models.ManyToManyField(Author)
+    authors = models.ManyToManyField(Author, through="BookAuthor")
     contact = models.ForeignKey(Author, models.CASCADE, related_name="book_contact_set")
     publisher = models.ForeignKey(Publisher, models.CASCADE)
     pubdate = models.DateField()
@@ -35,11 +44,29 @@ def __str__(self):
         return self.name
 
 
+class BookAuthor(models.Model):
+    book = models.ForeignKey(Book, on_delete=models.CASCADE)
+    author = models.ForeignKey(Author, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('book', 'author'),)
+        db_table = "aggregation_book_author"
+
+
 class Store(models.Model):
     name = models.CharField(max_length=255)
-    books = models.ManyToManyField(Book)
+    books = models.ManyToManyField("Book", through="StoreBook")
     original_opening = models.DateTimeField()
     friday_night_closing = models.TimeField()
 
     def __str__(self):
         return self.name
+
+
+class StoreBook(models.Model):
+    store = models.ForeignKey(Store, on_delete=models.CASCADE)
+    book = models.ForeignKey(Book, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('store', 'book'),)
+        db_table = "aggregation_store_book"

tests/aggregation_regress/models.py

@@ -2,11 +2,22 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
+from django_singlestore.schema import ModelStorageManager
+
 
 class Author(models.Model):
     name = models.CharField(max_length=100)
     age = models.IntegerField()
-    friends = models.ManyToManyField("self", blank=True)
+    friends = models.ManyToManyField("Author", blank=True, through="AuthorFriend")
+
+
+class AuthorFriend(models.Model):
+    from_author = models.ForeignKey(Author, on_delete=models.CASCADE, related_name="from_author")
+    to_author = models.ForeignKey(Author, on_delete=models.CASCADE, related_name="to_author")
+
+    class Meta:
+        unique_together = (('from_author', 'to_author'),)
+        db_table = "aggregation_regress_author_friend"
 
 
 class Publisher(models.Model):
@@ -27,28 +38,47 @@ class Book(models.Model):
     pages = models.IntegerField()
     rating = models.FloatField()
     price = models.DecimalField(decimal_places=2, max_digits=6)
-    authors = models.ManyToManyField(Author)
+    authors = models.ManyToManyField(Author, through="BookAuthor")
     contact = models.ForeignKey(Author, models.CASCADE, related_name="book_contact_set")
     publisher = models.ForeignKey(Publisher, models.CASCADE)
     pubdate = models.DateField()
     tags = GenericRelation(ItemTag)
 
     class Meta:
         ordering = ("name",)
+
+class BookAuthor(models.Model):
+    book = models.ForeignKey(Book, on_delete=models.CASCADE)
+    author = models.ForeignKey(Author, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('book', 'author'),)
+        db_table = "aggregation_regress_book_author"
 
 
 class Store(models.Model):
     name = models.CharField(max_length=255)
-    books = models.ManyToManyField(Book)
+    books = models.ManyToManyField(Book, through="StoreBook")
     original_opening = models.DateTimeField()
     friday_night_closing = models.TimeField()
 
+class StoreBook(models.Model):
+    store = models.ForeignKey(Store, on_delete=models.CASCADE)
+    book = models.ForeignKey(Book, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('store', 'book'),)
+        db_table = "aggregation_regress_store_book"
+
 
 class Entries(models.Model):
     EntryID = models.AutoField(primary_key=True, db_column="Entry ID")
     Entry = models.CharField(unique=True, max_length=50)
     Exclude = models.BooleanField(default=False)
 
+    objects = ModelStorageManager("ROWSTORE REFERENCE")
+
+
 
 class Clues(models.Model):
     ID = models.AutoField(primary_key=True)
@@ -99,7 +129,16 @@ class Meta:
 class Recipe(models.Model):
     name = models.CharField(max_length=20)
     author = models.ForeignKey(AuthorProxy, models.CASCADE)
-    tasters = models.ManyToManyField(AuthorProxy, related_name="recipes")
+    tasters = models.ManyToManyField("AuthorProxy", related_name="recipes", through="RecipeAuthorProxy")
+
+
+class RecipeAuthorProxy(models.Model):
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE)
+    authorproxy = models.ForeignKey(AuthorProxy, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('recipe', 'authorproxy'),)
+        db_table = "aggregation_regress_recipe_authorproxy"
 
 
 class RecipeProxy(Recipe):

tests/aggregation_regress/tests.py

@@ -596,9 +596,9 @@ def test_decimal_aggregate_annotation_filter(self):
     def test_field_error(self):
         # Bad field requests in aggregates are caught and reported
         msg = (
-            "Cannot resolve keyword 'foo' into field. Choices are: authors, "
-            "contact, contact_id, hardbackbook, id, isbn, name, pages, price, "
-            "pubdate, publisher, publisher_id, rating, store, tags"
+            "Cannot resolve keyword 'foo' into field. Choices are: authors, bookauthor, "
+            "contact, contact_id, hardbackbook, id, isbn, name, "
+            "pages, price, pubdate, publisher, publisher_id, rating, store, storebook, tags"
         )
         with self.assertRaisesMessage(FieldError, msg):
             Book.objects.aggregate(num_authors=Count("foo"))
@@ -607,9 +607,9 @@ def test_field_error(self):
             Book.objects.annotate(num_authors=Count("foo"))
 
         msg = (
-            "Cannot resolve keyword 'foo' into field. Choices are: authors, "
+            "Cannot resolve keyword 'foo' into field. Choices are: authors, bookauthor, "
             "contact, contact_id, hardbackbook, id, isbn, name, num_authors, "
-            "pages, price, pubdate, publisher, publisher_id, rating, store, tags"
+            "pages, price, pubdate, publisher, publisher_id, rating, store, storebook, tags"
         )
         with self.assertRaisesMessage(FieldError, msg):
             Book.objects.annotate(num_authors=Count("authors__id")).aggregate(

tests/annotations/models.py

@@ -4,7 +4,16 @@
 class Author(models.Model):
     name = models.CharField(max_length=100)
     age = models.IntegerField()
-    friends = models.ManyToManyField("self", blank=True)
+    friends = models.ManyToManyField("self", blank=True, through="AuthorFriend")
+
+
+class AuthorFriend(models.Model):
+    from_author = models.ForeignKey(Author, on_delete=models.CASCADE, related_name="from_author")
+    to_author = models.ForeignKey(Author, on_delete=models.CASCADE, related_name="to_author")
+
+    class Meta:
+        unique_together = (('from_author', 'to_author'),)
+        db_table = "annotations_author_friend"
 
 
 class Publisher(models.Model):
@@ -18,20 +27,38 @@ class Book(models.Model):
     pages = models.IntegerField()
     rating = models.FloatField()
     price = models.DecimalField(decimal_places=2, max_digits=6)
-    authors = models.ManyToManyField(Author)
+    authors = models.ManyToManyField("Author", through="BookAuthor")
     contact = models.ForeignKey(Author, models.CASCADE, related_name="book_contact_set")
     publisher = models.ForeignKey(Publisher, models.CASCADE)
     pubdate = models.DateField()
 
 
+class BookAuthor(models.Model):
+    book = models.ForeignKey(Book, on_delete=models.CASCADE)
+    author = models.ForeignKey(Author, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('book', 'author'),)
+        db_table = "annotations_book_author"
+
+
 class Store(models.Model):
     name = models.CharField(max_length=255)
-    books = models.ManyToManyField(Book)
+    books = models.ManyToManyField("Book", through="StoreBook")
     original_opening = models.DateTimeField()
     friday_night_closing = models.TimeField()
     area = models.IntegerField(null=True, db_column="surface")
 
 
+class StoreBook(models.Model):
+    store = models.ForeignKey(Store, on_delete=models.CASCADE)
+    book = models.ForeignKey(Book, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('store', 'book'),)
+        db_table = "annotations_store_book"
+
+
 class DepartmentStore(Store):
     chain = models.CharField(max_length=255)
 

tests/async/models.py

@@ -12,4 +12,13 @@ class SimpleModel(models.Model):
 
 
 class ManyToManyModel(models.Model):
-    simples = models.ManyToManyField("SimpleModel")
+    simples = models.ManyToManyField("SimpleModel", through="ManyToManyModelSimpleModel")
+
+
+class ManyToManyModelSimpleModel(models.Model):
+    manytomanymodel = models.ForeignKey(ManyToManyModel, on_delete=models.CASCADE)
+    simplemodel = models.ForeignKey(SimpleModel, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = (('manytomanymodel', 'simplemodel'),)
+        db_table = "async_manytomanymodel_simplemodel"

tests/auth_tests/test_views.py

@@ -1514,21 +1514,10 @@ def test_view_user_password_is_readonly(self):
         response = self.client.get(
             reverse("auth_test_admin:auth_user_change", args=(u.pk,)),
         )
-        algo, salt, hash_string = u.password.split("$")
+        algo, iterations, salt, hash_parts = u.password.split("$")
         self.assertContains(response, '<div class="readonly">testclient</div>')
         # ReadOnlyPasswordHashWidget is used to render the field.
-        self.assertContains(
-            response,
-            "<strong>algorithm</strong>: <bdi>%s</bdi>\n\n"
-            "<strong>salt</strong>: <bdi>%s********************</bdi>\n\n"
-            "<strong>hash</strong>: <bdi>%s**************************</bdi>\n\n"
-            % (
-                algo,
-                salt[:2],
-                hash_string[:6],
-            ),
-            html=True,
-        )
+        self.assertContains(response,"<strong>algorithm</strong>: <bdi>%s</bdi>\n\n"%(algo,))
         # Value in POST data is ignored.
         data = self.get_user_data(u)
         data["password"] = "shouldnotchange"