Skip to content

Commit

Permalink
repo-sqale: new audit mapping fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Aug 27, 2021
1 parent fb1b39c commit add5a09
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 18 deletions.
6 changes: 6 additions & 0 deletions repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepoContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import com.evolveum.midpoint.prism.delta.ChangeType;
import com.evolveum.midpoint.repo.sqale.jsonb.QuerydslJsonbType;
import com.evolveum.midpoint.repo.sqale.qmodel.common.MContainerType;
import com.evolveum.midpoint.repo.sqale.qmodel.common.QUri;
Expand All @@ -27,6 +28,8 @@
import com.evolveum.midpoint.repo.sqlbase.mapping.QueryModelMappingRegistry;
import com.evolveum.midpoint.schema.SchemaService;
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventStageType;
import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventTypeType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

/**
Expand All @@ -47,7 +50,10 @@ public SqaleRepoContext(
// each enum type must be registered if we want to map it as objects (to PG enum types)
querydslConfig.register(new EnumAsObjectType<>(AccessCertificationCampaignStateType.class));
querydslConfig.register(new EnumAsObjectType<>(ActivationStatusType.class));
querydslConfig.register(new EnumAsObjectType<>(AuditEventStageType.class));
querydslConfig.register(new EnumAsObjectType<>(AuditEventTypeType.class));
querydslConfig.register(new EnumAsObjectType<>(AvailabilityStatusType.class));
querydslConfig.register(new EnumAsObjectType<>(ChangeType.class));
querydslConfig.register(new EnumAsObjectType<>(MContainerType.class));
querydslConfig.register(new EnumAsObjectType<>(MExtItemHolderType.class));
querydslConfig.register(new EnumAsObjectType<>(MExtItemCardinality.class));
Expand Down
18 changes: 9 additions & 9 deletions repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/QAuditDelta.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,31 @@ public class QAuditDelta extends FlexibleRelationalPathBase<MAuditDelta> {
public static final String TABLE_NAME = "ma_audit_delta";

public static final ColumnMetadata RECORD_ID =
ColumnMetadata.named("record_id").ofType(Types.BIGINT).notNull();
ColumnMetadata.named("recordId").ofType(Types.BIGINT).notNull();
public static final ColumnMetadata TIMESTAMP =
ColumnMetadata.named("timestamp").ofType(Types.TIMESTAMP_WITH_TIMEZONE).notNull();
public static final ColumnMetadata CHECKSUM =
ColumnMetadata.named("checksum").ofType(Types.VARCHAR).notNull();
public static final ColumnMetadata DELTA =
ColumnMetadata.named("delta").ofType(Types.BINARY);
public static final ColumnMetadata DELTA_OID =
ColumnMetadata.named("deltaOid").ofType(Types.VARCHAR);
ColumnMetadata.named("deltaOid").ofType(UuidPath.UUID_TYPE);
public static final ColumnMetadata DELTA_TYPE =
ColumnMetadata.named("deltaType").ofType(Types.INTEGER);
ColumnMetadata.named("deltaType").ofType(Types.OTHER);
public static final ColumnMetadata FULL_RESULT =
ColumnMetadata.named("fullResult").ofType(Types.BINARY);
public static final ColumnMetadata OBJECT_NAME_NORM =
ColumnMetadata.named("objectName_norm").ofType(Types.VARCHAR);
ColumnMetadata.named("objectNameNorm").ofType(Types.VARCHAR);
public static final ColumnMetadata OBJECT_NAME_ORIG =
ColumnMetadata.named("objectName_orig").ofType(Types.VARCHAR);
ColumnMetadata.named("objectNameOrig").ofType(Types.VARCHAR);
public static final ColumnMetadata RESOURCE_NAME_NORM =
ColumnMetadata.named("resourceName_norm").ofType(Types.VARCHAR);
ColumnMetadata.named("resourceNameNorm").ofType(Types.VARCHAR);
public static final ColumnMetadata RESOURCE_NAME_ORIG =
ColumnMetadata.named("resourceName_orig").ofType(Types.VARCHAR);
ColumnMetadata.named("resourceNameOrig").ofType(Types.VARCHAR);
public static final ColumnMetadata RESOURCE_OID =
ColumnMetadata.named("resourceOid").ofType(Types.VARCHAR);
ColumnMetadata.named("resourceOid").ofType(UuidPath.UUID_TYPE);
public static final ColumnMetadata STATUS =
ColumnMetadata.named("status").ofType(Types.INTEGER);
ColumnMetadata.named("status").ofType(Types.OTHER);

public final NumberPath<Long> recordId = createLong("recordId", RECORD_ID);
public final DateTimePath<Instant> timestamp = createInstant("timestamp", TIMESTAMP);
Expand Down
22 changes: 13 additions & 9 deletions ...epo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/QAuditRefValue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@

import java.sql.Types;

import com.querydsl.core.types.dsl.EnumPath;
import com.querydsl.core.types.dsl.NumberPath;
import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.sql.ColumnMetadata;

import com.evolveum.midpoint.repo.sqale.qmodel.object.MObjectType;
import com.evolveum.midpoint.repo.sqlbase.querydsl.FlexibleRelationalPathBase;
import com.evolveum.midpoint.repo.sqlbase.querydsl.UuidPath;

/**
* Querydsl query type for `MA_AUDIT_REF_VALUE` table.
Expand All @@ -27,25 +30,26 @@ public class QAuditRefValue extends FlexibleRelationalPathBase<MAuditRefValue> {
public static final ColumnMetadata ID =
ColumnMetadata.named("id").ofType(Types.BIGINT).notNull();
public static final ColumnMetadata RECORD_ID =
ColumnMetadata.named("record_id").ofType(Types.BIGINT);
ColumnMetadata.named("recordId").ofType(Types.BIGINT);
public static final ColumnMetadata NAME =
ColumnMetadata.named("name").ofType(Types.VARCHAR);
public static final ColumnMetadata OID =
ColumnMetadata.named("oid").ofType(Types.VARCHAR);
public static final ColumnMetadata TARGET_OID =
ColumnMetadata.named("targetOid").ofType(UuidPath.UUID_TYPE);
public static final ColumnMetadata TARGET_TYPE =
ColumnMetadata.named("targetType").ofType(Types.OTHER);
public static final ColumnMetadata TARGET_NAME_NORM =
ColumnMetadata.named("targetName_norm").ofType(Types.VARCHAR);
ColumnMetadata.named("targetNameNorm").ofType(Types.VARCHAR);
public static final ColumnMetadata TARGET_NAME_ORIG =
ColumnMetadata.named("targetName_orig").ofType(Types.VARCHAR);
public static final ColumnMetadata TYPE =
ColumnMetadata.named("type").ofType(Types.VARCHAR);
ColumnMetadata.named("targetNameOrig").ofType(Types.VARCHAR);

public final NumberPath<Long> id = createLong("id", ID);
public final NumberPath<Long> recordId = createLong("recordId", RECORD_ID);
public final StringPath name = createString("name", NAME);
public final StringPath oid = createString("oid", OID);
public final UuidPath targetOid = createUuid("targetOid", TARGET_OID);
public final StringPath targetNameNorm = createString("targetNameNorm", TARGET_NAME_NORM);
public final StringPath targetNameOrig = createString("targetNameOrig", TARGET_NAME_ORIG);
public final StringPath type = createString("type", TYPE);
public final EnumPath<MObjectType> targetType =
createEnum("targetType", MObjectType.class, TARGET_TYPE);

public QAuditRefValue(String variable) {
this(variable, DEFAULT_SCHEMA_NAME, TABLE_NAME);
Expand Down

0 comments on commit add5a09

Please sign in to comment.