From 93a573cbdea48e540632c7da087c9936dc2be96a Mon Sep 17 00:00:00 2001 From: zhuxu Date: Tue, 3 Jun 2025 15:55:34 +0800 Subject: [PATCH] fine-tune --- model/ddl.sql | 15 +++++++++------ model/ddl_4_bay.sql | 3 +++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/model/ddl.sql b/model/ddl.sql index 72fda10..5d5cf82 100644 --- a/model/ddl.sql +++ b/model/ddl.sql @@ -3,7 +3,6 @@ CREATE SCHEMA IF NOT EXISTS PUBLIC; ---- drop all, then create all --- DROP TYPE IF EXISTS public.polar_coordinates; -- DROP TABLE IF EXISTS PUBLIC.MEASUREMENT; -- DROP TABLE IF EXISTS PUBLIC.BAY; -- DROP TABLE IF EXISTS PUBLIC.TOPOLOGIC; @@ -13,8 +12,14 @@ CREATE SCHEMA IF NOT EXISTS PUBLIC; -- DROP TABLE IF EXISTS PUBLIC.ZONE; -- DROP TABLE IF EXISTS PUBLIC.GRID; -- DROP TABLE IF EXISTS PUBLIC.COMPONENT_TYPE; +-- DROP TYPE IF EXISTS public.polar_coordinates; +CREATE TYPE PUBLIC.POLAR_COORDINATES AS ( + MAGNITUDE DOUBLE PRECISION, + PHASE DOUBLE PRECISION +); + CREATE TABLE PUBLIC.COMPONENT_TYPE ( ID BIGSERIAL PRIMARY KEY, TYPE VARCHAR(64) NOT NULL DEFAULT '', @@ -104,6 +109,9 @@ CREATE TABLE PUBLIC.BAY ( ID BIGSERIAL PRIMARY KEY, NAME VARCHAR(64) NOT NULL DEFAULT '', TYPE VARCHAR(64) NOT NULL DEFAULT '', + GRID VARCHAR(64) NOT NULL DEFAULT '', + ZONE VARCHAR(64) NOT NULL DEFAULT '', + STATION VARCHAR(64) NOT NULL DEFAULT '', FROM_NODE JSONB NOT NULL DEFAULT '[]', -- uuids TO_NODE JSONB NOT NULL DEFAULT '[]', -- uuids OP INTEGER NOT NULL DEFAULT -1, @@ -125,8 +133,3 @@ CREATE TABLE PUBLIC.MEASUREMENT ( FOREIGN KEY (BAY_ID) REFERENCES PUBLIC.BAY (ID), FOREIGN KEY (COMPONENT_ID) REFERENCES PUBLIC.COMPONENT (ID) ); - -CREATE TYPE PUBLIC.POLAR_COORDINATES AS ( - MAGNITUDE DOUBLE PRECISION, - PHASE DOUBLE PRECISION -); \ No newline at end of file diff --git a/model/ddl_4_bay.sql b/model/ddl_4_bay.sql index 2426a62..892500f 100644 --- a/model/ddl_4_bay.sql +++ b/model/ddl_4_bay.sql @@ -6,6 +6,9 @@ CREATE TABLE PUBLIC.BAY ( ID SERIAL PRIMARY KEY, NAME VARCHAR(64) NOT NULL DEFAULT '', TYPE VARCHAR(64) NOT NULL DEFAULT '', + GRID VARCHAR(64) NOT NULL DEFAULT '', + ZONE VARCHAR(64) NOT NULL DEFAULT '', + STATION VARCHAR(64) NOT NULL DEFAULT '', FROM_NODE JSONB NOT NULL DEFAULT '[]', -- uuids TO_NODE JSONB NOT NULL DEFAULT '[]', -- uuids OP INTEGER NOT NULL DEFAULT -1,