Skip to content

Commit

Permalink
Merge pull request #2 from Arisophy/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Arisophy authored Jan 29, 2021
2 parents bd0e08b + 7c53bc2 commit 34acb24
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
Binary file modified compositepk-model/db.sqlite3
Binary file not shown.
4 changes: 1 addition & 3 deletions compositepk-model/test/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Company(models.Model):
class Meta:
db_table = 'Company'

CPkModel

# Child Model (CpkModel)
# primary_key is composite-key: company_id, country_code
class CompanyBranch(CPkModel):
Expand Down Expand Up @@ -71,5 +71,3 @@ class Album(CPkModel):
class Meta:
db_table = 'Album'
unique_together = (('artist', 'album_no'),)


2 changes: 1 addition & 1 deletion compositepk-model/test/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def exec_test(no, key, val, memo):
# __in
(201, 'pk__in', [(musician.id, 1)], SQLite_error),
(202, 'pk__in', [(1, 1),(2,1)],SQLite_error),
(203, 'pk__in', [[1, 1],[2,1]], SQLite_error),
(203, 'pk__in', ['1,1','2,1'], SQLite_error),
(204, 'pk__in', qs_kv_name_startwith, SQLite_error),
(205, 'pk__in', list(qs_kv_name_startwith), SQLite_error),
(211, 'artist_id,album_no__in', [(1, 1),(2,1)], SQLite_error),
Expand Down

0 comments on commit 34acb24

Please # to comment.