Skip to content

Back merge of fixes from 2.7.3#1287

Merged
anthonysena merged 22 commits into
masterfrom
back-merge-2.7.3
Aug 8, 2019
Merged

Back merge of fixes from 2.7.3#1287
anthonysena merged 22 commits into
masterfrom
back-merge-2.7.3

Conversation

@pavgra

@pavgra pavgra commented Aug 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

chrisknoll and others added 22 commits July 3, 2019 13:14
Allow event cohort periods that start within the target cohort era.  Prior version required the event cohort era to start and end in the target cohort era.
When collapsing, ensure start-end dates span at least a day.
Use count_big when counting cohort events and pathways.
Padd end dates to make non-inclusive.
Added casts for impala
Added temp-table cleanup.
Fixes #779.
* Fixes masquerading of credentials in PLE / PLP results

* Better quotes handling
* Fixes failed Cohort Pathways on Impala

* fixes counts as bigint

* fixes Pathways for BQ
# Conflicts:
#	pom.xml
#	src/main/java/org/ohdsi/webapi/shiro/management/AtlasRegularSecurity.java
#	src/main/java/org/ohdsi/webapi/shiro/management/AtlasSecurity.java
#	src/main/java/org/ohdsi/webapi/shiro/management/FilterTemplates.java
#	src/main/java/org/ohdsi/webapi/util/GenericExceptionMapper.java
@pavgra pavgra requested a review from anthonysena August 7, 2019 23:48
@anthonysena anthonysena merged commit 6722ef8 into master Aug 8, 2019
@anthonysena anthonysena deleted the back-merge-2.7.3 branch August 8, 2019 18:06
This was referenced Aug 8, 2019
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.

5 participants