From 3f009f03b91f58c4abb2d83410f46f9ad55d568d Mon Sep 17 00:00:00 2001 From: Max Chesterfield Date: Tue, 29 Jul 2025 15:24:01 +1000 Subject: [PATCH 1/2] [DEV-2354] Added `SqlTable` as a base class for `SqliteTable` in prep for Postgres support Signed-off-by: Max Chesterfield --- changelog.md | 3 +- src/zepben/ewb/__init__.py | 2 +- src/zepben/ewb/database/sql/__init__.py | 4 + .../database/{sqlite/tables => sql}/column.py | 2 +- src/zepben/ewb/database/sql/sql_table.py | 142 ++++++++++++++++++ .../table_asset_organisation_roles_assets.py | 2 +- .../table_assets_power_system_resources.py | 2 +- .../table_battery_units_battery_controls.py | 2 +- .../table_circuits_substations.py | 2 +- .../associations/table_circuits_terminals.py | 2 +- ..._customer_agreements_pricing_structures.py | 2 +- .../table_end_devices_end_device_functions.py | 2 +- .../table_equipment_equipment_containers.py | 2 +- ...able_equipment_operational_restrictions.py | 2 +- .../table_equipment_usage_points.py | 2 +- .../associations/table_loops_substations.py | 2 +- .../table_pricing_structures_tariffs.py | 2 +- ...tion_relay_functions_protected_switches.py | 2 +- ...able_protection_relay_functions_sensors.py | 2 +- ...elay_schemes_protection_relay_functions.py | 2 +- .../table_usage_points_end_devices.py | 2 +- .../assetinfo/table_reclose_delays.py | 2 +- .../iec61968/assetinfo/table_relay_info.py | 2 +- .../table_pan_demand_response_functions.py | 2 +- .../iec61970/base/feeder/table_lv_feeders.py | 2 +- .../base/protection/table_distance_relays.py | 2 +- ...le_protection_relay_function_thresholds.py | 2 +- ...e_protection_relay_function_time_limits.py | 2 +- .../table_protection_relay_functions.py | 2 +- .../table_protection_relay_schemes.py | 2 +- .../table_protection_relay_systems.py | 2 +- .../base/wires/table_battery_controls.py | 2 +- .../table_power_transformer_end_ratings.py | 2 +- .../iec61968/assetinfo/table_no_load_tests.py | 2 +- .../assetinfo/table_open_circuit_tests.py | 2 +- .../assetinfo/table_short_circuit_tests.py | 2 +- .../assetinfo/table_shunt_compensator_info.py | 2 +- .../iec61968/assetinfo/table_switch_info.py | 2 +- .../assetinfo/table_transformer_end_info.py | 2 +- .../assetinfo/table_transformer_tank_info.py | 2 +- .../assetinfo/table_transformer_test.py | 2 +- .../iec61968/assetinfo/table_wire_info.py | 2 +- .../tables/iec61968/assets/table_assets.py | 2 +- .../iec61968/assets/table_streetlights.py | 2 +- .../tables/iec61968/common/table_documents.py | 2 +- .../common/table_location_street_addresses.py | 2 +- .../common/table_organisation_roles.py | 2 +- .../iec61968/common/table_position_points.py | 2 +- .../iec61968/common/table_street_addresses.py | 2 +- .../iec61968/common/table_town_details.py | 2 +- .../customers/table_customer_agreements.py | 2 +- .../iec61968/customers/table_customers.py | 2 +- .../table_current_transformer_info.py | 2 +- .../table_potential_transformer_info.py | 2 +- .../infiec61968/infassets/table_poles.py | 2 +- .../metering/table_end_device_functions.py | 2 +- .../iec61968/metering/table_end_devices.py | 2 +- .../iec61968/metering/table_usage_points.py | 2 +- .../table_auxiliary_equipment.py | 2 +- .../table_current_transformers.py | 2 +- .../table_potential_transformers.py | 2 +- .../iec61970/base/core/table_base_voltages.py | 2 +- .../base/core/table_conducting_equipment.py | 2 +- .../iec61970/base/core/table_curve_data.py | 2 +- .../iec61970/base/core/table_equipment.py | 2 +- .../iec61970/base/core/table_feeders.py | 2 +- .../base/core/table_identified_objects.py | 2 +- .../iec61970/base/core/table_name_types.py | 2 +- .../tables/iec61970/base/core/table_names.py | 2 +- .../base/core/table_power_system_resources.py | 2 +- .../core/table_sub_geographical_regions.py | 2 +- .../iec61970/base/core/table_substations.py | 2 +- .../iec61970/base/core/table_terminals.py | 2 +- .../table_diagram_object_points.py | 2 +- .../diagramlayout/table_diagram_objects.py | 2 +- .../base/diagramlayout/table_diagrams.py | 2 +- .../equivalents/table_equivalent_branches.py | 2 +- .../production/table_battery_units.py | 2 +- .../table_power_electronics_units.py | 2 +- .../iec61970/base/meas/table_analogs.py | 2 +- .../iec61970/base/meas/table_controls.py | 2 +- .../iec61970/base/meas/table_measurements.py | 2 +- .../base/protection/table_current_relays.py | 2 +- .../base/scada/table_remote_controls.py | 2 +- .../base/scada/table_remote_sources.py | 2 +- .../base/wires/table_ac_line_segments.py | 2 +- .../iec61970/base/wires/table_breakers.py | 2 +- .../iec61970/base/wires/table_clamps.py | 2 +- .../iec61970/base/wires/table_conductors.py | 2 +- .../tables/iec61970/base/wires/table_cuts.py | 2 +- .../wires/table_earth_fault_compensators.py | 2 +- .../wires/table_energy_consumer_phases.py | 2 +- .../base/wires/table_energy_consumers.py | 2 +- .../base/wires/table_energy_source_phases.py | 2 +- .../base/wires/table_energy_sources.py | 2 +- .../tables/iec61970/base/wires/table_fuses.py | 2 +- .../base/wires/table_grounding_impedances.py | 2 +- .../wires/table_linear_shunt_compensators.py | 2 +- .../table_per_length_sequence_impedances.py | 2 +- .../base/wires/table_petersen_coils.py | 2 +- .../base/wires/table_phase_impedance_data.py | 2 +- ...ble_power_electronics_connection_phases.py | 2 +- .../table_power_electronics_connections.py | 2 +- .../wires/table_power_transformer_ends.py | 2 +- .../base/wires/table_power_transformers.py | 2 +- .../base/wires/table_protected_switches.py | 2 +- .../base/wires/table_ratio_tap_changers.py | 2 +- .../base/wires/table_regulating_cond_eq.py | 2 +- .../base/wires/table_regulating_controls.py | 2 +- .../base/wires/table_rotating_machines.py | 2 +- .../base/wires/table_series_compensators.py | 2 +- .../base/wires/table_shunt_compensators.py | 2 +- .../wires/table_static_var_compensator.py | 2 +- .../iec61970/base/wires/table_switches.py | 2 +- .../base/wires/table_synchronous_machines.py | 2 +- .../base/wires/table_tap_changer_controls.py | 2 +- .../iec61970/base/wires/table_tap_changers.py | 2 +- .../base/wires/table_transformer_ends.py | 2 +- .../table_transformer_star_impedances.py | 2 +- .../infiec61970/feeder/table_circuits.py | 2 +- .../database/sqlite/tables/sqlite_table.py | 139 +++-------------- .../tables/table_metadata_data_sources.py | 2 +- .../database/sqlite/tables/table_version.py | 3 +- .../sqlite/tables/test_sqlitetable.py | 2 +- 124 files changed, 290 insertions(+), 239 deletions(-) create mode 100644 src/zepben/ewb/database/sql/__init__.py rename src/zepben/ewb/database/{sqlite/tables => sql}/column.py (96%) create mode 100644 src/zepben/ewb/database/sql/sql_table.py diff --git a/changelog.md b/changelog.md index 3f6ae7a67..8cf1a2be6 100644 --- a/changelog.md +++ b/changelog.md @@ -87,9 +87,10 @@ * `CURRENT_NETWORK_STATE` -> `CURRENT`. * The `zepben.auth` dependency has been incorporated into the SDK with the following package change: * `zepben.auth` -> `zepben.ewb.auth`. You can also import these directly from `zepben.ewb`. +* `SqliteTable` now subclasses `SqlTable`. ### New Features -* None. +* Created a new `SqlTable` that doesn't support creating schema creation statements by default. ### Enhancements * `EquipmentTreeBuilder` will now calculate `leaves` when specified to do so. diff --git a/src/zepben/ewb/__init__.py b/src/zepben/ewb/__init__.py index 1eaf4055b..5647c3e17 100644 --- a/src/zepben/ewb/__init__.py +++ b/src/zepben/ewb/__init__.py @@ -353,7 +353,7 @@ from zepben.ewb.database.paths.database_type import * from zepben.ewb.database.paths.ewb_data_file_paths import * -from zepben.ewb.database.sqlite.tables.column import * +from zepben.ewb.database.sql.column import * from zepben.ewb.database.sqlite.tables.sqlite_table import * from zepben.ewb.database.sqlite.tables.table_metadata_data_sources import * from zepben.ewb.database.sqlite.tables.table_version import * diff --git a/src/zepben/ewb/database/sql/__init__.py b/src/zepben/ewb/database/sql/__init__.py new file mode 100644 index 000000000..e7d95cd55 --- /dev/null +++ b/src/zepben/ewb/database/sql/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2025 Zeppelin Bend Pty Ltd +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. diff --git a/src/zepben/ewb/database/sqlite/tables/column.py b/src/zepben/ewb/database/sql/column.py similarity index 96% rename from src/zepben/ewb/database/sqlite/tables/column.py rename to src/zepben/ewb/database/sql/column.py index 535ac3df7..43a0e50fa 100644 --- a/src/zepben/ewb/database/sqlite/tables/column.py +++ b/src/zepben/ewb/database/sql/column.py @@ -1,4 +1,4 @@ -# Copyright 2024 Zeppelin Bend Pty Ltd +# Copyright 2025 Zeppelin Bend Pty Ltd # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. diff --git a/src/zepben/ewb/database/sql/sql_table.py b/src/zepben/ewb/database/sql/sql_table.py new file mode 100644 index 000000000..f94990ff1 --- /dev/null +++ b/src/zepben/ewb/database/sql/sql_table.py @@ -0,0 +1,142 @@ +# Copyright 2025 Zeppelin Bend Pty Ltd +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. +from __future__ import annotations + +__all__ = ["SqlTable"] + +from abc import abstractmethod, ABCMeta +from operator import attrgetter +from typing import List, Optional, Type, Any, Generator + +from zepben.ewb.database.sql.column import Column, Nullable + + +class SqlTable(metaclass=ABCMeta): + """ + Represents a table in an SQL Database. + + By default, this class doesn't support creating schema creation statements, allowing support for database with external schema management. + """ + + column_index: int = 0 + """Used to specify index of the column in the table during initialisation. Always increment BEFORE creating a Column. Indices start from 1.""" + + _column_set: Optional[List[Column]] = None + _create_table_sql: Optional[str] = None + _prepared_insert_sql: Optional[str] = None + _prepared_update_sql: Optional[str] = None + _create_indexes_sql: Optional[List[str]] = None + _select_sql: Optional[str] = None + + @property + @abstractmethod + def name(self) -> str: + """ + The name of the table in the actual database. + """ + pass + + # + # NOTE: This function is called `description` in teh JVM SDK, but in the python SDK this + # conflicts with the `description` column of `TableIdentifiedObjects`. + # + def describe(self) -> str: + """ + Readable description of the contents of the table for adding to logs. + """ + return self.name.replace("_", " ") + + @property + @abstractmethod + def create_table_sql(self): + """ + The SQL statement that should be executed to create the table in the database. + """ + raise NotImplemented + + @property + def prepared_insert_sql(self): + """ + The SQL statement that should be used with a `PreparedStatement` to insert entries into the table. + """ + if self._prepared_insert_sql is None: + self._prepared_insert_sql = (f"INSERT INTO {self.name} ({', '.join([c.name for c in self.column_set])}) " + f"VALUES ({', '.join(['?' for _ in self.column_set])})") + return self._prepared_insert_sql + + @property + @abstractmethod + def create_indexes_sql(self): + """ + The SQL statement that should be executed to create the indexes for the table in the database. Should be executed after all + entries are inserted into the table. + """ + raise NotImplemented + + @property + def select_sql(self): + """ + The SQL statement that should be used to read the entries from the table in the database. + """ + if self._select_sql is None: + self._select_sql = f"SELECT {', '.join([c.name for c in self.column_set])} FROM {self.name}" + return self._select_sql + + @property + def prepared_update_sql(self): + """ + The SQL statement that should be used with a `PreparedStatement` to update entries into the table. + """ + if self._prepared_update_sql is None: + self._prepared_update_sql = f"UPDATE {self.name} SET {', '.join([f'{c.name} = ?' for c in self.column_set])}" + return self._prepared_update_sql + + @property + def unique_index_columns(self) -> Generator[List[Column], None, None]: + """ + A list of column groups that require a unique index in the database + """ + yield from [] + + @property + def non_unique_index_columns(self) -> Generator[List[Column], None, None]: + """ + A list of column groups that require a non-unique index in the database + """ + yield from [] + + @property + def column_set(self) -> List[Column]: + if self._column_set is None: + self._column_set = list(self._build_column_set(self.__class__, self)) + return self._column_set + + @staticmethod + def _build_column_set(clazz: Type[Any], instance: SqlTable) -> Generator[Column, None, None]: + """ + Builds the list of columns for use in DDL statements for this table. + + :param clazz: The class of this table. + :param instance: + """ + cols = list() + for field, x in instance.__dict__.items(): + if isinstance(x, Column): + if x.query_index != len(cols) + 1: + raise ValueError( + f"Field {field} in SQL Table class {clazz.__name__} is using an invalid column index. " + f"Did you forget to increment column_index, or did you skip one?" + ) + cols.append(x) + + if len(set([c.name for c in cols])) != len(cols): + raise ValueError("You have duplicate column names, go fix that.") + + yield from sorted(cols, key=attrgetter('query_index')) + + def _create_column(self, name: str, type_: str, nullable: Nullable = Nullable.NONE) -> Column: + self.column_index += 1 + # noinspection PyArgumentList + return Column(self.column_index, name, type_, nullable) diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_asset_organisation_roles_assets.py b/src/zepben/ewb/database/sqlite/tables/associations/table_asset_organisation_roles_assets.py index 01f1f146d..5ed30f051 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_asset_organisation_roles_assets.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_asset_organisation_roles_assets.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_assets_power_system_resources.py b/src/zepben/ewb/database/sqlite/tables/associations/table_assets_power_system_resources.py index 3b54f3a19..b76fde259 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_assets_power_system_resources.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_assets_power_system_resources.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_battery_units_battery_controls.py b/src/zepben/ewb/database/sqlite/tables/associations/table_battery_units_battery_controls.py index 3849efc09..4d08472c5 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_battery_units_battery_controls.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_battery_units_battery_controls.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_circuits_substations.py b/src/zepben/ewb/database/sqlite/tables/associations/table_circuits_substations.py index 93c027030..40efc78a8 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_circuits_substations.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_circuits_substations.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_circuits_terminals.py b/src/zepben/ewb/database/sqlite/tables/associations/table_circuits_terminals.py index d2a307f51..171775b47 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_circuits_terminals.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_circuits_terminals.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_customer_agreements_pricing_structures.py b/src/zepben/ewb/database/sqlite/tables/associations/table_customer_agreements_pricing_structures.py index 84a88b6ca..0a733b130 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_customer_agreements_pricing_structures.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_customer_agreements_pricing_structures.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_end_devices_end_device_functions.py b/src/zepben/ewb/database/sqlite/tables/associations/table_end_devices_end_device_functions.py index 9a7d487f1..8dd8a18a8 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_end_devices_end_device_functions.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_end_devices_end_device_functions.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_equipment_containers.py b/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_equipment_containers.py index 806a0692d..ab75a14ab 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_equipment_containers.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_equipment_containers.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_operational_restrictions.py b/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_operational_restrictions.py index a3db6a590..cce26e3c1 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_operational_restrictions.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_operational_restrictions.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_usage_points.py b/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_usage_points.py index daebe6a75..378142d26 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_usage_points.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_equipment_usage_points.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_loops_substations.py b/src/zepben/ewb/database/sqlite/tables/associations/table_loops_substations.py index 621098eb3..3fb051a35 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_loops_substations.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_loops_substations.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_pricing_structures_tariffs.py b/src/zepben/ewb/database/sqlite/tables/associations/table_pricing_structures_tariffs.py index 9f1f8abcc..71d94752d 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_pricing_structures_tariffs.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_pricing_structures_tariffs.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_functions_protected_switches.py b/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_functions_protected_switches.py index 45dc52e9c..8a10cfa41 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_functions_protected_switches.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_functions_protected_switches.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_functions_sensors.py b/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_functions_sensors.py index 52c2e92fb..1dd18f8d1 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_functions_sensors.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_functions_sensors.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_schemes_protection_relay_functions.py b/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_schemes_protection_relay_functions.py index b3a4fb04c..c76029cb0 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_schemes_protection_relay_functions.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_protection_relay_schemes_protection_relay_functions.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/associations/table_usage_points_end_devices.py b/src/zepben/ewb/database/sqlite/tables/associations/table_usage_points_end_devices.py index 29fd50491..c06f8f3e1 100644 --- a/src/zepben/ewb/database/sqlite/tables/associations/table_usage_points_end_devices.py +++ b/src/zepben/ewb/database/sqlite/tables/associations/table_usage_points_end_devices.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/assetinfo/table_reclose_delays.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/assetinfo/table_reclose_delays.py index 19f8d1494..0ea4399b3 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/assetinfo/table_reclose_delays.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/assetinfo/table_reclose_delays.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/assetinfo/table_relay_info.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/assetinfo/table_relay_info.py index d6fc8166a..0385a7693 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/assetinfo/table_relay_info.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/assetinfo/table_relay_info.py @@ -5,7 +5,7 @@ __all__ = ["TableRelayInfo"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/metering/table_pan_demand_response_functions.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/metering/table_pan_demand_response_functions.py index 1003778d0..c8967c1f9 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/metering/table_pan_demand_response_functions.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61968/metering/table_pan_demand_response_functions.py @@ -5,7 +5,7 @@ __all__ = ["TablePanDemandResponseFunctions"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.metering.table_end_device_functions import TableEndDeviceFunctions diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/feeder/table_lv_feeders.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/feeder/table_lv_feeders.py index d78f50025..2c39bccb5 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/feeder/table_lv_feeders.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/feeder/table_lv_feeders.py @@ -5,7 +5,7 @@ __all__ = ["TableLvFeeders"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_equipment_containers import TableEquipmentContainers diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_distance_relays.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_distance_relays.py index a24dd20ac..6732c4c8e 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_distance_relays.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_distance_relays.py @@ -5,7 +5,7 @@ __all__ = ["TableDistanceRelays"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.extensions.iec61970.base.protection.table_protection_relay_functions import TableProtectionRelayFunctions diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_function_thresholds.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_function_thresholds.py index 5e8d05c16..2590ec5e4 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_function_thresholds.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_function_thresholds.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_function_time_limits.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_function_time_limits.py index 742c81321..208a83426 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_function_time_limits.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_function_time_limits.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_functions.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_functions.py index f62152093..e17e35cab 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_functions.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_functions.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_power_system_resources import TablePowerSystemResources diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_schemes.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_schemes.py index 83b1ee794..96e78f423 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_schemes.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_schemes.py @@ -5,7 +5,7 @@ __all__ = ["TableProtectionRelaySchemes"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_systems.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_systems.py index b8745b649..5c68ab32d 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_systems.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/protection/table_protection_relay_systems.py @@ -5,7 +5,7 @@ __all__ = ["TableProtectionRelaySystems"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_equipment import TableEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/wires/table_battery_controls.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/wires/table_battery_controls.py index d6a94b8cd..14027d69e 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/wires/table_battery_controls.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/wires/table_battery_controls.py @@ -5,7 +5,7 @@ __all__ = ["TableBatteryControls"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_regulating_controls import TableRegulatingControls diff --git a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/wires/table_power_transformer_end_ratings.py b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/wires/table_power_transformer_end_ratings.py index a02941e23..ea05bab66 100644 --- a/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/wires/table_power_transformer_end_ratings.py +++ b/src/zepben/ewb/database/sqlite/tables/extensions/iec61970/base/wires/table_power_transformer_end_ratings.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_no_load_tests.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_no_load_tests.py index 758bf7ebd..83b114114 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_no_load_tests.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_no_load_tests.py @@ -5,7 +5,7 @@ __all__ = ["TableNoLoadTests"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assetinfo.table_transformer_test import TableTransformerTest diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_open_circuit_tests.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_open_circuit_tests.py index 788dc90d4..d1ae8a758 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_open_circuit_tests.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_open_circuit_tests.py @@ -5,7 +5,7 @@ __all__ = ["TableOpenCircuitTests"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assetinfo.table_transformer_test import TableTransformerTest diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_short_circuit_tests.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_short_circuit_tests.py index 9a5c2fe34..7a3ef3502 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_short_circuit_tests.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_short_circuit_tests.py @@ -5,7 +5,7 @@ __all__ = ["TableShortCircuitTests"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assetinfo.table_transformer_test import TableTransformerTest diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_shunt_compensator_info.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_shunt_compensator_info.py index 59291a5b3..0400882ff 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_shunt_compensator_info.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_shunt_compensator_info.py @@ -5,7 +5,7 @@ __all__ = ["TableShuntCompensatorInfo"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_switch_info.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_switch_info.py index e3967c775..8a2b0e2cb 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_switch_info.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_switch_info.py @@ -5,7 +5,7 @@ __all__ = ["TableSwitchInfo"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_end_info.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_end_info.py index 97ccfc279..e5f689f80 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_end_info.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_end_info.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_tank_info.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_tank_info.py index c7ce13dd0..e43ca7c2d 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_tank_info.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_tank_info.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_test.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_test.py index 07a20b177..08691a881 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_test.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_transformer_test.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_wire_info.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_wire_info.py index f9aaeca83..031b4af96 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_wire_info.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assetinfo/table_wire_info.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assets/table_assets.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assets/table_assets.py index 73b703dd0..da614290b 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assets/table_assets.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assets/table_assets.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/assets/table_streetlights.py b/src/zepben/ewb/database/sqlite/tables/iec61968/assets/table_streetlights.py index 16a4dcc7a..e4756c0ae 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/assets/table_streetlights.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/assets/table_streetlights.py @@ -5,7 +5,7 @@ __all__ = ["TableStreetlights"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_assets import TableAssets diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_documents.py b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_documents.py index 727ad3e63..5f35dde10 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_documents.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_documents.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_location_street_addresses.py b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_location_street_addresses.py index f7a0ba673..63572ac4f 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_location_street_addresses.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_location_street_addresses.py @@ -5,7 +5,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.common.table_street_addresses import TableStreetAddresses __all__ = ["TableLocationStreetAddresses"] diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_organisation_roles.py b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_organisation_roles.py index 76c4ec704..5b2223ccb 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_organisation_roles.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_organisation_roles.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_position_points.py b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_position_points.py index 9c193c8ec..ca39b010a 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_position_points.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_position_points.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_street_addresses.py b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_street_addresses.py index 8830e00b3..4f59a5c75 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_street_addresses.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_street_addresses.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.common.table_town_details import TableTownDetails diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_town_details.py b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_town_details.py index 86f22fe66..af7a87c0d 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_town_details.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/common/table_town_details.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/customers/table_customer_agreements.py b/src/zepben/ewb/database/sqlite/tables/iec61968/customers/table_customer_agreements.py index 6b856ed87..544bcf8f4 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/customers/table_customer_agreements.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/customers/table_customer_agreements.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.common.table_agreements import TableAgreements diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/customers/table_customers.py b/src/zepben/ewb/database/sqlite/tables/iec61968/customers/table_customers.py index 8dddd2e02..4183cf424 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/customers/table_customers.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/customers/table_customers.py @@ -5,7 +5,7 @@ __all__ = ["TableCustomers"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.common.table_organisation_roles import TableOrganisationRoles diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassetinfo/table_current_transformer_info.py b/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassetinfo/table_current_transformer_info.py index c353675ea..93ed6a8e5 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassetinfo/table_current_transformer_info.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassetinfo/table_current_transformer_info.py @@ -5,7 +5,7 @@ __all__ = ["TableCurrentTransformerInfo"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassetinfo/table_potential_transformer_info.py b/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassetinfo/table_potential_transformer_info.py index 7e6d38f9c..167b4ce3e 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassetinfo/table_potential_transformer_info.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassetinfo/table_potential_transformer_info.py @@ -5,7 +5,7 @@ __all__ = ["TablePotentialTransformerInfo"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_info import TableAssetInfo diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassets/table_poles.py b/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassets/table_poles.py index db630b564..854da5a3a 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassets/table_poles.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/infiec61968/infassets/table_poles.py @@ -5,7 +5,7 @@ __all__ = ["TablePoles"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_structures import TableStructures diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_end_device_functions.py b/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_end_device_functions.py index db656b41c..47c3217b0 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_end_device_functions.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_end_device_functions.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_functions import TableAssetFunctions diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_end_devices.py b/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_end_devices.py index ed40f584a..48a5c1830 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_end_devices.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_end_devices.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61968.assets.table_asset_containers import TableAssetContainers diff --git a/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_usage_points.py b/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_usage_points.py index f046b9c99..830f06798 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_usage_points.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61968/metering/table_usage_points.py @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_auxiliary_equipment.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_auxiliary_equipment.py index 70788df43..50d679f3d 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_auxiliary_equipment.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_auxiliary_equipment.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_equipment import TableEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_current_transformers.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_current_transformers.py index 2ea55a001..3a802372c 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_current_transformers.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_current_transformers.py @@ -5,7 +5,7 @@ __all__ = ["TableCurrentTransformers"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.auxiliaryequipment.table_sensors import TableSensors diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_potential_transformers.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_potential_transformers.py index c730028d9..1be3725fe 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_potential_transformers.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/auxiliaryequipment/table_potential_transformers.py @@ -5,7 +5,7 @@ __all__ = ["TablePotentialTransformers"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.auxiliaryequipment.table_sensors import TableSensors diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_base_voltages.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_base_voltages.py index b01634649..9197b6e67 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_base_voltages.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_base_voltages.py @@ -5,7 +5,7 @@ __all__ = ["TableBaseVoltages"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_conducting_equipment.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_conducting_equipment.py index 56d95fa3a..61b3b119d 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_conducting_equipment.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_conducting_equipment.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_equipment import TableEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_curve_data.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_curve_data.py index ccc215f0e..0ad23313c 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_curve_data.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_curve_data.py @@ -8,7 +8,7 @@ from typing import List, Generator from zepben.ewb import SqliteTable -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable class TableCurveData(SqliteTable): diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_equipment.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_equipment.py index e0f245ae7..1cbea25ad 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_equipment.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_equipment.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_power_system_resources import TablePowerSystemResources diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_feeders.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_feeders.py index cf4d0d7df..0c4f70a9d 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_feeders.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_feeders.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_equipment_containers import TableEquipmentContainers diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_identified_objects.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_identified_objects.py index 75221a6d3..71416b50c 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_identified_objects.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_identified_objects.py @@ -8,7 +8,7 @@ from abc import ABC from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_name_types.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_name_types.py index 36e8f75fa..ae4090b24 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_name_types.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_name_types.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_names.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_names.py index a391ea132..8a5bd79fe 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_names.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_names.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_power_system_resources.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_power_system_resources.py index a77d5785a..e7a0ffcda 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_power_system_resources.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_power_system_resources.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_sub_geographical_regions.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_sub_geographical_regions.py index a6b0c6525..62b73b824 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_sub_geographical_regions.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_sub_geographical_regions.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_substations.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_substations.py index ff70e6c4c..d349bd44f 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_substations.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_substations.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_equipment_containers import TableEquipmentContainers diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_terminals.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_terminals.py index b85f8a411..d930efc4c 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_terminals.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/core/table_terminals.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_ac_dc_terminals import TableAcDcTerminals diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagram_object_points.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagram_object_points.py index c86badb9c..83688cca2 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagram_object_points.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagram_object_points.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagram_objects.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagram_objects.py index c730ccee6..cced70c79 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagram_objects.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagram_objects.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagrams.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagrams.py index 36900f818..aac2164a2 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagrams.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/diagramlayout/table_diagrams.py @@ -5,7 +5,7 @@ __all__ = ["TableDiagrams"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/equivalents/table_equivalent_branches.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/equivalents/table_equivalent_branches.py index b3c7f2aed..97a31bf78 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/equivalents/table_equivalent_branches.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/equivalents/table_equivalent_branches.py @@ -5,7 +5,7 @@ __all__ = ["TableEquivalentBranches"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.equivalents.table_equivalent_equipment import TableEquivalentEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/generation/production/table_battery_units.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/generation/production/table_battery_units.py index 48baf6fae..633c8e041 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/generation/production/table_battery_units.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/generation/production/table_battery_units.py @@ -5,7 +5,7 @@ __all__ = ["TableBatteryUnits"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.generation.production.table_power_electronics_units import TablePowerElectronicsUnits diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/generation/production/table_power_electronics_units.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/generation/production/table_power_electronics_units.py index 3370dd9e3..46b25deef 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/generation/production/table_power_electronics_units.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/generation/production/table_power_electronics_units.py @@ -8,7 +8,7 @@ from abc import ABC from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_equipment import TableEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_analogs.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_analogs.py index b0f68ecbb..a7a552209 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_analogs.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_analogs.py @@ -5,7 +5,7 @@ __all__ = ["TableAnalogs"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.meas.table_measurements import TableMeasurements diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_controls.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_controls.py index babfd9fc1..099fa9477 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_controls.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_controls.py @@ -5,7 +5,7 @@ __all__ = ["TableControls"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.meas.table_io_points import TableIoPoints diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_measurements.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_measurements.py index a996f4897..19a926976 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_measurements.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/meas/table_measurements.py @@ -8,7 +8,7 @@ from abc import ABC from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/protection/table_current_relays.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/protection/table_current_relays.py index 2e36e63e8..adb1c4cb1 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/protection/table_current_relays.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/protection/table_current_relays.py @@ -5,7 +5,7 @@ __all__ = ["TableCurrentRelays"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.extensions.iec61970.base.protection.table_protection_relay_functions import TableProtectionRelayFunctions diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/scada/table_remote_controls.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/scada/table_remote_controls.py index 87a6f7331..ced16ca2a 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/scada/table_remote_controls.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/scada/table_remote_controls.py @@ -5,7 +5,7 @@ __all__ = ["TableRemoteControls"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.scada.table_remote_points import TableRemotePoints diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/scada/table_remote_sources.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/scada/table_remote_sources.py index 96b4cd475..8e91811ea 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/scada/table_remote_sources.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/scada/table_remote_sources.py @@ -5,7 +5,7 @@ __all__ = ["TableRemoteSources"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.scada.table_remote_points import TableRemotePoints diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_ac_line_segments.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_ac_line_segments.py index 79f8a7de0..a6d336dfa 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_ac_line_segments.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_ac_line_segments.py @@ -5,7 +5,7 @@ __all__ = ["TableAcLineSegments"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_conductors import TableConductors diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_breakers.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_breakers.py index 4726866be..b35fe021c 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_breakers.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_breakers.py @@ -5,7 +5,7 @@ __all__ = ["TableBreakers"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_protected_switches import TableProtectedSwitches diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_clamps.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_clamps.py index f4025dbb3..4314f379c 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_clamps.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_clamps.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_conducting_equipment import TableConductingEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_conductors.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_conductors.py index f0b832562..af9305685 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_conductors.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_conductors.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_conducting_equipment import TableConductingEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_cuts.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_cuts.py index bc91be59f..aaf35d5c0 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_cuts.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_cuts.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_switches import TableSwitches diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_earth_fault_compensators.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_earth_fault_compensators.py index 088a34af6..a4123f30d 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_earth_fault_compensators.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_earth_fault_compensators.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_conducting_equipment import TableConductingEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_consumer_phases.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_consumer_phases.py index 12325e8c1..cae0d2640 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_consumer_phases.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_consumer_phases.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_power_system_resources import TablePowerSystemResources diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_consumers.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_consumers.py index c22ead149..ef5e5c430 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_consumers.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_consumers.py @@ -5,7 +5,7 @@ __all__ = ["TableEnergyConsumers"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_energy_connections import TableEnergyConnections diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_source_phases.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_source_phases.py index 6c816dfc3..cc6009386 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_source_phases.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_source_phases.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_power_system_resources import TablePowerSystemResources diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_sources.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_sources.py index db88cbb86..b16fbb182 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_sources.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_energy_sources.py @@ -5,7 +5,7 @@ __all__ = ["TableEnergySources"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_energy_connections import TableEnergyConnections diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_fuses.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_fuses.py index 96de68719..0b44ad79c 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_fuses.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_fuses.py @@ -5,7 +5,7 @@ __all__ = ["TableFuses"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_switches import TableSwitches diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_grounding_impedances.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_grounding_impedances.py index 0005d8b3b..b4a80d5d1 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_grounding_impedances.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_grounding_impedances.py @@ -5,7 +5,7 @@ __all__ = ["TableGroundingImpedances"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_earth_fault_compensators import TableEarthFaultCompensators diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_linear_shunt_compensators.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_linear_shunt_compensators.py index 07faa7cb2..27edd34ca 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_linear_shunt_compensators.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_linear_shunt_compensators.py @@ -5,7 +5,7 @@ __all__ = ["TableLinearShuntCompensators"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_shunt_compensators import TableShuntCompensators diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_per_length_sequence_impedances.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_per_length_sequence_impedances.py index 1a9dcef19..b547674cd 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_per_length_sequence_impedances.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_per_length_sequence_impedances.py @@ -5,7 +5,7 @@ __all__ = ["TablePerLengthSequenceImpedances"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_per_length_impedances import TablePerLengthImpedances diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_petersen_coils.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_petersen_coils.py index b829a5fec..6cb31ded4 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_petersen_coils.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_petersen_coils.py @@ -5,7 +5,7 @@ __all__ = ["TablePetersenCoils"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_earth_fault_compensators import TableEarthFaultCompensators diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_phase_impedance_data.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_phase_impedance_data.py index 302627a33..17613ed54 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_phase_impedance_data.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_phase_impedance_data.py @@ -8,7 +8,7 @@ from typing import List, Generator from zepben.ewb import SqliteTable -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable class TablePhaseImpedanceData(SqliteTable): diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_electronics_connection_phases.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_electronics_connection_phases.py index 598130431..f6ea12cd4 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_electronics_connection_phases.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_electronics_connection_phases.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_power_system_resources import TablePowerSystemResources diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_electronics_connections.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_electronics_connections.py index b8a3a53d7..9fdc18ea0 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_electronics_connections.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_electronics_connections.py @@ -5,7 +5,7 @@ __all__ = ["TablePowerElectronicsConnections"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_regulating_cond_eq import TableRegulatingCondEq diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_transformer_ends.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_transformer_ends.py index cd80e7930..16500fe77 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_transformer_ends.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_transformer_ends.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_transformer_ends import TableTransformerEnds diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_transformers.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_transformers.py index 18aa990ae..63c722cd1 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_transformers.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_power_transformers.py @@ -5,7 +5,7 @@ __all__ = ["TablePowerTransformers"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_conducting_equipment import TableConductingEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_protected_switches.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_protected_switches.py index f0962f13f..b68fedaaa 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_protected_switches.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_protected_switches.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_switches import TableSwitches diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_ratio_tap_changers.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_ratio_tap_changers.py index 000f17de0..cbaa9de00 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_ratio_tap_changers.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_ratio_tap_changers.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_tap_changers import TableTapChangers diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_regulating_cond_eq.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_regulating_cond_eq.py index 469a98be9..8f18a8b48 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_regulating_cond_eq.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_regulating_cond_eq.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_energy_connections import TableEnergyConnections diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_regulating_controls.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_regulating_controls.py index 01626dc6f..cf85339e3 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_regulating_controls.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_regulating_controls.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_power_system_resources import TablePowerSystemResources diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_rotating_machines.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_rotating_machines.py index e23ac2479..b4bc6126f 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_rotating_machines.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_rotating_machines.py @@ -6,7 +6,7 @@ __all__ = ["TableRotatingMachines"] from zepben.ewb import TableRegulatingCondEq -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable class TableRotatingMachines(TableRegulatingCondEq): diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_series_compensators.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_series_compensators.py index f2d5fc48a..f20e4b178 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_series_compensators.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_series_compensators.py @@ -5,7 +5,7 @@ __all__ = ["TableSeriesCompensators"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_conducting_equipment import TableConductingEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_shunt_compensators.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_shunt_compensators.py index 0dc217f7a..08d033aaf 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_shunt_compensators.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_shunt_compensators.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_regulating_cond_eq import TableRegulatingCondEq diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_static_var_compensator.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_static_var_compensator.py index df369394c..e40f5666d 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_static_var_compensator.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_static_var_compensator.py @@ -6,7 +6,7 @@ __all__ = ["TableStaticVarCompensators"] from zepben.ewb import TableRegulatingCondEq -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable class TableStaticVarCompensators(TableRegulatingCondEq): diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_switches.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_switches.py index 705c2a511..00b0c84bb 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_switches.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_switches.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_conducting_equipment import TableConductingEquipment diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_synchronous_machines.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_synchronous_machines.py index 93f0c76d4..719e3393e 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_synchronous_machines.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_synchronous_machines.py @@ -5,7 +5,7 @@ __all__ = ["TableSynchronousMachines"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_rotating_machines import TableRotatingMachines diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changer_controls.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changer_controls.py index 8078a76f4..cdf3e0abe 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changer_controls.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changer_controls.py @@ -5,7 +5,7 @@ __all__ = ["TableTapChangerControls"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_regulating_controls import TableRegulatingControls diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changers.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changers.py index 60f0454ff..bd0b05085 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changers.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changers.py @@ -7,7 +7,7 @@ from abc import ABC -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_power_system_resources import TablePowerSystemResources diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_ends.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_ends.py index d2c42865f..5cc3da48f 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_ends.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_ends.py @@ -8,7 +8,7 @@ from abc import ABC from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_star_impedances.py b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_star_impedances.py index ff69be1fc..c295c86f1 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_star_impedances.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_star_impedances.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects diff --git a/src/zepben/ewb/database/sqlite/tables/iec61970/infiec61970/feeder/table_circuits.py b/src/zepben/ewb/database/sqlite/tables/iec61970/infiec61970/feeder/table_circuits.py index 004f74dee..d7f0d10c7 100644 --- a/src/zepben/ewb/database/sqlite/tables/iec61970/infiec61970/feeder/table_circuits.py +++ b/src/zepben/ewb/database/sqlite/tables/iec61970/infiec61970/feeder/table_circuits.py @@ -7,7 +7,7 @@ from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_lines import TableLines diff --git a/src/zepben/ewb/database/sqlite/tables/sqlite_table.py b/src/zepben/ewb/database/sqlite/tables/sqlite_table.py index 415959890..15b1362a1 100644 --- a/src/zepben/ewb/database/sqlite/tables/sqlite_table.py +++ b/src/zepben/ewb/database/sqlite/tables/sqlite_table.py @@ -7,136 +7,39 @@ __all__ = ["SqliteTable"] -from abc import abstractmethod -from typing import List, Optional, Type, Any, Generator +from abc import ABC +from typing import List, Generator -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column +from zepben.ewb.database.sql.sql_table import SqlTable -# @dataclass(slots=True) -class SqliteTable(object): +class SqliteTable(SqlTable, ABC): """ - Represents a table in an Sqlite Database. This class should be extended and initialised to build the DDL for a Table. - Methods that need to be overridden are those marked @abstractmethod. - Methods that can be optionally overridden are unique_index_columns() and non_unique_index_columns(). - Columns must be assigned in __init__ and column_index must be incremented for each Column created. - See existing implementations such as TableVersion for examples. + Represents a table in an Sqlite Database. """ - column_index: int = 0 - """Used to specify index of the column in the table during initialisation. Always increment BEFORE creating a Column. Indices start from 1.""" - - _column_set: Optional[List[Column]] = None - _create_table_sql: Optional[str] = None - _prepared_insert_sql: Optional[str] = None - _prepared_update_sql: Optional[str] = None - _create_indexes_sql: Optional[List[str]] = None - _select_sql: Optional[str] = None - - @property - @abstractmethod - def name(self) -> str: - pass - - # - # NOTE: This function is called `description` in teh JVM SDK, but in the python SDK this - # conflicts with the `description` column of `TableIdentifiedObjects`. - # - def describe(self) -> str: - return self.name.replace("_", " ") - @property def create_table_sql(self): - return self._create_table_sql if self._create_table_sql else self._build_create_table_sql() - - @property - def prepared_insert_sql(self): - return self._prepared_insert_sql if self._prepared_insert_sql else self._build_prepared_insert_sql() + if self._create_table_sql is None: + self._create_table_sql = self._build_create_table_sql() + return self._create_table_sql @property def create_indexes_sql(self): - return self._create_indexes_sql if self._create_indexes_sql else self._build_indexes_sql() - - @property - def select_sql(self): - return self._select_sql if self._select_sql else self._build_select_sql() - - @property - def prepared_update_sql(self): - return self._prepared_update_sql if self._prepared_update_sql else self._build_prepared_update_sql() - - @property - def unique_index_columns(self) -> Generator[List[Column], None, None]: - # To make this a generator we need to `yield`, but we have nothing to yield by default, so trick it by yielding from an empty for-loop. - for it in []: - yield it - - @property - def non_unique_index_columns(self) -> Generator[List[Column], None, None]: - # To make this a generator we need to `yield`, but we have nothing to yield by default, so trick it by yielding from an empty for-loop. - for it in []: - yield it - - @property - def column_set(self) -> List[Column]: - return self._column_set if self._column_set else self._build_column_set(self.__class__, self) - - def _build_column_set(self, clazz: Type[Any], instance: SqliteTable) -> List[Column]: - """ - Builds the list of columns for use in DDL statements for this table. - - :param clazz: The class of this table. - :param instance: - :return: - """ - cols = list() - for field, x in instance.__dict__.items(): - if isinstance(x, Column): - if x.query_index != len(cols) + 1: - raise ValueError( - f"Field {field} in SQL Table class {clazz.__name__} is using an invalid column index. " - f"Did you forget to increment column_index, or did you skip one?" - ) - cols.append(x) - - if len(set([c.name for c in cols])) != len(cols): - raise ValueError("You have a duplicate column names, go fix that.") - - self._column_set = sorted(cols, key=lambda it: it.query_index) - return self._column_set - - def _build_create_table_sql(self) -> str: - self._create_table_sql = f"CREATE TABLE {self.name} ({', '.join([str(c) for c in self.column_set])})" - return self._create_table_sql - - def _build_prepared_insert_sql(self) -> str: - self._prepared_insert_sql = f"INSERT INTO {self.name} ({', '.join([c.name for c in self.column_set])}) " \ - f"VALUES ({', '.join(['?' for _ in self.column_set])})" - return self._prepared_insert_sql - - def _build_indexes_sql(self) -> List[str]: - statements = [] - for index_col in self.unique_index_columns: - statements.append(self._build_index_sql(index_col, True)) - for index_col in self.non_unique_index_columns: - statements.append(self._build_index_sql(index_col, False)) - self._create_indexes_sql = statements + if self._create_indexes_sql is None: + self._create_indexes_sql = list(self._build_indexes_sql()) return self._create_indexes_sql - def _build_index_sql(self, index_col: List[Column], is_unique: bool): - id_string = f"{self.name}_{'_'.join(map(lambda c: c.name, index_col))}" - col_string = ', '.join(map(lambda c: c.name, index_col)) - return f"CREATE {'UNIQUE ' if is_unique else ''}INDEX {id_string} ON {self.name} ({col_string})" - - def _build_select_sql(self) -> str: - self._select_sql = f"SELECT {', '.join([c.name for c in self.column_set])} FROM {self.name}" - return self._select_sql + def _build_create_table_sql(self) -> str: + return f"CREATE TABLE {self.name} ({', '.join(str(c) for c in self.column_set)})" - def _build_prepared_update_sql(self) -> str: - self._prepared_update_sql = f"UPDATE {self.name} SET {', '.join([f'{c.name} = ?' for c in self.column_set])}" - return self._prepared_update_sql + def _build_indexes_sql(self) -> Generator[str, None, None]: + yield from (self._build_index_sql(index_col, True) for index_col in self.unique_index_columns) + yield from (self._build_index_sql(index_col, False) for index_col in self.non_unique_index_columns) - def _create_column(self, name: str, type_: str, nullable: Nullable = Nullable.NONE) -> Column: - self.column_index += 1 - # noinspection PyArgumentList - return Column(self.column_index, name, type_, nullable) + def _build_index_sql(self, index_col: List[Column], is_unique: bool) -> str: + index_col_names = [c.name for c in index_col] + return (f"CREATE {'UNIQUE ' if is_unique else ''}INDEX " + f"{self.name}_{'_'.join(index_col_names)}" # id string + f" ON {self.name} ({', '.join(index_col_names)})") # col string diff --git a/src/zepben/ewb/database/sqlite/tables/table_metadata_data_sources.py b/src/zepben/ewb/database/sqlite/tables/table_metadata_data_sources.py index 7521ecb11..c87c1fb6b 100644 --- a/src/zepben/ewb/database/sqlite/tables/table_metadata_data_sources.py +++ b/src/zepben/ewb/database/sqlite/tables/table_metadata_data_sources.py @@ -5,7 +5,7 @@ __all__ = ["TableMetadataDataSources"] -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable diff --git a/src/zepben/ewb/database/sqlite/tables/table_version.py b/src/zepben/ewb/database/sqlite/tables/table_version.py index 44602682c..743960124 100644 --- a/src/zepben/ewb/database/sqlite/tables/table_version.py +++ b/src/zepben/ewb/database/sqlite/tables/table_version.py @@ -9,7 +9,7 @@ from sqlite3 import Cursor from typing import Optional -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable @@ -17,6 +17,7 @@ class TableVersion(SqliteTable): SUPPORTED_VERSION = 59 def __init__(self): + super().__init__() self.version: Column = self._create_column("version", "TEXT", Nullable.NOT_NULL) @property diff --git a/test/database/sqlite/tables/test_sqlitetable.py b/test/database/sqlite/tables/test_sqlitetable.py index 9055c1c80..17f53ea57 100644 --- a/test/database/sqlite/tables/test_sqlitetable.py +++ b/test/database/sqlite/tables/test_sqlitetable.py @@ -8,7 +8,7 @@ from pytest import raises -from zepben.ewb.database.sqlite.tables.column import Column, Nullable +from zepben.ewb.database.sql.column import Column, Nullable from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable From 277f21e8d7ad760c54790a64496ce9f3fd473d58 Mon Sep 17 00:00:00 2001 From: Max Chesterfield Date: Wed, 20 Aug 2025 15:23:04 +1000 Subject: [PATCH 2/2] typo? Signed-off-by: Max Chesterfield --- test/database/sqlite/tables/test_sqlitetable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/database/sqlite/tables/test_sqlitetable.py b/test/database/sqlite/tables/test_sqlitetable.py index 17f53ea57..91b0fb259 100644 --- a/test/database/sqlite/tables/test_sqlitetable.py +++ b/test/database/sqlite/tables/test_sqlitetable.py @@ -33,7 +33,7 @@ def test_ddl(): def test_create_column_set_raises_on_invalid_column_name(): x = TableWithDuplicateColumnName() - with raises(ValueError, match="You have a duplicate column names, go fix that."): + with raises(ValueError, match="You have duplicate column names, go fix that."): _ = x.column_set