Commit 4a5f4ccc authored by Valentin Suhnjov's avatar Valentin Suhnjov

Merge branch 'releases/release-0.8.0' into master

parents df5530c8 dfa7b020
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<groupId>ee.eesti.riha</groupId> <groupId>ee.eesti.riha</groupId>
<artifactId>rest</artifactId> <artifactId>rest</artifactId>
<version>0.7.0</version> <version>0.8.0</version>
<packaging>war</packaging> <packaging>war</packaging>
......
CREATE OR REPLACE VIEW riha.main_resource_view AS CREATE OR REPLACE VIEW riha.main_resource_view AS
SELECT DISTINCT ON (json_content ->> 'uuid') *, SELECT DISTINCT ON (json_content ->> 'uuid') *,
((main_resource.json_content #>> '{meta,creation_timestamp}'::text[]))::timestamp AS j_creation_timestamp ((main_resource.json_content #>> '{meta,creation_timestamp}'::text[]))::timestamp AS j_creation_timestamp,
((main_resource.json_content #>> '{meta,update_timestamp}'::text[]))::timestamp AS j_update_timestamp
FROM riha.main_resource as main_resource FROM riha.main_resource as main_resource
ORDER BY json_content ->> 'uuid', ORDER BY json_content ->> 'uuid',
creation_date DESC, j_update_timestamp DESC NULLS LAST,
main_resource_id DESC; main_resource_id DESC;
\ No newline at end of file
CREATE OR REPLACE VIEW riha.main_resource_view AS
SELECT DISTINCT ON (json_content ->> 'uuid') *,
((main_resource.json_content #>> '{meta,creation_timestamp}'::text[]))::timestamp AS j_creation_timestamp,
((main_resource.json_content #>> '{meta,update_timestamp}'::text[]))::timestamp AS j_update_timestamp
FROM riha.main_resource as main_resource
ORDER BY json_content ->> 'uuid',
j_update_timestamp DESC NULLS LAST,
main_resource_id DESC;
\ No newline at end of file
...@@ -25,7 +25,7 @@ import java.util.UUID; ...@@ -25,7 +25,7 @@ import java.util.UUID;
@TypeDefs({@TypeDef(name = "JsonObject", typeClass = JsonObjectUserType.class) }) @TypeDefs({@TypeDef(name = "JsonObject", typeClass = JsonObjectUserType.class) })
@Transactional @Transactional
@Entity @Entity
@Table(name = "comment", schema = "riha") @Table(name = "comment")
@JsonInclude(Include.NON_NULL) @JsonInclude(Include.NON_NULL)
public class Comment implements BaseModel { public class Comment implements BaseModel {
......
riharest.jdbc.url=jdbc:postgresql://192.168.1.37:5432/riha?currentSchema=riha riharest.jdbc.url=jdbc:postgresql://localhost:5432/riha?currentSchema=riha
riharest.jdbc.user=postgres riharest.jdbc.user=postgres
riharest.jdbc.password=admin riharest.jdbc.password=admin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment