This is an automated email from the ASF dual-hosted git repository.
pefernan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 2bfdd851a [kie-issues#1606] Modify columns in the flyway migration
scripts which uses sql reserved words (#2139)
2bfdd851a is described below
commit 2bfdd851a6372469047b26f844c7beade367fe08
Author: Deepak Joseph <[email protected]>
AuthorDate: Wed Dec 18 19:21:41 2024 +0530
[kie-issues#1606] Modify columns in the flyway migration scripts which uses
sql reserved words (#2139)
* Modified column names with reserved words
Signed-off-by: Deepak Joseph <[email protected]>
* Fixed most tests
Signed-off-by: Deepak Joseph <[email protected]>
* Fixed tests
Signed-off-by: Deepak Joseph <[email protected]>
* Fixed column name
Signed-off-by: Deepak Joseph <[email protected]>
* Updated the column names after KIE discussions
* Fixed tests
* To rerun
---------
Signed-off-by: Deepak Joseph <[email protected]>
---
.../java/org/kie/kogito/index/jpa/model/NodeEntity.java | 4 ++--
.../kogito/index/jpa/model/ProcessDefinitionEntity.java | 6 +++---
.../V1.45.0.7__modify_columns_with_reserved_words.sql | 12 +++++-------
.../V1.45.0.7__modify_columns_with_reserved_words.sql | 12 +++++-------
.../kie/kogito/persistence/postgresql/PostgresQuery.java | 2 +-
.../kogito/persistence/postgresql/model/CacheEntity.java | 8 ++++----
.../ansi/V1.5.1__modify_columns_with_reserved_words.sql} | 9 ++-------
.../src/main/resources/cache_entity_create.sql | 7 ++++---
.../V1.5.1__modify_columns_with_reserved_words.sql} | 9 ++-------
.../persistence-commons-reporting-api/README.md | 16 ++++++++--------
.../src/test/resources/bootstrap.json | 12 ++++++------
.../postgresql/reporting/BasicTypeMappingIT.java | 10 +++++-----
.../reporting/ComplexHierarchicalTypeMappingIT.java | 10 +++++-----
.../postgresql/reporting/HierarchicalTypeMappingIT.java | 10 +++++-----
.../reporting/api/PostgresMappingsApiV1IT.java | 4 ++--
.../sqlbuilders/PostgresApplyMappingSqlBuilderIT.java | 14 +++++++-------
.../src/test/resources/bootstrap.json | 12 ++++++------
17 files changed, 72 insertions(+), 85 deletions(-)
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
index 7eaab4dfd..f11c3d2b4 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
@@ -53,8 +53,8 @@ public class NodeEntity extends AbstractEntity {
@CollectionTable(name = "definitions_nodes_metadata", joinColumns = {
@JoinColumn(name = "node_id", referencedColumnName = "id"),
@JoinColumn(name = "process_id", referencedColumnName =
"process_id"), @JoinColumn(name = "process_version", referencedColumnName =
"process_version") },
foreignKey = @ForeignKey(name =
"fk_definitions_nodes_metadata_definitions_nodes"))
- @MapKeyColumn(name = "key")
- @Column(name = "value")
+ @MapKeyColumn(name = "name")
+ @Column(name = "meta_value")
private Map<String, String> metadata;
@Id
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
index 100dc79c1..a7158f31b 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
@@ -72,14 +72,14 @@ public class ProcessDefinitionEntity extends AbstractEntity
{
@ElementCollection
@CollectionTable(name = "definitions_annotations", joinColumns = {
@JoinColumn(name = "process_id", referencedColumnName = "id"),
@JoinColumn(name = "process_version", referencedColumnName =
"version") }, foreignKey = @ForeignKey(name = "fk_definitions_annotations"))
- @Column(name = "value")
+ @Column(name = "annotation")
private Set<String> annotations;
@ElementCollection
@CollectionTable(name = "definitions_metadata", joinColumns = {
@JoinColumn(name = "process_id", referencedColumnName = "id"),
@JoinColumn(name = "process_version", referencedColumnName = "version") },
foreignKey = @ForeignKey(name = "fk_definitions_metadata"))
- @MapKeyColumn(name = "key")
- @Column(name = "value")
+ @MapKeyColumn(name = "name")
+ @Column(name = "meta_value")
private Map<String, String> metadata;
@Override
diff --git
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.7__modify_columns_with_reserved_words.sql
similarity index 68%
copy from
persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
copy to
data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.7__modify_columns_with_reserved_words.sql
index b152f3907..fd92ea620 100644
---
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.7__modify_columns_with_reserved_words.sql
@@ -17,10 +17,8 @@
* under the License.
*/
-
-create table if not exists kogito_data_cache (
- key varchar(255) not null,
- name varchar(255) not null,
- json_value jsonb,
- primary key (key, name)
-);
+alter table definitions_nodes_metadata alter column key rename to name;
+alter table definitions_nodes_metadata alter column value rename to meta_value;
+alter table definitions_metadata alter column key rename to name;
+alter table definitions_metadata alter column value rename to meta_value;
+alter table definitions_annotations alter column value rename to annotation;
diff --git
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.7__modify_columns_with_reserved_words.sql
similarity index 70%
copy from
persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
copy to
data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.7__modify_columns_with_reserved_words.sql
index b152f3907..342cacedf 100644
---
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
+++
b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.7__modify_columns_with_reserved_words.sql
@@ -17,10 +17,8 @@
* under the License.
*/
-
-create table if not exists kogito_data_cache (
- key varchar(255) not null,
- name varchar(255) not null,
- json_value jsonb,
- primary key (key, name)
-);
+alter table definitions_nodes_metadata rename column key to name;
+alter table definitions_nodes_metadata rename column value to meta_value;
+alter table definitions_metadata rename column key to name;
+alter table definitions_metadata rename column value to meta_value;
+alter table definitions_annotations rename column value to annotation;
diff --git
a/persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
b/persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
index ae831210e..d17314894 100644
---
a/persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
+++
b/persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
@@ -117,7 +117,7 @@ public class PostgresQuery<T> implements Query<T> {
// Build the query to retrieve the filtered data from the temporary
table above.
StringBuilder queryString = new StringBuilder("SELECT * FROM
kogito_data_cache")
- .append(" WHERE name = '")
+ .append(" WHERE cache_name = '")
.append(name)
.append("'");
if (filters != null && !filters.isEmpty()) {
diff --git
a/persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
b/persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
index 0fac442af..cde1d5471 100644
---
a/persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
+++
b/persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
@@ -35,16 +35,16 @@ import jakarta.persistence.UniqueConstraint;
@Entity
@IdClass(CacheId.class)
-@Table(name = "kogito_data_cache", uniqueConstraints =
@UniqueConstraint(columnNames = { "name",
- "key" }), indexes = @Index(columnList = "name,key", unique = true))
+@Table(name = "kogito_data_cache", uniqueConstraints =
@UniqueConstraint(columnNames = { "cache_name",
+ "var_name" }), indexes = @Index(columnList = "cache_name,var_name",
unique = true))
public class CacheEntity {
@Id
- @Column(nullable = false)
+ @Column(name = "cache_name", nullable = false)
private String name;
@Id
- @Column(nullable = false)
+ @Column(name = "var_name", nullable = false)
private String key;
@Convert(converter = JsonBinaryConverter.class)
diff --git
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
b/persistence-commons/persistence-commons-jpa/src/main/resources/kie-flyway/db/persistence-commons/ansi/V1.5.1__modify_columns_with_reserved_words.sql
similarity index 73%
copy from
persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
copy to
persistence-commons/persistence-commons-jpa/src/main/resources/kie-flyway/db/persistence-commons/ansi/V1.5.1__modify_columns_with_reserved_words.sql
index b152f3907..49b439793 100644
---
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
+++
b/persistence-commons/persistence-commons-jpa/src/main/resources/kie-flyway/db/persistence-commons/ansi/V1.5.1__modify_columns_with_reserved_words.sql
@@ -17,10 +17,5 @@
* under the License.
*/
-
-create table if not exists kogito_data_cache (
- key varchar(255) not null,
- name varchar(255) not null,
- json_value jsonb,
- primary key (key, name)
-);
+alter table kogito_data_cache alter column name rename to cache_name;
+alter table kogito_data_cache alter column key rename to var_name;
diff --git
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
b/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
index b152f3907..1b4506787 100644
---
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
+++
b/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
@@ -19,8 +19,9 @@
create table if not exists kogito_data_cache (
- key varchar(255) not null,
- name varchar(255) not null,
+ var_name varchar(255) not null,
+ cache_name varchar(255) not null,
json_value jsonb,
- primary key (key, name)
+ primary key (var_name, cache_name)
);
+
diff --git
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
b/persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql/V1.5.1__modify_columns_with_reserved_words.sql
similarity index 73%
copy from
persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
copy to
persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql/V1.5.1__modify_columns_with_reserved_words.sql
index b152f3907..9c74443e8 100644
---
a/persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql
+++
b/persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql/V1.5.1__modify_columns_with_reserved_words.sql
@@ -17,10 +17,5 @@
* under the License.
*/
-
-create table if not exists kogito_data_cache (
- key varchar(255) not null,
- name varchar(255) not null,
- json_value jsonb,
- primary key (key, name)
-);
+alter table kogito_data_cache rename column name to cache_name;
+alter table kogito_data_cache rename column key to var_name;
diff --git
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/README.md
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/README.md
index c3298916b..698d157ab 100644
---
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/README.md
+++
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/README.md
@@ -114,8 +114,8 @@ The following limitations apply:
All examples assume the following schema:
```postgresql
create table kogito_data_cache (
- key varchar(255) not null,
- name varchar(255) not null,
+ var_name varchar(255) not null,
+ cache_name varchar(255) not null,
json_value jsonb,
primary key (key, name)
);
@@ -130,13 +130,13 @@ entities through JPA. There are code examples in
`org.kie.kogito:persistence-com
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName":"key",
+ "fieldName":"var_name",
"fieldType": "STRING"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldType": "STRING",
"fieldValue": "BasicType"
}
@@ -186,13 +186,13 @@ Result
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName":"key",
+ "fieldName":"var_name",
"fieldType": "STRING"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldType": "STRING",
"fieldValue": "HierarchicalType"
}
@@ -265,13 +265,13 @@ Result
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName":"key",
+ "fieldName":"var_name",
"fieldType": "STRING"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldType": "STRING",
"fieldValue": "ComplexHierarchicalType"
}
diff --git
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/resources/bootstrap.json
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/resources/bootstrap.json
index 6b7b8db0a..bffad3405 100644
---
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/resources/bootstrap.json
+++
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/resources/bootstrap.json
@@ -6,13 +6,13 @@
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName":"key",
+ "fieldName":"var_name",
"fieldType": "STRING"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldType": "STRING",
"fieldValue": "BasicType"
}
@@ -41,13 +41,13 @@
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName":"key",
+ "fieldName":"var_name",
"fieldType": "STRING"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldType": "STRING",
"fieldValue": "HierarchicalType"
}
@@ -83,13 +83,13 @@
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName":"key",
+ "fieldName":"var_name",
"fieldType": "STRING"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldType": "STRING",
"fieldValue": "ComplexHierarchicalType"
}
diff --git
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
index 69db207de..8a93c264c 100644
---
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
+++
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
@@ -49,9 +49,9 @@ class BasicTypeMappingIT {
private static final String CACHE_NAME = "BasicType";
private static final String SQL = "SELECT " +
- "ROW_NUMBER() OVER (ORDER BY name, key) as id, " +
- "name, " +
- "key, " +
+ "ROW_NUMBER() OVER (ORDER BY cache_name, var_name) as id, " +
+ "cache_name, " +
+ "var_name, " +
"field1MappedField, " +
"field2MappedField " +
"FROM " +
@@ -174,8 +174,8 @@ class BasicTypeMappingIT {
@EntityResult(
entityClass = BasicTypeExtractRow.class,
fields = { @FieldResult(name = "id", column =
"id"),
- @FieldResult(name = "key", column = "key"),
- @FieldResult(name = "name", column =
"name"),
+ @FieldResult(name = "key", column =
"var_name"),
+ @FieldResult(name = "name", column =
"cache_name"),
@FieldResult(name = "field1MappedField",
column = "field1MappedField"),
@FieldResult(name = "field2MappedField",
column = "field2MappedField") })
})
diff --git
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
index 900022453..7bf4292c1 100644
---
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
+++
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
@@ -50,9 +50,9 @@ class ComplexHierarchicalTypeMappingIT {
private static final String CACHE_NAME = "ComplexHierarchicalType";
private static final String SQL = "SELECT " +
- "ROW_NUMBER() OVER (ORDER BY name, key) as id, " +
- "name, " +
- "key, " +
+ "ROW_NUMBER() OVER (ORDER BY cache_name, var_name) as id, " +
+ "cache_name, " +
+ "var_name, " +
"root, " +
"nestedBasicMappedField, " +
"nestedComplexCollectionMappedField1, " +
@@ -210,8 +210,8 @@ class ComplexHierarchicalTypeMappingIT {
@EntityResult(
entityClass =
ComplexHierarchicalTypeExtractRow.class,
fields = { @FieldResult(name = "id", column =
"id"),
- @FieldResult(name = "key", column = "key"),
- @FieldResult(name = "name", column =
"name"),
+ @FieldResult(name = "key", column =
"var_name"),
+ @FieldResult(name = "name", column =
"cache_name"),
@FieldResult(name = "root", column =
"root"),
@FieldResult(name =
"nestedBasicMappedField", column = "nestedBasicMappedField"),
@FieldResult(name =
"nestedComplexCollectionMappedField1", column =
"nestedComplexCollectionMappedField1"),
diff --git
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
index f671db43f..5ad3c00ae 100644
---
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
+++
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
@@ -49,9 +49,9 @@ class HierarchicalTypeMappingIT {
private static final String CACHE_NAME = "HierarchicalType";
private static final String SQL = "SELECT " +
- "ROW_NUMBER() OVER (ORDER BY name, key) as id, " +
- "name, " +
- "key, " +
+ "ROW_NUMBER() OVER (ORDER BY cache_name, var_name) as id, " +
+ "cache_name, " +
+ "var_name, " +
"root, " +
"nestedBasicMappedField, " +
"nestedBasicCollectionMappedField " +
@@ -194,8 +194,8 @@ class HierarchicalTypeMappingIT {
@EntityResult(
entityClass = HierarchicalTypeExtractRow.class,
fields = { @FieldResult(name = "id", column =
"id"),
- @FieldResult(name = "key", column = "key"),
- @FieldResult(name = "name", column =
"name"),
+ @FieldResult(name = "key", column =
"var_name"),
+ @FieldResult(name = "name", column =
"cache_name"),
@FieldResult(name = "root", column =
"root"),
@FieldResult(name =
"nestedBasicMappedField", column = "nestedBasicMappedField"),
@FieldResult(name =
"nestedBasicCollectionMappedField", column =
"nestedBasicCollectionMappedField") })
diff --git
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java
index 124380608..38767dd53 100644
---
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java
+++
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java
@@ -72,8 +72,8 @@ class PostgresMappingsApiV1IT {
final PostgresMappingDefinition definition = new
PostgresMappingDefinition("ExampleMappingId",
"kogito_data_cache",
"json_value",
- List.of(new PostgresField("key")),
- List.of(new PostgresPartitionField("name", "Example")),
+ List.of(new PostgresField("var_name")),
+ List.of(new PostgresPartitionField("cache_name", "Example")),
"Example",
List.of(new PostgresMapping("field1",
new PostgresJsonField("field1", JsonType.STRING))));
diff --git
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
index 43511ef5a..efb4ba580 100644
---
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
+++
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
@@ -55,9 +55,9 @@ class PostgresApplyMappingSqlBuilderIT {
private static final String CACHE_NAME = "DynamicType";
private static final String SQL = "SELECT " +
- "ROW_NUMBER() OVER (ORDER BY name, key) as id, " +
- "name, " +
- "key, " +
+ "ROW_NUMBER() OVER (ORDER BY cache_name, var_name) as id, " +
+ "cache_name, " +
+ "var_name, " +
"field1MappedField, " +
"field2MappedField " +
"FROM " +
@@ -89,8 +89,8 @@ class PostgresApplyMappingSqlBuilderIT {
databaseManager.createArtifacts(new
PostgresMappingDefinition("dynamicMappingId",
"kogito_data_cache",
"json_value",
- List.of(new PostgresField("key")),
- List.of(new PostgresPartitionField("name", CACHE_NAME)),
+ List.of(new PostgresField("var_name")),
+ List.of(new PostgresPartitionField("cache_name", CACHE_NAME)),
"DynamicTypeExtract",
List.of(new PostgresMapping("field1",
new PostgresJsonField("field1MappedField",
JsonType.STRING)),
@@ -120,8 +120,8 @@ class PostgresApplyMappingSqlBuilderIT {
@EntityResult(
entityClass = DynamicTypeExtractRow.class,
fields = { @FieldResult(name = "id", column =
"id"),
- @FieldResult(name = "key", column = "key"),
- @FieldResult(name = "name", column =
"name"),
+ @FieldResult(name = "key", column =
"var_name"),
+ @FieldResult(name = "name", column =
"cache_name"),
@FieldResult(name = "field1MappedField",
column = "field1MappedField"),
@FieldResult(name = "field2MappedField",
column = "field2MappedField") })
})
diff --git
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/bootstrap.json
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/bootstrap.json
index af545a94c..6a12a9833 100644
---
a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/bootstrap.json
+++
b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/bootstrap.json
@@ -6,12 +6,12 @@
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName": "key"
+ "fieldName": "var_name"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldValue": "BasicType"
}
],
@@ -39,12 +39,12 @@
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName": "key"
+ "fieldName": "var_name"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldValue": "HierarchicalType"
}
],
@@ -79,12 +79,12 @@
"sourceTableJsonFieldName": "json_value",
"sourceTableIdentityFields": [
{
- "fieldName": "key"
+ "fieldName": "var_name"
}
],
"sourceTablePartitionFields": [
{
- "fieldName": "name",
+ "fieldName": "cache_name",
"fieldValue": "ComplexHierarchicalType"
}
],
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
