diff --git a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLines.java b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLines.java index dc01b24e..b1233362 100644 --- a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLines.java +++ b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLines.java @@ -19,7 +19,7 @@ import org.jooq.ForeignKey; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row8; +import org.jooq.Row7; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -76,11 +76,6 @@ public Class getRecordType() { */ public final TableField NETWORK_LINE_SYS_PERIOD = createField(DSL.name("network_line_sys_period"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"tstzrange\"").nullable(false).defaultValue(DSL.field("tstzrange(CURRENT_TIMESTAMP, NULL::timestamp with time zone)", org.jooq.impl.SQLDataType.OTHER)), this, "", new TimeRangeBinding()); - /** - * The column network.network_lines.network_line_jore4_id. - */ - public final TableField NETWORK_LINE_JORE4_ID = createField(DSL.name("network_line_jore4_id"), SQLDataType.UUID, this, ""); - /** * The column network.network_lines.network_line_type_of_line. */ @@ -180,11 +175,11 @@ public NetworkLines rename(Name name) { } // ------------------------------------------------------------------------- - // Row8 type methods + // Row7 type methods // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); } } diff --git a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLinesHistory.java b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLinesHistory.java index d4e93c35..4b35f0fd 100644 --- a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLinesHistory.java +++ b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLinesHistory.java @@ -15,7 +15,7 @@ import org.jooq.ForeignKey; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row8; +import org.jooq.Row7; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -71,11 +71,6 @@ public Class getRecordType() { */ public final TableField NETWORK_LINE_SYS_PERIOD = createField(DSL.name("network_line_sys_period"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"tstzrange\"").nullable(false), this, "", new TimeRangeBinding()); - /** - * The column network.network_lines_history.network_line_jore4_id. - */ - public final TableField NETWORK_LINE_JORE4_ID = createField(DSL.name("network_line_jore4_id"), SQLDataType.UUID, this, ""); - /** * The column network.network_lines_history.network_line_type_of_line. */ @@ -151,11 +146,11 @@ public NetworkLinesHistory rename(Name name) { } // ------------------------------------------------------------------------- - // Row8 type methods + // Row7 type methods // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); } } diff --git a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLinesWithHistory.java b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLinesWithHistory.java index dae9a7dc..a7f04150 100644 --- a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLinesWithHistory.java +++ b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/NetworkLinesWithHistory.java @@ -15,7 +15,7 @@ import org.jooq.ForeignKey; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row8; +import org.jooq.Row7; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -71,11 +71,6 @@ public Class getRecordType() { */ public final TableField NETWORK_LINE_SYS_PERIOD = createField(DSL.name("network_line_sys_period"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"tstzrange\""), this, "", new TimeRangeBinding()); - /** - * The column network.network_lines_with_history.network_line_jore4_id. - */ - public final TableField NETWORK_LINE_JORE4_ID = createField(DSL.name("network_line_jore4_id"), SQLDataType.UUID, this, ""); - /** * The column network.network_lines_with_history.network_line_type_of_line. */ @@ -91,7 +86,7 @@ private NetworkLinesWithHistory(Name alias, Table } private NetworkLinesWithHistory(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"network_lines_with_history\" as SELECT network_lines.network_line_id,\n network_lines.network_line_ext_id,\n network_lines.network_line_number,\n network_lines.infrastructure_network_type,\n network_lines.network_line_sys_period,\n network_lines.network_line_jore4_id,\n network_lines.network_line_type_of_line,\n network_lines.network_line_legacy_hsl_municipality_code\n FROM network.network_lines\nUNION ALL\n SELECT network_lines_history.network_line_id,\n network_lines_history.network_line_ext_id,\n network_lines_history.network_line_number,\n network_lines_history.infrastructure_network_type,\n network_lines_history.network_line_sys_period,\n network_lines_history.network_line_jore4_id,\n network_lines_history.network_line_type_of_line,\n network_lines_history.network_line_legacy_hsl_municipality_code\n FROM network.network_lines_history;")); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"network_lines_with_history\" as SELECT network_lines.network_line_id,\n network_lines.network_line_ext_id,\n network_lines.network_line_number,\n network_lines.infrastructure_network_type,\n network_lines.network_line_sys_period,\n network_lines.network_line_type_of_line,\n network_lines.network_line_legacy_hsl_municipality_code\n FROM network.network_lines\nUNION ALL\n SELECT network_lines_history.network_line_id,\n network_lines_history.network_line_ext_id,\n network_lines_history.network_line_number,\n network_lines_history.infrastructure_network_type,\n network_lines_history.network_line_sys_period,\n network_lines_history.network_line_type_of_line,\n network_lines_history.network_line_legacy_hsl_municipality_code\n FROM network.network_lines_history;")); } /** @@ -151,11 +146,11 @@ public NetworkLinesWithHistory rename(Name name) { } // ------------------------------------------------------------------------- - // Row8 type methods + // Row7 type methods // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); } } diff --git a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesHistoryRecord.java b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesHistoryRecord.java index b391f6f8..6d260df9 100644 --- a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesHistoryRecord.java +++ b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesHistoryRecord.java @@ -10,8 +10,8 @@ import java.util.UUID; import org.jooq.Field; -import org.jooq.Record8; -import org.jooq.Row8; +import org.jooq.Record7; +import org.jooq.Row7; import org.jooq.impl.TableRecordImpl; @@ -19,7 +19,7 @@ * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class NetworkLinesHistoryRecord extends TableRecordImpl implements Record8 { +public class NetworkLinesHistoryRecord extends TableRecordImpl implements Record7 { private static final long serialVersionUID = 1L; @@ -93,60 +93,46 @@ public TimeRange getNetworkLineSysPeriod() { return (TimeRange) get(4); } - /** - * Setter for network.network_lines_history.network_line_jore4_id. - */ - public void setNetworkLineJore4Id(UUID value) { - set(5, value); - } - - /** - * Getter for network.network_lines_history.network_line_jore4_id. - */ - public UUID getNetworkLineJore4Id() { - return (UUID) get(5); - } - /** * Setter for network.network_lines_history.network_line_type_of_line. */ public void setNetworkLineTypeOfLine(String value) { - set(6, value); + set(5, value); } /** * Getter for network.network_lines_history.network_line_type_of_line. */ public String getNetworkLineTypeOfLine() { - return (String) get(6); + return (String) get(5); } /** * Setter for network.network_lines_history.network_line_legacy_hsl_municipality_code. */ public void setNetworkLineLegacyHslMunicipalityCode(String value) { - set(7, value); + set(6, value); } /** * Getter for network.network_lines_history.network_line_legacy_hsl_municipality_code. */ public String getNetworkLineLegacyHslMunicipalityCode() { - return (String) get(7); + return (String) get(6); } // ------------------------------------------------------------------------- - // Record8 type implementation + // Record7 type implementation // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); } @Override - public Row8 valuesRow() { - return (Row8) super.valuesRow(); + public Row7 valuesRow() { + return (Row7) super.valuesRow(); } @Override @@ -175,17 +161,12 @@ public Field field5() { } @Override - public Field field6() { - return NetworkLinesHistory.NETWORK_LINES_HISTORY.NETWORK_LINE_JORE4_ID; - } - - @Override - public Field field7() { + public Field field6() { return NetworkLinesHistory.NETWORK_LINES_HISTORY.NETWORK_LINE_TYPE_OF_LINE; } @Override - public Field field8() { + public Field field7() { return NetworkLinesHistory.NETWORK_LINES_HISTORY.NETWORK_LINE_LEGACY_HSL_MUNICIPALITY_CODE; } @@ -215,17 +196,12 @@ public TimeRange component5() { } @Override - public UUID component6() { - return getNetworkLineJore4Id(); - } - - @Override - public String component7() { + public String component6() { return getNetworkLineTypeOfLine(); } @Override - public String component8() { + public String component7() { return getNetworkLineLegacyHslMunicipalityCode(); } @@ -255,17 +231,12 @@ public TimeRange value5() { } @Override - public UUID value6() { - return getNetworkLineJore4Id(); - } - - @Override - public String value7() { + public String value6() { return getNetworkLineTypeOfLine(); } @Override - public String value8() { + public String value7() { return getNetworkLineLegacyHslMunicipalityCode(); } @@ -300,25 +271,19 @@ public NetworkLinesHistoryRecord value5(TimeRange value) { } @Override - public NetworkLinesHistoryRecord value6(UUID value) { - setNetworkLineJore4Id(value); - return this; - } - - @Override - public NetworkLinesHistoryRecord value7(String value) { + public NetworkLinesHistoryRecord value6(String value) { setNetworkLineTypeOfLine(value); return this; } @Override - public NetworkLinesHistoryRecord value8(String value) { + public NetworkLinesHistoryRecord value7(String value) { setNetworkLineLegacyHslMunicipalityCode(value); return this; } @Override - public NetworkLinesHistoryRecord values(UUID value1, String value2, String value3, String value4, TimeRange value5, UUID value6, String value7, String value8) { + public NetworkLinesHistoryRecord values(UUID value1, String value2, String value3, String value4, TimeRange value5, String value6, String value7) { value1(value1); value2(value2); value3(value3); @@ -326,7 +291,6 @@ public NetworkLinesHistoryRecord values(UUID value1, String value2, String value value5(value5); value6(value6); value7(value7); - value8(value8); return this; } @@ -344,7 +308,7 @@ public NetworkLinesHistoryRecord() { /** * Create a detached, initialised NetworkLinesHistoryRecord */ - public NetworkLinesHistoryRecord(UUID networkLineId, String networkLineExtId, String networkLineNumber, String infrastructureNetworkType, TimeRange networkLineSysPeriod, UUID networkLineJore4Id, String networkLineTypeOfLine, String networkLineLegacyHslMunicipalityCode) { + public NetworkLinesHistoryRecord(UUID networkLineId, String networkLineExtId, String networkLineNumber, String infrastructureNetworkType, TimeRange networkLineSysPeriod, String networkLineTypeOfLine, String networkLineLegacyHslMunicipalityCode) { super(NetworkLinesHistory.NETWORK_LINES_HISTORY); setNetworkLineId(networkLineId); @@ -352,7 +316,6 @@ public NetworkLinesHistoryRecord(UUID networkLineId, String networkLineExtId, St setNetworkLineNumber(networkLineNumber); setInfrastructureNetworkType(infrastructureNetworkType); setNetworkLineSysPeriod(networkLineSysPeriod); - setNetworkLineJore4Id(networkLineJore4Id); setNetworkLineTypeOfLine(networkLineTypeOfLine); setNetworkLineLegacyHslMunicipalityCode(networkLineLegacyHslMunicipalityCode); } diff --git a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesRecord.java b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesRecord.java index a3bb0da3..8258adf2 100644 --- a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesRecord.java +++ b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesRecord.java @@ -11,8 +11,8 @@ import org.jooq.Field; import org.jooq.Record1; -import org.jooq.Record8; -import org.jooq.Row8; +import org.jooq.Record7; +import org.jooq.Row7; import org.jooq.impl.UpdatableRecordImpl; @@ -20,7 +20,7 @@ * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class NetworkLinesRecord extends UpdatableRecordImpl implements Record8 { +public class NetworkLinesRecord extends UpdatableRecordImpl implements Record7 { private static final long serialVersionUID = 1L; @@ -94,46 +94,32 @@ public TimeRange getNetworkLineSysPeriod() { return (TimeRange) get(4); } - /** - * Setter for network.network_lines.network_line_jore4_id. - */ - public void setNetworkLineJore4Id(UUID value) { - set(5, value); - } - - /** - * Getter for network.network_lines.network_line_jore4_id. - */ - public UUID getNetworkLineJore4Id() { - return (UUID) get(5); - } - /** * Setter for network.network_lines.network_line_type_of_line. */ public void setNetworkLineTypeOfLine(String value) { - set(6, value); + set(5, value); } /** * Getter for network.network_lines.network_line_type_of_line. */ public String getNetworkLineTypeOfLine() { - return (String) get(6); + return (String) get(5); } /** * Setter for network.network_lines.network_line_legacy_hsl_municipality_code. */ public void setNetworkLineLegacyHslMunicipalityCode(String value) { - set(7, value); + set(6, value); } /** * Getter for network.network_lines.network_line_legacy_hsl_municipality_code. */ public String getNetworkLineLegacyHslMunicipalityCode() { - return (String) get(7); + return (String) get(6); } // ------------------------------------------------------------------------- @@ -146,17 +132,17 @@ public Record1 key() { } // ------------------------------------------------------------------------- - // Record8 type implementation + // Record7 type implementation // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); } @Override - public Row8 valuesRow() { - return (Row8) super.valuesRow(); + public Row7 valuesRow() { + return (Row7) super.valuesRow(); } @Override @@ -185,17 +171,12 @@ public Field field5() { } @Override - public Field field6() { - return NetworkLines.NETWORK_LINES.NETWORK_LINE_JORE4_ID; - } - - @Override - public Field field7() { + public Field field6() { return NetworkLines.NETWORK_LINES.NETWORK_LINE_TYPE_OF_LINE; } @Override - public Field field8() { + public Field field7() { return NetworkLines.NETWORK_LINES.NETWORK_LINE_LEGACY_HSL_MUNICIPALITY_CODE; } @@ -225,17 +206,12 @@ public TimeRange component5() { } @Override - public UUID component6() { - return getNetworkLineJore4Id(); - } - - @Override - public String component7() { + public String component6() { return getNetworkLineTypeOfLine(); } @Override - public String component8() { + public String component7() { return getNetworkLineLegacyHslMunicipalityCode(); } @@ -265,17 +241,12 @@ public TimeRange value5() { } @Override - public UUID value6() { - return getNetworkLineJore4Id(); - } - - @Override - public String value7() { + public String value6() { return getNetworkLineTypeOfLine(); } @Override - public String value8() { + public String value7() { return getNetworkLineLegacyHslMunicipalityCode(); } @@ -310,25 +281,19 @@ public NetworkLinesRecord value5(TimeRange value) { } @Override - public NetworkLinesRecord value6(UUID value) { - setNetworkLineJore4Id(value); - return this; - } - - @Override - public NetworkLinesRecord value7(String value) { + public NetworkLinesRecord value6(String value) { setNetworkLineTypeOfLine(value); return this; } @Override - public NetworkLinesRecord value8(String value) { + public NetworkLinesRecord value7(String value) { setNetworkLineLegacyHslMunicipalityCode(value); return this; } @Override - public NetworkLinesRecord values(UUID value1, String value2, String value3, String value4, TimeRange value5, UUID value6, String value7, String value8) { + public NetworkLinesRecord values(UUID value1, String value2, String value3, String value4, TimeRange value5, String value6, String value7) { value1(value1); value2(value2); value3(value3); @@ -336,7 +301,6 @@ public NetworkLinesRecord values(UUID value1, String value2, String value3, Stri value5(value5); value6(value6); value7(value7); - value8(value8); return this; } @@ -354,7 +318,7 @@ public NetworkLinesRecord() { /** * Create a detached, initialised NetworkLinesRecord */ - public NetworkLinesRecord(UUID networkLineId, String networkLineExtId, String networkLineNumber, String infrastructureNetworkType, TimeRange networkLineSysPeriod, UUID networkLineJore4Id, String networkLineTypeOfLine, String networkLineLegacyHslMunicipalityCode) { + public NetworkLinesRecord(UUID networkLineId, String networkLineExtId, String networkLineNumber, String infrastructureNetworkType, TimeRange networkLineSysPeriod, String networkLineTypeOfLine, String networkLineLegacyHslMunicipalityCode) { super(NetworkLines.NETWORK_LINES); setNetworkLineId(networkLineId); @@ -362,7 +326,6 @@ public NetworkLinesRecord(UUID networkLineId, String networkLineExtId, String ne setNetworkLineNumber(networkLineNumber); setInfrastructureNetworkType(infrastructureNetworkType); setNetworkLineSysPeriod(networkLineSysPeriod); - setNetworkLineJore4Id(networkLineJore4Id); setNetworkLineTypeOfLine(networkLineTypeOfLine); setNetworkLineLegacyHslMunicipalityCode(networkLineLegacyHslMunicipalityCode); } diff --git a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesWithHistoryRecord.java b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesWithHistoryRecord.java index 13ced7ac..3ec20c6e 100644 --- a/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesWithHistoryRecord.java +++ b/src/main/generated-java/jooq/fi/hsl/jore/importer/jooq/network/tables/records/NetworkLinesWithHistoryRecord.java @@ -10,8 +10,8 @@ import java.util.UUID; import org.jooq.Field; -import org.jooq.Record8; -import org.jooq.Row8; +import org.jooq.Record7; +import org.jooq.Row7; import org.jooq.impl.TableRecordImpl; @@ -19,7 +19,7 @@ * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class NetworkLinesWithHistoryRecord extends TableRecordImpl implements Record8 { +public class NetworkLinesWithHistoryRecord extends TableRecordImpl implements Record7 { private static final long serialVersionUID = 1L; @@ -93,60 +93,46 @@ public TimeRange getNetworkLineSysPeriod() { return (TimeRange) get(4); } - /** - * Setter for network.network_lines_with_history.network_line_jore4_id. - */ - public void setNetworkLineJore4Id(UUID value) { - set(5, value); - } - - /** - * Getter for network.network_lines_with_history.network_line_jore4_id. - */ - public UUID getNetworkLineJore4Id() { - return (UUID) get(5); - } - /** * Setter for network.network_lines_with_history.network_line_type_of_line. */ public void setNetworkLineTypeOfLine(String value) { - set(6, value); + set(5, value); } /** * Getter for network.network_lines_with_history.network_line_type_of_line. */ public String getNetworkLineTypeOfLine() { - return (String) get(6); + return (String) get(5); } /** * Setter for network.network_lines_with_history.network_line_legacy_hsl_municipality_code. */ public void setNetworkLineLegacyHslMunicipalityCode(String value) { - set(7, value); + set(6, value); } /** * Getter for network.network_lines_with_history.network_line_legacy_hsl_municipality_code. */ public String getNetworkLineLegacyHslMunicipalityCode() { - return (String) get(7); + return (String) get(6); } // ------------------------------------------------------------------------- - // Record8 type implementation + // Record7 type implementation // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); } @Override - public Row8 valuesRow() { - return (Row8) super.valuesRow(); + public Row7 valuesRow() { + return (Row7) super.valuesRow(); } @Override @@ -175,17 +161,12 @@ public Field field5() { } @Override - public Field field6() { - return NetworkLinesWithHistory.NETWORK_LINES_WITH_HISTORY.NETWORK_LINE_JORE4_ID; - } - - @Override - public Field field7() { + public Field field6() { return NetworkLinesWithHistory.NETWORK_LINES_WITH_HISTORY.NETWORK_LINE_TYPE_OF_LINE; } @Override - public Field field8() { + public Field field7() { return NetworkLinesWithHistory.NETWORK_LINES_WITH_HISTORY.NETWORK_LINE_LEGACY_HSL_MUNICIPALITY_CODE; } @@ -215,17 +196,12 @@ public TimeRange component5() { } @Override - public UUID component6() { - return getNetworkLineJore4Id(); - } - - @Override - public String component7() { + public String component6() { return getNetworkLineTypeOfLine(); } @Override - public String component8() { + public String component7() { return getNetworkLineLegacyHslMunicipalityCode(); } @@ -255,17 +231,12 @@ public TimeRange value5() { } @Override - public UUID value6() { - return getNetworkLineJore4Id(); - } - - @Override - public String value7() { + public String value6() { return getNetworkLineTypeOfLine(); } @Override - public String value8() { + public String value7() { return getNetworkLineLegacyHslMunicipalityCode(); } @@ -300,25 +271,19 @@ public NetworkLinesWithHistoryRecord value5(TimeRange value) { } @Override - public NetworkLinesWithHistoryRecord value6(UUID value) { - setNetworkLineJore4Id(value); - return this; - } - - @Override - public NetworkLinesWithHistoryRecord value7(String value) { + public NetworkLinesWithHistoryRecord value6(String value) { setNetworkLineTypeOfLine(value); return this; } @Override - public NetworkLinesWithHistoryRecord value8(String value) { + public NetworkLinesWithHistoryRecord value7(String value) { setNetworkLineLegacyHslMunicipalityCode(value); return this; } @Override - public NetworkLinesWithHistoryRecord values(UUID value1, String value2, String value3, String value4, TimeRange value5, UUID value6, String value7, String value8) { + public NetworkLinesWithHistoryRecord values(UUID value1, String value2, String value3, String value4, TimeRange value5, String value6, String value7) { value1(value1); value2(value2); value3(value3); @@ -326,7 +291,6 @@ public NetworkLinesWithHistoryRecord values(UUID value1, String value2, String v value5(value5); value6(value6); value7(value7); - value8(value8); return this; } @@ -344,7 +308,7 @@ public NetworkLinesWithHistoryRecord() { /** * Create a detached, initialised NetworkLinesWithHistoryRecord */ - public NetworkLinesWithHistoryRecord(UUID networkLineId, String networkLineExtId, String networkLineNumber, String infrastructureNetworkType, TimeRange networkLineSysPeriod, UUID networkLineJore4Id, String networkLineTypeOfLine, String networkLineLegacyHslMunicipalityCode) { + public NetworkLinesWithHistoryRecord(UUID networkLineId, String networkLineExtId, String networkLineNumber, String infrastructureNetworkType, TimeRange networkLineSysPeriod, String networkLineTypeOfLine, String networkLineLegacyHslMunicipalityCode) { super(NetworkLinesWithHistory.NETWORK_LINES_WITH_HISTORY); setNetworkLineId(networkLineId); @@ -352,7 +316,6 @@ public NetworkLinesWithHistoryRecord(UUID networkLineId, String networkLineExtId setNetworkLineNumber(networkLineNumber); setInfrastructureNetworkType(infrastructureNetworkType); setNetworkLineSysPeriod(networkLineSysPeriod); - setNetworkLineJore4Id(networkLineJore4Id); setNetworkLineTypeOfLine(networkLineTypeOfLine); setNetworkLineLegacyHslMunicipalityCode(networkLineLegacyHslMunicipalityCode); } diff --git a/src/main/resources/db/migration/V34__remove_jore4_id_from_lines.sql b/src/main/resources/db/migration/V34__remove_jore4_id_from_lines.sql new file mode 100644 index 00000000..e6ac5f55 --- /dev/null +++ b/src/main/resources/db/migration/V34__remove_jore4_id_from_lines.sql @@ -0,0 +1,11 @@ +DROP VIEW network.network_lines_with_history; + +ALTER TABLE network.network_lines DROP COLUMN network_line_jore4_id; +ALTER TABLE network.network_lines_history DROP COLUMN network_line_jore4_id; + +CREATE VIEW network.network_lines_with_history AS +SELECT * +FROM network.network_lines +UNION ALL +SELECT * +FROM network.network_lines_history;