Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ stage('Build') {
println "Using environment: ${environment}"
node('ansible') {
checkout scm

// Find AMP version
codeVersion = readMavenPom(file: 'amp/pom.xml').version
println "AMP Version: ${codeVersion}"
Expand Down
15 changes: 10 additions & 5 deletions amp/src/main/resources/xmlpatches/general/views/amp_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,16 @@
<apply>
<script>
<lang delimiter=";" type="postgres">
DROP VIEW IF EXISTS amp_activity CASCADE;
CREATE OR REPLACE VIEW amp_activity AS
SELECT amp_activity_version.*
FROM amp_activity_version JOIN amp_activity_group ON
amp_activity_version.amp_activity_id = amp_activity_group.amp_activity_last_version_id AND (amp_activity_version.deleted is null or amp_activity_version.deleted=false);
DROP VIEW IF EXISTS amp_activity CASCADE;

CREATE OR REPLACE VIEW amp_activity AS
SELECT DISTINCT ON (a.amp_activity_id)
a.*
FROM amp_activity_version a
JOIN amp_activity_group g
ON a.amp_activity_id = g.amp_activity_last_version_id
WHERE a.deleted IS NULL OR a.deleted = FALSE
ORDER BY a.amp_activity_id, a.amp_activity_id DESC;
</lang>
</script>
</apply>
Expand Down