-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Allow a custom executor to be specified through a property on existing Executor implementations DAT-7531 #2374
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
49b71fb
Added an Executor services file to examples
wwillard7800 f6b763b
Using the runWith=<name> attribute value, look for a property that
wwillard7800 2f4ec5c
Merge remote-tracking branch 'origin/master' into DAT-7531
wwillard7800 ceb18cf
Merge remote-tracking branch 'origin/DAT-7447' into DAT-7531
wwillard7800 6555933
Updated example conf files
wwillard7800 65f2978
Updated .conf files
wwillard7800 c58b33e
Added a message to indicate that which Executor is in use
wwillard7800 07ca508
Merge remote-tracking branch 'origin/DAT-7447' into DAT-7531
wwillard7800 99352ec
WIP on timeout
wwillard7800 dbef2bc
Work on SQLCMD timeout issues
wwillard7800 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
55 changes: 55 additions & 0 deletions
55
liquibase-core/src/main/resources/liquibase/examples/sql/liquibase.sqlcmd.conf
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
#### _ _ _ _ _____ | ||
## | | (_) (_) | | __ \ | ||
## | | _ __ _ _ _ _| |__ __ _ ___ ___ | |__) | __ ___ | ||
## | | | |/ _` | | | | | '_ \ / _` / __|/ _ \ | ___/ '__/ _ \ | ||
## | |___| | (_| | |_| | | |_) | (_| \__ \ __/ | | | | | (_) | | ||
## \_____/_|\__, |\__,_|_|_.__/ \__,_|___/\___| |_| |_| \___/ | ||
## | | | ||
## |_| | ||
## | ||
## The liquibase.sqlcmd.conf file stores properties which are used during the | ||
## execution of the Microsoft SQLCMD tool. | ||
## Learn more: https://www.liquibase.org/documentation/config_properties.html | ||
#### | ||
#### | ||
## Note about relative and absolute paths: | ||
## The liquibase.sqlcmd.path must be a valid path to the SQLCMD executable. | ||
## The liquibase.sqlcmd.timeout value can be one of: | ||
## -1 - disable the timeout | ||
## Any integer value > 0 (measured in seconds) | ||
## | ||
#### | ||
|
||
# The full path to the SQLCMD executable. | ||
# Sample Linux path | ||
# liquibase.sqlcmd.path=/opt/mssql-tools/bin/sqlcmd | ||
# Sample Windows path | ||
# liquibase.sqlcmd.path="C:\\Program Files\\Microsoft SQL Server\\Client SDK\\ODBC\\170\\Tools\\Binn\\SQLCMD.EXE" | ||
|
||
# A valid timeout value for the execution of the SQLCMD tool | ||
liquibase.sqlcmd.timeout=-1 | ||
|
||
# Flag to indicate whether or not to keep the temporary SQL file after execution of SQLCMD. | ||
# True = keep False = delete (default) | ||
liquibase.sqlcmd.keep.temp=true | ||
|
||
# OPTIONAL Flag to designate the location to store temporary SQL file after execution of SQLCMD. | ||
# Liquibase will attempt to use path exactly as entered, so please ensure it complies with your OS requirements. | ||
# liquibase.sqlcmd.keep.temp.path= | ||
|
||
# OPTIONAL Flag to designate the name of temporary SQL file after execution of SQLCMD. | ||
# Liquibase will attempt to use the name exactly as entered, so please ensure it complies with your OS requirements. | ||
# liquibase.sqlcmd.keep.temp.name= | ||
|
||
# OPTIONAL Args to pass directly to SQLCMD. | ||
# Learn about SQLCMD args at https://<link> | ||
# Note: The delimiter for args is a space eg:" " and not "," or ";" separated. | ||
# liquibase.sqlcmd.args= | ||
|
||
# OPTIONAL Path to a log file for the SQLCMD output | ||
# liquibase.sqlcmd.logFile= | ||
# | ||
|
||
# OPTIONAL Name of a custom executor to use instead of SQLCMD | ||
# The Executor must be on the Liquibase classpath | ||
# liquibase.sqlcmd.executor= |
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
54 changes: 54 additions & 0 deletions
54
liquibase-core/src/main/resources/liquibase/examples/xml/liquibase.sqlcmd.conf
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
#### _ _ _ _ _____ | ||
## | | (_) (_) | | __ \ | ||
## | | _ __ _ _ _ _| |__ __ _ ___ ___ | |__) | __ ___ | ||
## | | | |/ _` | | | | | '_ \ / _` / __|/ _ \ | ___/ '__/ _ \ | ||
## | |___| | (_| | |_| | | |_) | (_| \__ \ __/ | | | | | (_) | | ||
## \_____/_|\__, |\__,_|_|_.__/ \__,_|___/\___| |_| |_| \___/ | ||
## | | | ||
## |_| | ||
## | ||
## The liquibase.sqlcmd.conf file stores properties which are used during the | ||
## execution of the Microsoft SQLCMD tool. | ||
## Learn more: https://www.liquibase.org/documentation/config_properties.html | ||
#### | ||
#### | ||
## Note about relative and absolute paths: | ||
## The liquibase.sqlcmd.path must be a valid path to the SQLCMD executable. | ||
## The liquibase.sqlcmd.timeout value can be one of: | ||
## -1 - disable the timeout | ||
## Any integer value > 0 (measured in seconds) | ||
## | ||
#### | ||
|
||
# The full path to the SQLCMD executable. | ||
# Sample Linux path | ||
# liquibase.sqlcmd.path=/opt/mssql-tools/bin/sqlcmd | ||
# Sample Windows path | ||
# liquibase.sqlcmd.path="C:\\Program Files\\Microsoft SQL Server\\Client SDK\\ODBC\\170\\Tools\\Binn\\SQLCMD.EXE" | ||
|
||
# A valid timeout value for the execution of the SQLCMD tool | ||
liquibase.sqlcmd.timeout=-1 | ||
|
||
# Flag to indicate whether or not to keep the temporary SQL file after execution of SQLCMD. | ||
# True = keep False = delete (default) | ||
liquibase.sqlcmd.keep.temp=true | ||
|
||
# OPTIONAL Flag to designate the location to store temporary SQL file after execution of SQLCMD. | ||
# Liquibase will attempt to use path exactly as entered, so please ensure it complies with your OS requirements. | ||
# liquibase.sqlcmd.keep.temp.path= | ||
|
||
# OPTIONAL Flag to designate the name of temporary SQL file after execution of SQLCMD. | ||
# Liquibase will attempt to use the name exactly as entered, so please ensure it complies with your OS requirements. | ||
# liquibase.sqlcmd.keep.temp.name= | ||
|
||
# OPTIONAL Args to pass directly to SQLCMD. | ||
# Learn about SQLCMD args at https://<link> | ||
# Note: The delimiter for args is a space eg:" " and not "," or ";" separated. | ||
# liquibase.sqlcmd.args= | ||
|
||
# OPTIONAL Path to a log file for the SQLCMD output | ||
# liquibase.sqlcmd.logFile= | ||
|
||
# OPTIONAL Name of a custom executor to use instead of SQLCMD | ||
# The Executor must be on the Liquibase classpath | ||
# liquibase.sqlcmd.executor= |
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
1 change: 1 addition & 0 deletions
1
...ibase-extension-examples/src/main/resources/META-INF/services/liquibase.executor.Executor
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
liquibase.executor.jvm.ExampleExecutor | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this class be committed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be okay. The liquibase-extension-examples are not shipped.