diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocument.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocument.java index c0c45cd..50012d7 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocument.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocument.java @@ -19,7 +19,7 @@ import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row8; +import org.jooq.Row9; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -56,6 +56,11 @@ public class TableTriggerDocument extends TableImpl */ public final TableField ID = createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, ""); + /** + * The column databasir.table_trigger_document.name. + */ + public final TableField NAME = createField(DSL.name("name"), SQLDataType.VARCHAR(1024).nullable(false).defaultValue(DSL.inline("", SQLDataType.VARCHAR)), this, ""); + /** * The column * databasir.table_trigger_document.table_document_id. @@ -176,11 +181,11 @@ public class TableTriggerDocument extends TableImpl } // ------------------------------------------------------------------------- - // Row8 type methods + // Row9 type methods // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row9 fieldsRow() { + return (Row9) super.fieldsRow(); } } diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocumentPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocumentPojo.java index af31324..0328f4a 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocumentPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocumentPojo.java @@ -17,6 +17,7 @@ public class TableTriggerDocumentPojo implements Serializable { private static final long serialVersionUID = 1L; private Integer id; + private String name; private Integer tableDocumentId; private Integer databaseDocumentId; private String timing; @@ -29,6 +30,7 @@ public class TableTriggerDocumentPojo implements Serializable { public TableTriggerDocumentPojo(TableTriggerDocumentPojo value) { this.id = value.id; + this.name = value.name; this.tableDocumentId = value.tableDocumentId; this.databaseDocumentId = value.databaseDocumentId; this.timing = value.timing; @@ -40,6 +42,7 @@ public class TableTriggerDocumentPojo implements Serializable { public TableTriggerDocumentPojo( Integer id, + String name, Integer tableDocumentId, Integer databaseDocumentId, String timing, @@ -49,6 +52,7 @@ public class TableTriggerDocumentPojo implements Serializable { LocalDateTime createAt ) { this.id = id; + this.name = name; this.tableDocumentId = tableDocumentId; this.databaseDocumentId = databaseDocumentId; this.timing = timing; @@ -72,6 +76,20 @@ public class TableTriggerDocumentPojo implements Serializable { this.id = id; } + /** + * Getter for databasir.table_trigger_document.name. + */ + public String getName() { + return this.name; + } + + /** + * Setter for databasir.table_trigger_document.name. + */ + public void setName(String name) { + this.name = name; + } + /** * Getter for * databasir.table_trigger_document.table_document_id. @@ -181,6 +199,7 @@ public class TableTriggerDocumentPojo implements Serializable { StringBuilder sb = new StringBuilder("TableTriggerDocumentPojo ("); sb.append(id); + sb.append(", ").append(name); sb.append(", ").append(tableDocumentId); sb.append(", ").append(databaseDocumentId); sb.append(", ").append(timing); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableTriggerDocumentRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableTriggerDocumentRecord.java index 26d5497..0fed447 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableTriggerDocumentRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableTriggerDocumentRecord.java @@ -11,8 +11,8 @@ import java.time.LocalDateTime; import org.jooq.Field; import org.jooq.Record1; -import org.jooq.Record8; -import org.jooq.Row8; +import org.jooq.Record9; +import org.jooq.Row9; import org.jooq.impl.UpdatableRecordImpl; @@ -20,7 +20,7 @@ import org.jooq.impl.UpdatableRecordImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableTriggerDocumentRecord extends UpdatableRecordImpl implements Record8 { +public class TableTriggerDocumentRecord extends UpdatableRecordImpl implements Record9 { private static final long serialVersionUID = 1L; @@ -38,12 +38,26 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpldatabasir.table_trigger_document.name. + */ + public void setName(String value) { + set(1, value); + } + + /** + * Getter for databasir.table_trigger_document.name. + */ + public String getName() { + return (String) get(1); + } + /** * Setter for * databasir.table_trigger_document.table_document_id. */ public void setTableDocumentId(Integer value) { - set(1, value); + set(2, value); } /** @@ -51,7 +65,7 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpldatabasir.table_trigger_document.table_document_id. */ public Integer getTableDocumentId() { - return (Integer) get(1); + return (Integer) get(2); } /** @@ -59,7 +73,7 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpldatabasir.table_trigger_document.database_document_id. */ public void setDatabaseDocumentId(Integer value) { - set(2, value); + set(3, value); } /** @@ -67,49 +81,49 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpldatabasir.table_trigger_document.database_document_id. */ public Integer getDatabaseDocumentId() { - return (Integer) get(2); + return (Integer) get(3); } /** * Setter for databasir.table_trigger_document.timing. */ public void setTiming(String value) { - set(3, value); + set(4, value); } /** * Getter for databasir.table_trigger_document.timing. */ public String getTiming() { - return (String) get(3); + return (String) get(4); } /** * Setter for databasir.table_trigger_document.manipulation. */ public void setManipulation(String value) { - set(4, value); + set(5, value); } /** * Getter for databasir.table_trigger_document.manipulation. */ public String getManipulation() { - return (String) get(4); + return (String) get(5); } /** * Setter for databasir.table_trigger_document.statement. */ public void setStatement(String value) { - set(5, value); + set(6, value); } /** * Getter for databasir.table_trigger_document.statement. */ public String getStatement() { - return (String) get(5); + return (String) get(6); } /** @@ -117,7 +131,7 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpldatabasir.table_trigger_document.trigger_create_at. */ public void setTriggerCreateAt(String value) { - set(6, value); + set(7, value); } /** @@ -125,21 +139,21 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpldatabasir.table_trigger_document.trigger_create_at. */ public String getTriggerCreateAt() { - return (String) get(6); + return (String) get(7); } /** * Setter for databasir.table_trigger_document.create_at. */ public void setCreateAt(LocalDateTime value) { - set(7, value); + set(8, value); } /** * Getter for databasir.table_trigger_document.create_at. */ public LocalDateTime getCreateAt() { - return (LocalDateTime) get(7); + return (LocalDateTime) get(8); } // ------------------------------------------------------------------------- @@ -152,17 +166,17 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl fieldsRow() { - return (Row8) super.fieldsRow(); + public Row9 fieldsRow() { + return (Row9) super.fieldsRow(); } @Override - public Row8 valuesRow() { - return (Row8) super.valuesRow(); + public Row9 valuesRow() { + return (Row9) super.valuesRow(); } @Override @@ -171,37 +185,42 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl field2() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID; + public Field field2() { + return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.NAME; } @Override public Field field3() { + return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID; + } + + @Override + public Field field4() { return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID; } @Override - public Field field4() { + public Field field5() { return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TIMING; } @Override - public Field field5() { + public Field field6() { return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.MANIPULATION; } @Override - public Field field6() { + public Field field7() { return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.STATEMENT; } @Override - public Field field7() { + public Field field8() { return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TRIGGER_CREATE_AT; } @Override - public Field field8() { + public Field field9() { return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.CREATE_AT; } @@ -211,37 +230,42 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl triggers = new ArrayList<>(); while (results.next()) { - String name = results.getString("TRIGGER_NAME"); + String name = Objects.requireNonNullElse(results.getString("TRIGGER_NAME"), ""); String statement = results.getString("ACTION_STATEMENT"); String timing = results.getString("ACTION_TIMING"); String manipulation = results.getString("EVENT_MANIPULATION"); diff --git a/meta/src/main/java/com/databasir/core/meta/provider/postgresql/PostgresqlTriggerMetaProvider.java b/meta/src/main/java/com/databasir/core/meta/provider/postgresql/PostgresqlTriggerMetaProvider.java index 6d2c2cc..9ffe00b 100644 --- a/meta/src/main/java/com/databasir/core/meta/provider/postgresql/PostgresqlTriggerMetaProvider.java +++ b/meta/src/main/java/com/databasir/core/meta/provider/postgresql/PostgresqlTriggerMetaProvider.java @@ -12,6 +12,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; @Slf4j public class PostgresqlTriggerMetaProvider implements TriggerMetaProvider { @@ -37,7 +38,7 @@ public class PostgresqlTriggerMetaProvider implements TriggerMetaProvider { ResultSet results = preparedStatement.executeQuery(); List triggers = new ArrayList<>(); while (results.next()) { - String name = results.getString("name"); + String name = Objects.requireNonNullElse(results.getString("name"), ""); String statement = results.getString("statement"); String timing = results.getString("timing"); String manipulation = results.getString("manipulation"); diff --git a/meta/src/main/java/com/databasir/core/meta/provider/sqlserver/SqlServerTriggerMetaProvider.java b/meta/src/main/java/com/databasir/core/meta/provider/sqlserver/SqlServerTriggerMetaProvider.java index 6703f82..f2734e4 100644 --- a/meta/src/main/java/com/databasir/core/meta/provider/sqlserver/SqlServerTriggerMetaProvider.java +++ b/meta/src/main/java/com/databasir/core/meta/provider/sqlserver/SqlServerTriggerMetaProvider.java @@ -11,6 +11,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import java.util.Objects; @Slf4j public class SqlServerTriggerMetaProvider implements TriggerMetaProvider { @@ -56,7 +57,7 @@ public class SqlServerTriggerMetaProvider implements TriggerMetaProvider { preparedStatement.setString(2, condition.getTableName()); ResultSet resultSet = preparedStatement.executeQuery(); while (resultSet.next()) { - String triggerName = resultSet.getString("trigger_name"); + String triggerName = Objects.requireNonNullElse(resultSet.getString("trigger_name"), ""); String timing = resultSet.getString("timing"); String manipulation = resultSet.getString("manipulation"); String statement = resultSet.getString("statement");