Changed update! :pre to just non-nil check id #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AndreTheHunter
commented
Dec 11, 2017
| @@ -11,6 +11,7 @@ | |||
| [honeysql "0.8.2"]] | |||
| :javac-options ["-target" "1.7", "-source" "1.7"] | |||
| :aliases {"bikeshed" ["bikeshed" "--max-line-length" "130"] | |||
| "lint" ["do" ["eastwood"] "bikeshed" "docstring-checker"] | |||
There was a problem hiding this comment.
Added lein lint to make it easier to run the commands locally
| @@ -379,7 +379,7 @@ | |||
| honeysql-form))))) | |||
|
|
|||
| (^Boolean [model id kvs] | |||
| {:pre [(integer? id) (map? kvs) (every? keyword? (keys kvs))]} | |||
| {:pre [(some? id) (map? kvs) (every? keyword? (keys kvs))]} | |||
There was a problem hiding this comment.
The fix.
We use UUID ids
| @@ -15,3 +15,4 @@ pom.xml.asc | |||
| profiles.clj | |||
| /.env | |||
| /build.xml | |||
| /*.iml | |||
There was a problem hiding this comment.
IntelliJ project file. We use https://cursive-ide.com/
| @@ -1,4 +1,4 @@ | |||
| (defproject toucan "1.1.0" | |||
| (defproject toucan "1.1.1" | |||
There was a problem hiding this comment.
Bump version number
AndreTheHunter
commented
Dec 11, 2017
| @@ -484,7 +484,7 @@ | |||
|
|
|||
| (extend ~instance | |||
| ~@(mapcat identity (merge-with (fn [this that] `(merge ~this ~that)) | |||
| `{toucan.models/IModel models/IModelDefaults | |||
| `{toucan.models/IModel toucan.models/IModelDefaults | |||
There was a problem hiding this comment.
Found this bug when writing a marco that uses defmodel
|
Thanks @AndreTheHunter, looks good to me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks for contributing to Toucan. Before open a pull request, please take a moment to:
Ensure the PR follows the Clojure Style Guide and the Metabase Clojure Style Guide.
Tests and linters pass. You can run them locally as follows:
(CircleCI will also run these same tests against your PR.)
Make sure you've included new tests for any new features or bugfixes
New features are documented, or documentation is updated appropriately for any changed features.
Carefully review your own changes and revert any superfluous ones. (A good example would be moving words in the Markdown documentation to different lines in a way that wouldn't change how the rendered page itself would appear. These sorts of changes make a PR bigger than it needs to be, and, thus, harder to review.)
Of course, indentation and typo fixes are not covered by this rule and are always appreciated.
Include a detailed explanation of what changes you're making and why you've made them. This will help us understand what's going on while we review it.
Once you've done all that, open a PR! Make sure to at-mention @camsaul in the PR description. Otherwise I won't get an email about it and might not get review it right away. :)
Thanks for your contribution!