Skip to content

Foreign key improvements #1145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parsonsmatt merged 23 commits into from
Nov 2, 2020
Merged

Foreign key improvements #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
35bf63f
Simplify type check
kderme Aug 30, 2020
1932412
Allow to reference implicit Primary Keys
kderme Aug 29, 2020
e57f9df
Parse References keyword after explicit Foreign Key
kderme Aug 30, 2020
6f5b4cc
Use explicit parent fields references
kderme Aug 31, 2020
a598778
Use Cascade options on simple field references
kderme Aug 31, 2020
5e8cda4
Support Cascade options for SQLite
kderme Aug 31, 2020
ad2cf9e
Update Changelog and add `@since`
kderme Aug 31, 2020
bec37c6
Test nullable self reference
kderme Sep 2, 2020
b3261a9
cascade on reference
parsonsmatt Oct 30, 2020
09a3b48
sigh
parsonsmatt Oct 30, 2020
31a383b
built
parsonsmatt Oct 30, 2020
d58ea2a
remove trace
parsonsmatt Oct 30, 2020
1ba1af6
add some docs
parsonsmatt Oct 31, 2020
337d6b6
uhhh these tests should not be failing
parsonsmatt Oct 31, 2020
99241a1
merge master
parsonsmatt Oct 31, 2020
89aea41
postgres tests are passing
parsonsmatt Nov 1, 2020
b44f946
psql, sqlite, mysql pass tests
parsonsmatt Nov 2, 2020
48420ac
fix migrations messing with foreign keys
parsonsmatt Nov 2, 2020
8ea1418
don't need cascade on reference def
parsonsmatt Nov 2, 2020
ebb6f59
syntax and formatting
parsonsmatt Nov 2, 2020
6ada710
Doc comments on Foreign
parsonsmatt Nov 2, 2020
490f966
sigh parsing
parsonsmatt Nov 2, 2020
1cc1764
sigh
parsonsmatt Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
231 changes: 146 additions & 85 deletions persistent-mysql/Database/Persist/MySQL.hs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion persistent-mysql/test/main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import qualified UniqueTest
import qualified UpsertTest
import qualified CustomConstraintTest
import qualified LongIdentifierTest
import qualified ForeignKey

type Tuple a b = (a, b)

Expand Down Expand Up @@ -102,7 +103,7 @@ instance Arbitrary (DataTypeTableGeneric backend) where
setup :: (HasCallStack, MonadUnliftIO m) => Migration -> ReaderT SqlBackend m ()
setup migration = do
printMigration migration
_ <- runMigrationSilent migration
_ <- runMigrationUnsafe migration
pure ()

main :: IO ()
Expand All @@ -128,8 +129,10 @@ main = do
, MigrationColumnLengthTest.migration
, TransactionLevelTest.migration
-- , LongIdentifierTest.migration
, ForeignKey.compositeMigrate
]
PersistentTest.cleanDB
ForeignKey.cleanDB

hspec $ do
xdescribe "This is pending on MySQL because you can't have DEFAULT CURRENT_DATE" $ do
Expand Down Expand Up @@ -178,6 +181,7 @@ main = do
UpsertTest.Don'tUpdateNull
UpsertTest.UpsertPreserveOldKey

ForeignKey.specsWith db
MpsNoPrefixTest.specsWith db
MpsCustomPrefixTest.specsWith db
EmptyEntityTest.specsWith db (Just (runMigrationSilent EmptyEntityTest.migration))
Expand Down
4 changes: 4 additions & 0 deletions persistent-postgresql/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## (Unreleased) 2.11.0.0

* Foreign Key improvements [#1121] https://github.com/yesodweb/persistent/pull/1121
* It is now supported to refer to a table with an auto generated Primary Kay
* It is now supported to refer to non-primary fields, using the keyword `References`

* Implement interval support. [#1053](https://github.com/yesodweb/persistent/pull/1053)
* [#1060](https://github.com/yesodweb/persistent/pull/1060)
* The QuasiQuoter now supports `OnDelete` and `OnUpdate` cascade options.
Expand Down
Loading