repo-sqale: use of "timestamp" instead of "timestampValue" columns

repo/repo-sqale/sql/pgnew-repo-audit.sql

@@ -180,8 +180,8 @@ CREATE INDEX ma_audit_ref_recordId_timestamp_idx ON ma_audit_ref (recordId, time
 /* TODO audit indexes
 CREATE INDEX iAuditDeltaRecordId
   ON m_audit_delta (record_id);
-CREATE INDEX iTimestampValue
-  ON m_audit_event (timestampValue);
+CREATE INDEX iTimestamp
+  ON m_audit_event (timestamp);
 CREATE INDEX iAuditEventRecordEStageTOid
   ON m_audit_event (eventStage, targetOid);
 CREATE INDEX iChangedItemPath

repo/repo-sqale/sql/pgnew-repo.sql

@@ -1637,13 +1637,13 @@ CREATE TABLE m_trigger (
     containerType ContainerType GENERATED ALWAYS AS ('TRIGGER') STORED
         CHECK (containerType = 'TRIGGER'),
     handlerUriId INTEGER REFERENCES m_uri(id),
-    timestampValue TIMESTAMPTZ,
+    timestamp TIMESTAMPTZ,
 
     PRIMARY KEY (ownerOid, cid)
 )
     INHERITS(m_container);
 
-CREATE INDEX m_trigger_timestampValue_idx ON m_trigger (timestampValue);
+CREATE INDEX m_trigger_timestamp_idx ON m_trigger (timestamp);
 
 -- stores ObjectType/operationExecution (OperationExecutionType)
 CREATE TABLE m_operation_execution (
@@ -1658,7 +1658,7 @@ CREATE TABLE m_operation_execution (
     taskRefTargetOid UUID,
     taskRefTargetType ObjectType,
     taskRefRelationId INTEGER REFERENCES m_uri(id),
-    timestampValue TIMESTAMPTZ,
+    timestamp TIMESTAMPTZ,
 
     PRIMARY KEY (ownerOid, cid)
 )
@@ -1668,7 +1668,7 @@ CREATE INDEX m_operation_execution_initiatorRefTargetOid_idx
     ON m_operation_execution (initiatorRefTargetOid);
 CREATE INDEX m_operation_execution_taskRefTargetOid_idx
     ON m_operation_execution (taskRefTargetOid);
-CREATE INDEX m_operation_execution_timestampValue_idx ON m_operation_execution (timestampValue);
+CREATE INDEX m_operation_execution_timestamp_idx ON m_operation_execution (timestamp);
 -- index for ownerOid is part of PK
 -- TODO: index for status is questionable, don't we want WHERE status = ... to another index instead?
 -- endregion

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/QAuditEventRecord.java

@@ -35,7 +35,7 @@ public class QAuditEventRecord extends FlexibleRelationalPathBase<MAuditEventRec
     public static final ColumnMetadata ID =
             ColumnMetadata.named("id").ofType(Types.BIGINT).notNull();
     public static final ColumnMetadata TIMESTAMP =
-            ColumnMetadata.named("timestampValue").ofType(Types.TIMESTAMP_WITH_TIMEZONE).notNull();
+            ColumnMetadata.named("timestamp").ofType(Types.TIMESTAMP_WITH_TIMEZONE).notNull();
     public static final ColumnMetadata EVENT_IDENTIFIER =
             ColumnMetadata.named("eventIdentifier").ofType(Types.VARCHAR);
     public static final ColumnMetadata EVENT_TYPE =

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/MOperationExecution.java

@@ -26,5 +26,5 @@ public class MOperationExecution extends MContainer {
     public UUID taskRefTargetOid;
     public MObjectType taskRefTargetType;
     public Integer taskRefRelationId;
-    public Instant timestampValue;
+    public Instant timestamp;
 }

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/MTrigger.java

@@ -16,5 +16,5 @@
 public class MTrigger extends MContainer {
 
     public Integer handlerUriId;
-    public Instant timestampValue;
+    public Instant timestamp;
 }

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QOperationExecution.java

@@ -54,8 +54,8 @@ public class QOperationExecution<OR extends MObject> extends QContainer<MOperati
             ColumnMetadata.named("taskRefTargetType").ofType(Types.OTHER);
     public static final ColumnMetadata TASK_REF_RELATION_ID =
             ColumnMetadata.named("taskRefRelationId").ofType(Types.INTEGER);
-    public static final ColumnMetadata TIMESTAMP_VALUE =
-            ColumnMetadata.named("timestampValue").ofType(Types.TIMESTAMP_WITH_TIMEZONE);
+    public static final ColumnMetadata TIMESTAMP =
+            ColumnMetadata.named("timestamp").ofType(Types.TIMESTAMP_WITH_TIMEZONE);
 
     // attributes
 
@@ -75,8 +75,8 @@ public class QOperationExecution<OR extends MObject> extends QContainer<MOperati
             createEnum("taskRefTargetType", MObjectType.class, TASK_REF_TARGET_TYPE);
     public final NumberPath<Integer> taskRefRelationId =
             createInteger("taskRefRelationId", TASK_REF_RELATION_ID);
-    public final DateTimePath<Instant> timestampValue =
-            createInstant("timestampValue", TIMESTAMP_VALUE);
+    public final DateTimePath<Instant> timestamp =
+            createInstant("timestamp", TIMESTAMP);
 
     public QOperationExecution(String variable) {
         this(variable, DEFAULT_SCHEMA_NAME, TABLE_NAME);

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QOperationExecutionMapping.java

@@ -71,7 +71,7 @@ private QOperationExecutionMapping(@NotNull SqaleRepoContext repositoryContext)
                 q -> q.taskRefRelationId,
                 QTaskMapping::get);
         addItemMapping(OperationExecutionType.F_TIMESTAMP,
-                timestampMapper(q -> q.timestampValue));
+                timestampMapper(q -> q.timestamp));
     }
 
     @Override
@@ -106,7 +106,7 @@ public MOperationExecution insert(
                 o -> row.taskRefTargetOid = o,
                 t -> row.taskRefTargetType = t,
                 r -> row.taskRefRelationId = r);
-        row.timestampValue = MiscUtil.asInstant(schemaObject.getTimestamp());
+        row.timestamp = MiscUtil.asInstant(schemaObject.getTimestamp());
 
         insert(row, jdbcSession);
         return row;

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QTrigger.java

@@ -34,14 +34,13 @@ public class QTrigger<OR extends MObject> extends QContainer<MTrigger, OR> {
 
     public static final ColumnMetadata HANDLER_URI_ID =
             ColumnMetadata.named("handlerUriId").ofType(Types.INTEGER);
-    public static final ColumnMetadata TIMESTAMP_VALUE =
-            ColumnMetadata.named("timestampValue").ofType(Types.TIMESTAMP_WITH_TIMEZONE);
+    public static final ColumnMetadata TIMESTAMP =
+            ColumnMetadata.named("timestamp").ofType(Types.TIMESTAMP_WITH_TIMEZONE);
 
     // attributes
 
     public final NumberPath<Integer> handlerUriId = createInteger("handlerUriId", HANDLER_URI_ID);
-    public final DateTimePath<Instant> timestampValue =
-            createInstant("timestampValue", TIMESTAMP_VALUE);
+    public final DateTimePath<Instant> timestamp = createInstant("timestamp", TIMESTAMP);
 
     public QTrigger(String variable) {
         this(variable, DEFAULT_SCHEMA_NAME, TABLE_NAME);

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QTriggerMapping.java

@@ -55,7 +55,7 @@ private QTriggerMapping(@NotNull SqaleRepoContext repositoryContext) {
                         (q, p) -> q.ownerOid.eq(p.oid)));
 
         addItemMapping(TriggerType.F_HANDLER_URI, uriMapper(q -> q.handlerUriId));
-        addItemMapping(TriggerType.F_TIMESTAMP, timestampMapper(q -> q.timestampValue));
+        addItemMapping(TriggerType.F_TIMESTAMP, timestampMapper(q -> q.timestamp));
     }
 
     @Override
@@ -80,7 +80,7 @@ public MTrigger insert(TriggerType schemaObject, OR ownerRow, JdbcSession jdbcSe
         MTrigger row = initRowObject(schemaObject, ownerRow);
 
         row.handlerUriId = processCacheableUri(schemaObject.getHandlerUri());
-        row.timestampValue = MiscUtil.asInstant(schemaObject.getTimestamp());
+        row.timestamp = MiscUtil.asInstant(schemaObject.getTimestamp());
 
         insert(row, jdbcSession);
         return row;

repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java

@@ -1022,12 +1022,12 @@ public void test801ContainerTrigger() throws Exception {
         MTrigger containerRow = containers.get(0);
         assertThat(containerRow.cid).isEqualTo(3); // assigned in advance
         assertCachedUri(containerRow.handlerUriId, "trigger-1-handler-uri");
-        assertThat(containerRow.timestampValue).isEqualTo(Instant.ofEpochMilli(1));
+        assertThat(containerRow.timestamp).isEqualTo(Instant.ofEpochMilli(1));
 
         containerRow = containers.get(1);
         assertThat(containerRow.cid).isEqualTo(4); // next CID assigned by repo
         assertCachedUri(containerRow.handlerUriId, "trigger-2-handler-uri");
-        assertThat(containerRow.timestampValue).isEqualTo(Instant.ofEpochMilli(2));
+        assertThat(containerRow.timestamp).isEqualTo(Instant.ofEpochMilli(2));
 
         MObject objectRow = selectObjectByOid(
                 QSystemConfiguration.class, systemConfiguration.getOid());
@@ -1079,12 +1079,12 @@ public void test802ContainerOperationExecution() throws Exception {
         assertThat(containerRow.taskRefTargetOid).isEqualTo(taskRefOid);
         assertThat(containerRow.taskRefTargetType).isEqualTo(MObjectType.TASK);
         assertCachedUri(containerRow.taskRefRelationId, taskRelation);
-        assertThat(containerRow.timestampValue).isEqualTo(Instant.ofEpochMilli(1));
+        assertThat(containerRow.timestamp).isEqualTo(Instant.ofEpochMilli(1));
 
         containerRow = containers.get(1);
         assertThat(containerRow.cid).isEqualTo(2);
         assertThat(containerRow.status).isEqualTo(OperationResultStatusType.UNKNOWN);
-        assertThat(containerRow.timestampValue).isEqualTo(Instant.ofEpochMilli(2));
+        assertThat(containerRow.timestamp).isEqualTo(Instant.ofEpochMilli(2));
 
         // this time we didn't test assigned CID or CID SEQ value on owner (see test801)
     }