fix onDelete/onUpdate for ColumnBuilder #4656
Merged
Conversation
This file contains hidden or 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
|
@zeotuan Any thoughts? |
|
if we change the |
|
Now this is more close to knex js implementation, but this is kinda hack. |
|
@zeotuan can you check PR? |
|
@zeotuan Ping? |
|
I tried this code and got the same result as your @maximelkin. What is the advantage of your compared to this? type ReferencingColumnBuilder = {
[K in keyof ColumnBuilder]: (...args) => ReferencingColumnBuilder
} & {
inTable(tableName: string): ReferencingColumnBuilder;
deferrable(type: deferrableType): ReferencingColumnBuilder;
withKeyName(keyName: string): ReferencingColumnBuilder;
onDelete(command: string): ReferencingColumnBuilder;
onUpdate(command: string): ReferencingColumnBuilder;
};Also if you believe your solution is better than the one above can you make it this way so it's easier to understand type ReferencingColumnBuilder = {
[K in keyof ColumnBuilder]: ColumnBuilder[K] extends (...args: infer TArgs) => any
? (...args: TArgs) => ReferencingColumnBuilder
: ColumnBuilder[K];
} & {
inTable(tableName: string): ReferencingColumnBuilder;
deferrable(type: deferrableType): ReferencingColumnBuilder;
withKeyName(keyName: string): ReferencingColumnBuilder;
onDelete(command: string): ReferencingColumnBuilder;
onUpdate(command: string): ReferencingColumnBuilder;
}; |
|
@zeotuan first variant erases args types |
|
@maximelkin You are right! What do you think about this one? // patched ColumnBuilder methods to return ReferencingColumnBuilder with new methods
// relies on ColumnBuilder returning only ColumnBuilder
type ReferencingColumnBuilder = {
[K in keyof ColumnBuilder]: (...arg: Parameters<ColumnBuilder[K]> ) => ReferencingColumnBuilder
} & {
inTable(tableName: string): ReferencingColumnBuilder;
deferrable(type: deferrableType): ReferencingColumnBuilder;
withKeyName(keyName: string): ReferencingColumnBuilder;
onDelete(command: string): ReferencingColumnBuilder;
onUpdate(command: string): ReferencingColumnBuilder;
}; |
|
@zeotuan this is nice, updated PR |
kibertoad
approved these changes
Oct 10, 2021
OlivierCavadenti
pushed a commit
to AbeonaPascha/knex
that referenced
this pull request
Nov 4, 2021
Co-authored-by: maximelkin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
fixes #4620
This breaks wrong code, when onDelete/onUpdate called not in context of foreign constraints.
But also breaks valid code, i.e.:
(index() method return
ColumnBuilderinterface, notReferencingColumnBuilder)This probably could be fixed with rewriting code to extending previous interface with new methods instead of current approach, idk is it worth it?
@lorefnon