7x31
/
databasir
mirror of https://github.com/vran-dev/databasir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: missing table trigger name (#187)

This commit is contained in:
vran 2022-05-17 13:37:19 +08:00 committed by GitHub
parent 34e4091f01
commit d39eda36f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 129 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocument.java
View File

@ -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<TableTriggerDocumentRecord>
*/
public final TableField<TableTriggerDocumentRecord, Integer> ID = createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>databasir.table_trigger_document.name</code>.
*/
public final TableField<TableTriggerDocumentRecord, String> NAME = createField(DSL.name("name"), SQLDataType.VARCHAR(1024).nullable(false).defaultValue(DSL.inline("", SQLDataType.VARCHAR)), this, "");
/**
* The column
* <code>databasir.table_trigger_document.table_document_id</code>.
@ -176,11 +181,11 @@ public class TableTriggerDocument extends TableImpl<TableTriggerDocumentRecord>
}
// -------------------------------------------------------------------------
// Row8 type methods
// Row9 type methods
// -------------------------------------------------------------------------
@Override
public Row8<Integer, Integer, Integer, String, String, String, String, LocalDateTime> fieldsRow() {
return (Row8) super.fieldsRow();
public Row9<Integer, String, Integer, Integer, String, String, String, String, LocalDateTime> fieldsRow() {
return (Row9) super.fieldsRow();
}
}

19
dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocumentPojo.java
View File

@ -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 <code>databasir.table_trigger_document.name</code>.
*/
public String getName() {
return this.name;
}
/**
* Setter for <code>databasir.table_trigger_document.name</code>.
*/
public void setName(String name) {
this.name = name;
}
/**
* Getter for
* <code>databasir.table_trigger_document.table_document_id</code>.
@ -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);

142
dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableTriggerDocumentRecord.java
View File

@ -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<TableTriggerDocumentRecord> implements Record8<Integer, Integer, Integer, String, String, String, String, LocalDateTime> {
public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTriggerDocumentRecord> implements Record9<Integer, String, Integer, Integer, String, String, String, String, LocalDateTime> {
private static final long serialVersionUID = 1L;
@ -38,12 +38,26 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
return (Integer) get(0);
}
/**
* Setter for <code>databasir.table_trigger_document.name</code>.
*/
public void setName(String value) {
set(1, value);
}
/**
* Getter for <code>databasir.table_trigger_document.name</code>.
*/
public String getName() {
return (String) get(1);
}
/**
* Setter for
* <code>databasir.table_trigger_document.table_document_id</code>.
*/
public void setTableDocumentId(Integer value) {
set(1, value);
set(2, value);
}
/**
@ -51,7 +65,7 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
* <code>databasir.table_trigger_document.table_document_id</code>.
*/
public Integer getTableDocumentId() {
return (Integer) get(1);
return (Integer) get(2);
}
/**
@ -59,7 +73,7 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
* <code>databasir.table_trigger_document.database_document_id</code>.
*/
public void setDatabaseDocumentId(Integer value) {
set(2, value);
set(3, value);
}
/**
@ -67,49 +81,49 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
* <code>databasir.table_trigger_document.database_document_id</code>.
*/
public Integer getDatabaseDocumentId() {
return (Integer) get(2);
return (Integer) get(3);
}
/**
* Setter for <code>databasir.table_trigger_document.timing</code>.
*/
public void setTiming(String value) {
set(3, value);
set(4, value);
}
/**
* Getter for <code>databasir.table_trigger_document.timing</code>.
*/
public String getTiming() {
return (String) get(3);
return (String) get(4);
}
/**
* Setter for <code>databasir.table_trigger_document.manipulation</code>.
*/
public void setManipulation(String value) {
set(4, value);
set(5, value);
}
/**
* Getter for <code>databasir.table_trigger_document.manipulation</code>.
*/
public String getManipulation() {
return (String) get(4);
return (String) get(5);
}
/**
* Setter for <code>databasir.table_trigger_document.statement</code>.
*/
public void setStatement(String value) {
set(5, value);
set(6, value);
}
/**
* Getter for <code>databasir.table_trigger_document.statement</code>.
*/
public String getStatement() {
return (String) get(5);
return (String) get(6);
}
/**
@ -117,7 +131,7 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
* <code>databasir.table_trigger_document.trigger_create_at</code>.
*/
public void setTriggerCreateAt(String value) {
set(6, value);
set(7, value);
}
/**
@ -125,21 +139,21 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
* <code>databasir.table_trigger_document.trigger_create_at</code>.
*/
public String getTriggerCreateAt() {
return (String) get(6);
return (String) get(7);
}
/**
* Setter for <code>databasir.table_trigger_document.create_at</code>.
*/
public void setCreateAt(LocalDateTime value) {
set(7, value);
set(8, value);
}
/**
* Getter for <code>databasir.table_trigger_document.create_at</code>.
*/
public LocalDateTime getCreateAt() {
return (LocalDateTime) get(7);
return (LocalDateTime) get(8);
}
// -------------------------------------------------------------------------
@ -152,17 +166,17 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
}
// -------------------------------------------------------------------------
// Record8 type implementation
// Record9 type implementation
// -------------------------------------------------------------------------
@Override
public Row8<Integer, Integer, Integer, String, String, String, String, LocalDateTime> fieldsRow() {
return (Row8) super.fieldsRow();
public Row9<Integer, String, Integer, Integer, String, String, String, String, LocalDateTime> fieldsRow() {
return (Row9) super.fieldsRow();
}
@Override
public Row8<Integer, Integer, Integer, String, String, String, String, LocalDateTime> valuesRow() {
return (Row8) super.valuesRow();
public Row9<Integer, String, Integer, Integer, String, String, String, String, LocalDateTime> valuesRow() {
return (Row9) super.valuesRow();
}
@Override
@ -171,37 +185,42 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
}
@Override
public Field<Integer> field2() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID;
public Field<String> field2() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.NAME;
}
@Override
public Field<Integer> field3() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID;
}
@Override
public Field<Integer> field4() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID;
}
@Override
public Field<String> field4() {
public Field<String> field5() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TIMING;
}
@Override
public Field<String> field5() {
public Field<String> field6() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.MANIPULATION;
}
@Override
public Field<String> field6() {
public Field<String> field7() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.STATEMENT;
}
@Override
public Field<String> field7() {
public Field<String> field8() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TRIGGER_CREATE_AT;
}
@Override
public Field<LocalDateTime> field8() {
public Field<LocalDateTime> field9() {
return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.CREATE_AT;
}
@ -211,37 +230,42 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
}
@Override
public Integer component2() {
return getTableDocumentId();
public String component2() {
return getName();
}
@Override
public Integer component3() {
return getTableDocumentId();
}
@Override
public Integer component4() {
return getDatabaseDocumentId();
}
@Override
public String component4() {
public String component5() {
return getTiming();
}
@Override
public String component5() {
public String component6() {
return getManipulation();
}
@Override
public String component6() {
public String component7() {
return getStatement();
}
@Override
public String component7() {
public String component8() {
return getTriggerCreateAt();
}
@Override
public LocalDateTime component8() {
public LocalDateTime component9() {
return getCreateAt();
}
@ -251,37 +275,42 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
}
@Override
public Integer value2() {
return getTableDocumentId();
public String value2() {
return getName();
}
@Override
public Integer value3() {
return getTableDocumentId();
}
@Override
public Integer value4() {
return getDatabaseDocumentId();
}
@Override
public String value4() {
public String value5() {
return getTiming();
}
@Override
public String value5() {
public String value6() {
return getManipulation();
}
@Override
public String value6() {
public String value7() {
return getStatement();
}
@Override
public String value7() {
public String value8() {
return getTriggerCreateAt();
}
@Override
public LocalDateTime value8() {
public LocalDateTime value9() {
return getCreateAt();
}
@ -292,49 +321,55 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
}
@Override
public TableTriggerDocumentRecord value2(Integer value) {
setTableDocumentId(value);
public TableTriggerDocumentRecord value2(String value) {
setName(value);
return this;
}
@Override
public TableTriggerDocumentRecord value3(Integer value) {
setTableDocumentId(value);
return this;
}
@Override
public TableTriggerDocumentRecord value4(Integer value) {
setDatabaseDocumentId(value);
return this;
}
@Override
public TableTriggerDocumentRecord value4(String value) {
public TableTriggerDocumentRecord value5(String value) {
setTiming(value);
return this;
}
@Override
public TableTriggerDocumentRecord value5(String value) {
public TableTriggerDocumentRecord value6(String value) {
setManipulation(value);
return this;
}
@Override
public TableTriggerDocumentRecord value6(String value) {
public TableTriggerDocumentRecord value7(String value) {
setStatement(value);
return this;
}
@Override
public TableTriggerDocumentRecord value7(String value) {
public TableTriggerDocumentRecord value8(String value) {
setTriggerCreateAt(value);
return this;
}
@Override
public TableTriggerDocumentRecord value8(LocalDateTime value) {
public TableTriggerDocumentRecord value9(LocalDateTime value) {
setCreateAt(value);
return this;
}
@Override
public TableTriggerDocumentRecord values(Integer value1, Integer value2, Integer value3, String value4, String value5, String value6, String value7, LocalDateTime value8) {
public TableTriggerDocumentRecord values(Integer value1, String value2, Integer value3, Integer value4, String value5, String value6, String value7, String value8, LocalDateTime value9) {
value1(value1);
value2(value2);
value3(value3);
@ -343,6 +378,7 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
value6(value6);
value7(value7);
value8(value8);
value9(value9);
return this;
}
@ -360,10 +396,11 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
/**
* Create a detached, initialised TableTriggerDocumentRecord
*/
public TableTriggerDocumentRecord(Integer id, Integer tableDocumentId, Integer databaseDocumentId, String timing, String manipulation, String statement, String triggerCreateAt, LocalDateTime createAt) {
public TableTriggerDocumentRecord(Integer id, String name, Integer tableDocumentId, Integer databaseDocumentId, String timing, String manipulation, String statement, String triggerCreateAt, LocalDateTime createAt) {
super(TableTriggerDocument.TABLE_TRIGGER_DOCUMENT);
setId(id);
setName(name);
setTableDocumentId(tableDocumentId);
setDatabaseDocumentId(databaseDocumentId);
setTiming(timing);
@ -381,6 +418,7 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl<TableTrigger
if (value != null) {
setId(value.getId());
setName(value.getName());
setTableDocumentId(value.getTableDocumentId());
setDatabaseDocumentId(value.getDatabaseDocumentId());
setTiming(value.getTiming());

5
dao/src/main/resources/db/init/init.sql
View File

@ -142,7 +142,7 @@ CREATE TABLE IF NOT EXISTS table_document
database_document_id INT NOT NULL,
name TEXT NOT NULL,
type VARCHAR(255) NOT NULL,
comment VARCHAR(512) DEFAULT NULL,
comment TEXT DEFAULT NULL,
create_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
INDEX idx_database_document_id (database_document_id)
) CHARSET utf8mb4
@ -157,7 +157,7 @@ CREATE TABLE IF NOT EXISTS table_column_document
name TEXT NOT NULL,
type VARCHAR(255) NOT NULL,
data_type INT NOT NULL DEFAULT 99999,
comment VARCHAR(512) DEFAULT NULL,
comment TEXT DEFAULT NULL,
default_value VARCHAR(512) DEFAULT NULL,
size INT NOT NULL,
decimal_digits INT DEFAULT NULL,
@ -209,6 +209,7 @@ CREATE TABLE IF NOT EXISTS table_trigger_document
(
id INT PRIMARY KEY AUTO_INCREMENT,
name VARCHAR(1024) DEFAULT '' NOT NULL,
table_document_id INT NOT NULL,
database_document_id INT NOT NULL,
timing VARCHAR(64) NOT NULL,

2
dao/src/main/resources/db/migration/V1.4.3__trigger_name.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE table_trigger_document
ADD COLUMN name VARCHAR(1024) DEFAULT '' NOT NULL AFTER id;

3
meta/src/main/java/com/databasir/core/meta/provider/mysql/MysqlTableTriggerMetaProvider.java
View File

@ -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 MysqlTableTriggerMetaProvider implements TriggerMetaProvider {
@ -45,7 +46,7 @@ public class MysqlTableTriggerMetaProvider implements TriggerMetaProvider {
ResultSet results = preparedStatement.executeQuery();
List<TriggerMeta> 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");

3
meta/src/main/java/com/databasir/core/meta/provider/postgresql/PostgresqlTriggerMetaProvider.java
View File

@ -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<TriggerMeta> 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");

3
meta/src/main/java/com/databasir/core/meta/provider/sqlserver/SqlServerTriggerMetaProvider.java
View File

@ -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");