move component_type to basic

base_model/ddl.sql

@@ -11,6 +11,7 @@ CREATE SCHEMA IF NOT EXISTS BASIC;
 -- DROP TABLE IF EXISTS BASIC.MODEL_GROUP;
 -- DROP TABLE IF EXISTS BASIC.MODEL_TYPE;
 -- DROP TABLE IF EXISTS BASIC.ATTRIBUTE_GROUP;
+-- DROP TABLE IF EXISTS BASIC.COMPONENT_TYPE;
 -- DROP TABLE IF EXISTS BASIC.DATA_TYPE;
 
 
@@ -22,6 +23,15 @@ CREATE TABLE BASIC.DATA_TYPE (
 	UNIQUE (DATA_TYPE)
 );
 
+CREATE TABLE BASIC.COMPONENT_TYPE (
+    ID BIGSERIAL PRIMARY KEY,
+    TYPE VARCHAR(64) NOT NULL DEFAULT '',
+    NAME VARCHAR(64) NOT NULL DEFAULT '',
+	CONFIG JSONB NOT NULL DEFAULT '{}',
+
+    UNIQUE (TYPE)
+);
+
 CREATE TABLE BASIC.ATTRIBUTE_GROUP (
 	ID BIGSERIAL PRIMARY KEY,
 	GROUP_TYPE VARCHAR(64) NOT NULL DEFAULT '',
@@ -36,11 +46,13 @@ CREATE TABLE BASIC.MODEL_TYPE (
 	ID BIGSERIAL PRIMARY KEY,
 	MODEL_TYPE VARCHAR(64) NOT NULL DEFAULT '',
 	MODEL_NAME VARCHAR(64) NOT NULL DEFAULT '',
-	GRAPHIC_ELEMENT VARCHAR(64) NOT NULL DEFAULT '', -- 图元类型
+	GRAPHIC_ELEMENT BIGINT NOT NULL, -- 图元类型
 	ICON BYTEA NOT NULL, -- 默认图标
 	REMARK VARCHAR(128) NOT NULL DEFAULT '',
 	
-	UNIQUE (MODEL_TYPE)
+	UNIQUE (MODEL_TYPE),
+
+	FOREIGN KEY (GRAPHIC_ELEMENT) REFERENCES BASIC.COMPONENT_TYPE (ID)
 );
 
 CREATE TABLE BASIC.MODEL_GROUP (
@@ -109,4 +121,4 @@ CREATE TABLE BASIC.MODEL_CONNECTIVITY (
 	FROM_MODEL VARCHAR(64) NOT NULL DEFAULT '',
 	TO_MODEL VARCHAR(64) NOT NULL DEFAULT '',
 	CONNECTIVITY SMALLINT NOT NULL DEFAULT -1
-);
+);

model/ddl_0_component_type.sql

@@ -1,11 +0,0 @@
--- standard component type 
-
--- DROP TABLE IF EXISTS PUBLIC.COMPONENT_TYPE;
-
-CREATE TABLE PUBLIC.COMPONENT_TYPE (
-    ID SERIAL PRIMARY KEY,
-    TYPE VARCHAR(64) NOT NULL DEFAULT '',
-    NAME VARCHAR(64) NOT NULL DEFAULT '',
-
-    UNIQUE (TYPE)
-);