Skip to content
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.

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

persistent-2.13 #1240

Merged
merged 15 commits into from
May 5, 2021
Merged

persistent-2.13 #1240

merged 15 commits into from
May 5, 2021

Conversation

parsonsmatt
Copy link
Collaborator

The persistent-2.13 branch tracks all the big breaking changes that are coming.

parsonsmatt and others added 10 commits April 20, 2021 17:12
* abstractification

* abstractification

* Internalize SqlBackend

* suppor tother sql dbs

* bounds

* asdf

* import data.monoid

* limitoffset and backendspecificoverrides

* use setter

* getConnUpsertSql

* formatting

* sigh

* clean warns

* cabal formatting

* merge resolve

* lol

* ok

* update changelogs

* one more [ci skip]
* Implicit ID Column COnfiguration

* PersistSettings is internal

* start teasing out the module structure

* move around, factor out the Names module

* start enumerating types, make entitydef abstract

* entity def abstraction

* teasing out the EntityDef stuff

* builds

* testinggg

* it works

* it works

* tidy up

* sigh

* i hate you

* tidy

* wrote test for mysql, need to set maxlen sigh

* mysql test, need to be able to set maxlen

* support mysql lmfao

* whyyy
* discover entities

* remove fdescribe

* changelog

* yupo

* remove error
* Better migrations

* why is the test failing

* Columns are present in entityFields now, but the generated code is broken.

* th specs work

* fixed mkColumns

* changelog entry

* fix mongo

* no idea why this is broken now

* why on earth did this work

* remove debug trace statements

* typo

* what no put that back in
* wtf

* hmmm

* refactor and tidy

* are foreign fields never right ?!

* changelog

* fix comments

* dead code
* Implement config for customising the FK name

* Update changelog

* Tweak test description

* Tweaks/better use of types

* Review tweaks

* Some initial post-review changes

* Table name turned out to be EntityNameHS

* Do the same thing but for the constraint

* Expose more stuff

* Some refactoring / cleanup

* Fix changelog indentation

* Tidy code layout
* QQ now returns UnboundEntityDef

* Relocate fixForeignKeysAll

* deprecate some stuff, reorganize some code

* ok, now we need to set sql types appropriately.

* dodgy instances are banned

* fuse away the EntityDefSqlTypeExp stuff

* refactor to top level

* fuse sqlTypeExp in there

* fix Key vs Id stuff

* still need to get the foreign key types right

* hmmm

* move to QuasiSpec

* clean up tests

* so close

* ok but what if i don't fix foreign keys

* wip

* oh man please

* getting closer...

* make some tests

* fix json and keyFromValueM

* slightly more graceful handling

* return dummy field for id, from persist values

* got some tests passing

* well sqlite works

* pg tests running

* what happened

* hmm mongo is trashed maybe

* bye mongo

* ok for real bye mongo, for now at least

* clean warns

* asdf

* drop GHC 8.2 support

* sigh

* lots of commments
arbitraryWhiteSpaceChar :: Gen Char
arbitraryWhiteSpaceChar =
oneof $ pure <$> [' ', '\t', '\n', '\r']
describe "Database" $ describe "Persist" $ do
Copy link
Contributor

@danbroooks danbroooks May 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not too sure what has happened here, but it seems like the merge of my PR has resulted in some of the changes coming in but not others.

I did an initial merge last night (which was before you merged your QQ changes in), and following you merging in your QQ PR, merged this branch back into mine again and resolved the conflicts, but it seems like the changes from the first commit have come through here (5a44a6d) but not the second merge (8d4e5b2). You may have clocked this already but I just wanted to point it out in case you hadn't.

Note the conflicts on this PR still, and the lack of a KindEntities.spec call in these tests.

You might be able to just cherry pick 8d4e5b25cb32df52db887570d0eb35e49400b873 on this branch, then push that up? 🤷 I'm not sure why this has happened

Ok disregard that last bit, I was just getting mixed up. I'm not too sure why there are conflicts still following the merge of my PR 🤷

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no worries! I got it fixed up

@parsonsmatt parsonsmatt added this to the 2.13 milestone May 5, 2021
@parsonsmatt parsonsmatt merged commit eaf9d56 into master May 5, 2021
@brandonchinn178
Copy link
Contributor

Can you add the DeleteCascade deprecation to the changelog for 2.13?

@parsonsmatt
Copy link
Collaborator Author

Yes - that got snuck into the changleog entry for 2.12.1.2 somehow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants