[kie-issues#1606] Modify columns in the flyway migration scripts which uses sql reserved words

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 = "metadata_key")
+    @Column(name = "metadata_value")
     private Map<String, String> metadata;
 
     @Id

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 = "metadata_key")
+    @Column(name = "metadata_value")
     private Map<String, String> metadata;
 
     @Override

data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.6__modify_columns_with_reserved_words.sql

@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+alter table definitions_nodes_metadata alter column key rename to metadata_key;
+alter table definitions_nodes_metadata alter column value rename to metadata_value;
+alter table definitions_metadata alter column key rename to metadata_key;
+alter table definitions_metadata alter column value rename to metadata_value;
+alter table definitions_annotations alter column value rename to annotation;

data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.6__modify_columns_with_reserved_words.sql

@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+alter table definitions_nodes_metadata rename column key to metadata_key;
+alter table definitions_nodes_metadata rename column value to metadata_value;
+alter table definitions_metadata rename column key to metadata_key;
+alter table definitions_metadata rename column value to metadata_value;
+alter table definitions_annotations rename column value to annotation;

persistence-commons/persistence-commons-jpa-base/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java

@@ -36,15 +36,15 @@
 @Entity
 @IdClass(CacheId.class)
 @Table(name = "kogito_data_cache", uniqueConstraints = @UniqueConstraint(columnNames = { "name",
-        "key" }), indexes = @Index(columnList = "name,key", unique = true))
+        "cache_key" }), indexes = @Index(columnList = "name,cache_key", unique = true))
 public class CacheEntity {
 
     @Id
     @Column(nullable = false)
     private String name;
 
     @Id
-    @Column(nullable = false)
+    @Column(name = "cache_key", nullable = false)
     private String key;
 
     @Convert(converter = JsonBinaryConverter.class)

persistence-commons/persistence-commons-jpa/src/main/resources/kie-flyway/db/persistence-commons/ansi/V1.5.1__modify_columns_with_reserved_words.sql

@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+alter table kogito_data_cache alter column key rename to cache_key;

persistence-commons/persistence-commons-postgresql/src/main/resources/cache_entity_create.sql

@@ -19,8 +19,8 @@
 
 
 create table if not exists kogito_data_cache (
-                                   key varchar(255) not null,
+                                   cache_key varchar(255) not null,
                                    name varchar(255) not null,
                                    json_value jsonb,
-                                   primary key (key, name)
+                                   primary key (cache_key, name)
 );

persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql/V1.5.1__modify_columns_with_reserved_words.sql

@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+alter table kogito_data_cache rename column key to cache_key;

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, " +
+            "ROW_NUMBER() OVER (ORDER BY name, cache_key) as id, " +
             "name, " +
-            "key, " +
+            "cache_key, " +
             "field1MappedField, " +
             "field2MappedField " +
             "FROM " +
@@ -174,7 +174,7 @@ private void assertResultSize(final int expected) {
                     @EntityResult(
                             entityClass = BasicTypeExtractRow.class,
                             fields = { @FieldResult(name = "id", column = "id"),
-                                    @FieldResult(name = "key", column = "key"),
+                                    @FieldResult(name = "key", column = "cache_key"),
                                     @FieldResult(name = "name", column = "name"),
                                     @FieldResult(name = "field1MappedField", column = "field1MappedField"),
                                     @FieldResult(name = "field2MappedField", column = "field2MappedField") })

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, " +
+            "ROW_NUMBER() OVER (ORDER BY name, cache_key) as id, " +
             "name, " +
-            "key, " +
+            "cache_key, " +
             "root, " +
             "nestedBasicMappedField, " +
             "nestedComplexCollectionMappedField1, " +
@@ -210,7 +210,7 @@ private void assertResultSize(final int expected) {
                     @EntityResult(
                             entityClass = ComplexHierarchicalTypeExtractRow.class,
                             fields = { @FieldResult(name = "id", column = "id"),
-                                    @FieldResult(name = "key", column = "key"),
+                                    @FieldResult(name = "key", column = "cache_key"),
                                     @FieldResult(name = "name", column = "name"),
                                     @FieldResult(name = "root", column = "root"),
                                     @FieldResult(name = "nestedBasicMappedField", column = "nestedBasicMappedField"),

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, " +
+            "ROW_NUMBER() OVER (ORDER BY name, cache_key) as id, " +
             "name, " +
-            "key, " +
+            "cache_key, " +
             "root, " +
             "nestedBasicMappedField, " +
             "nestedBasicCollectionMappedField " +
@@ -194,7 +194,7 @@ private void assertResultSize(final int expected) {
                     @EntityResult(
                             entityClass = HierarchicalTypeExtractRow.class,
                             fields = { @FieldResult(name = "id", column = "id"),
-                                    @FieldResult(name = "key", column = "key"),
+                                    @FieldResult(name = "key", column = "cache_key"),
                                     @FieldResult(name = "name", column = "name"),
                                     @FieldResult(name = "root", column = "root"),
                                     @FieldResult(name = "nestedBasicMappedField", column = "nestedBasicMappedField"),

persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java

@@ -72,7 +72,7 @@ void dynamicMappingDefinitionCreation() {
         final PostgresMappingDefinition definition = new PostgresMappingDefinition("ExampleMappingId",
                 "kogito_data_cache",
                 "json_value",
-                List.of(new PostgresField("key")),
+                List.of(new PostgresField("cache_key")),
                 List.of(new PostgresPartitionField("name", "Example")),
                 "Example",
                 List.of(new PostgresMapping("field1",

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, " +
+            "ROW_NUMBER() OVER (ORDER BY name, cache_key) as id, " +
             "name, " +
-            "key, " +
+            "cache_key, " +
             "field1MappedField, " +
             "field2MappedField " +
             "FROM " +
@@ -89,7 +89,7 @@ void testApplyMappingToExistingData() {
         databaseManager.createArtifacts(new PostgresMappingDefinition("dynamicMappingId",
                 "kogito_data_cache",
                 "json_value",
-                List.of(new PostgresField("key")),
+                List.of(new PostgresField("cache_key")),
                 List.of(new PostgresPartitionField("name", CACHE_NAME)),
                 "DynamicTypeExtract",
                 List.of(new PostgresMapping("field1",
@@ -120,7 +120,7 @@ private void assertResultSize(final int expected) {
                     @EntityResult(
                             entityClass = DynamicTypeExtractRow.class,
                             fields = { @FieldResult(name = "id", column = "id"),
-                                    @FieldResult(name = "key", column = "key"),
+                                    @FieldResult(name = "key", column = "cache_key"),
                                     @FieldResult(name = "name", column = "name"),
                                     @FieldResult(name = "field1MappedField", column = "field1MappedField"),
                                     @FieldResult(name = "field2MappedField", column = "field2MappedField") })

persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/bootstrap.json

@@ -6,7 +6,7 @@
       "sourceTableJsonFieldName": "json_value",
       "sourceTableIdentityFields": [
         {
-          "fieldName": "key"
+          "fieldName": "cache_key"
         }
       ],
       "sourceTablePartitionFields": [
@@ -39,7 +39,7 @@
       "sourceTableJsonFieldName": "json_value",
       "sourceTableIdentityFields": [
         {
-          "fieldName": "key"
+          "fieldName": "cache_key"
         }
       ],
       "sourceTablePartitionFields": [
@@ -79,7 +79,7 @@
       "sourceTableJsonFieldName": "json_value",
       "sourceTableIdentityFields": [
         {
-          "fieldName": "key"
+          "fieldName": "cache_key"
         }
       ],
       "sourceTablePartitionFields": [