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

add needed dependendencies for mysql and mssql #3343

Merged
merged 5 commits into from
Jan 28, 2022
Merged

Conversation

tadgh
Copy link
Collaborator

@tadgh tadgh commented Jan 28, 2022

A recent upgrade in flyway versions caused a regression which meant that we can no longer connect to mysql or mssql databases, as the dependencies from flyway were pulled out into additional dependencies. This MR adds those dependencies, and writes a small test to catch if other dependencies are pulled out.

Copy link
Collaborator

@dmuylwyk dmuylwyk left a comment

Choose a reason for hiding this comment

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

LGTM

The only thing I'm not sure of are some of the values in the new tests (e.g. CockroachDB). Approved assuming this passes CI.

@tadgh
Copy link
Collaborator Author

tadgh commented Jan 28, 2022

Yup this is just the internal driver that is used based on the jdbc url provided. I'm essentially just checking "Hey is this non-null and have some sane value

@tadgh tadgh enabled auto-merge (squash) January 28, 2022 02:16
@codecov
Copy link

codecov bot commented Jan 28, 2022

Codecov Report

Merging #3343 (74001c1) into master (3f42414) will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #3343      +/-   ##
============================================
+ Coverage     82.81%   82.84%   +0.03%     
- Complexity    20471    20494      +23     
============================================
  Files          1367     1369       +2     
  Lines         73553    73626      +73     
  Branches      11055    11064       +9     
============================================
+ Hits          60911    60995      +84     
+ Misses         8392     8378      -14     
- Partials       4250     4253       +3     
Impacted Files Coverage Δ
...uhn/fhir/context/phonetic/PhoneticEncoderEnum.java 93.75% <0.00%> (-6.25%) ⬇️
...ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java 73.58% <0.00%> (-5.67%) ⬇️
...a/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java 86.39% <0.00%> (-0.40%) ⬇️
.../ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java 100.00% <0.00%> (ø)
...fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java 100.00% <0.00%> (ø)
...chparam/registry/SearchParameterCanonicalizer.java 73.76% <0.00%> (ø)
...va/ca/uhn/fhir/jpa/mdm/config/MdmCommonConfig.java 100.00% <0.00%> (ø)
...ain/java/ca/uhn/fhir/util/PhoneticEncoderUtil.java 96.00% <0.00%> (ø)
...c/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java 95.48% <0.00%> (+0.57%) ⬆️
...or/TransactionConcurrencySemaphoreInterceptor.java 85.29% <0.00%> (+1.47%) ⬆️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3f42414...74001c1. Read the comment docs.

@tadgh tadgh merged commit 3d4a0d8 into master Jan 28, 2022
@tadgh tadgh deleted the mssql-mysql-failure branch January 28, 2022 03:03
michaelabuckley added a commit that referenced this pull request Jan 28, 2022
…implify

* commit 'ad3e282b8b7def95826033854f6a92746ad2eadf':
  Fix globbing pattern for log files
  Update instance_validator.md (#3328)
  add needed dependendencies for mysql and mssql (#3343)
michaelabuckley pushed a commit that referenced this pull request Jan 31, 2022
* add mssql and mysql flyway dependencies

* add exclusions to CQL to prevent duplicate classes on the classpath

* wip

* ad more databases

* finish test
michaelabuckley added a commit that referenced this pull request Jan 31, 2022
* master:
  Add error codes to all exceptions (#3278)
  3156 multiple tag race condition (#3297)
  Fix globbing pattern for log files
  Update instance_validator.md (#3328)
  add needed dependendencies for mysql and mssql (#3343)
  Add okhttp dep
  3335 allow alternative character encoding length in searchparam (#3336)
  Fix mdm config for single application context environment.  (#3338)
  Validate include statements for JPA (#3331)
  Add okhttp dep to r5 and indicate which deps need to be included (#3332)
  Bump RestEasy to 5.0.2 (#3329)

# Conflicts:
#	hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java
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.

None yet

2 participants