From 88b14ac58f2ce905989c5265c74f9a686336728c Mon Sep 17 00:00:00 2001 From: Mark Chadwick Date: Sat, 23 Nov 2024 16:18:55 +1300 Subject: [PATCH] update --- cmd/deltadb/delta.svg | 1508 ++++++++++++++++++++++++++--------------- meta/sqlite/db.go | 94 +-- 2 files changed, 1005 insertions(+), 597 deletions(-) diff --git a/cmd/deltadb/delta.svg b/cmd/deltadb/delta.svg index 7aa0e373f..e27a82d89 100644 --- a/cmd/deltadb/delta.svg +++ b/cmd/deltadb/delta.svg @@ -4,610 +4,1018 @@ - - + + structs - - + + +asset + +asset + +🔑 + +asset_id + +ℕ + +* + +  + +model_id + +ℕ + +* + +  + +serial + +ⓐ + +* + +  + +number + +ⓐ + +* + +  + +notes + +ⓐ + +* + + + +model + +model + +🔑 + +model_id + +ℕ + +* + +  + +make_id + +ℕ + +* + +  + +model + +ⓐ + +* + + + +asset:e->model:w + + + + + +calibration + +calibration + +🔑 + +calibration_id + +ℕ + +* + +  + +asset_id + +ℕ + +* + +  + +number + +ⓐ + +* + +  + +scale_factor + +ℝ + +* + +  + +scale_bias + +ℝ + +* + +  + +scale_absolute + +ℝ + +* + +  + +frequency + +ℝ + + +  + +start_date + +⌚ + +* + +  + +end_date + +⌚ + +* + + + +calibration:e->asset:w + + + + + +channel + +channel + +🔑 + +channel_id + +ℕ + +* + +  + +model_id + +ℕ + +* + +  + +channel_type + +ⓐ + +* + +  + +number + +ℝ + +* + +  + +sampling_rate + +ℝ + +* + +  + +response + +ⓐ + +* + + + +channel:e->model:w + + + + + +component + +component + +🔑 + +component_id + +ℕ + +* + +  + +model_id + +ℕ + +* + +  + +component_type + +ⓐ + + +  + +number + +ℝ + +* + +  + +source + +ⓐ + + +  + +subsource + +ⓐ + +* + +  + +dip + +ℝ + +* + +  + +azimuth + +ℝ + +* + +  + +types + +ⓐ + +* + +  + +sampling_rate + +ℝ + + +  + +response + +ⓐ + +* + + + +component:e->model:w + + + + + datum - -datum - -🔑 - -datum_id - -ℕ - -* - -  - -datum - -ⓐ - -* + +datum + +🔑 + +datum_id + +ℕ + +* + +  + +datum + +ⓐ + +* - + feature - -feature - -🔑 - -feature_id - -ℕ - -* - -  - -site_id - -ℕ - -* - -  - -sublocation - -ⓐ - - -  - -property - -ⓐ - -* - -  - -description - -ⓐ - - -  - -aspect - -ⓐ - - -  - -start_date - -⌚ - -* - -  - -end_date - -⌚ - -* + +feature + +🔑 + +feature_id + +ℕ + +* + +  + +site_id + +ℕ + +* + +  + +sublocation + +ⓐ + + +  + +property + +ⓐ + +* + +  + +description + +ⓐ + + +  + +aspect + +ⓐ + + +  + +start_date + +⌚ + +* + +  + +end_date + +⌚ + +* - + site - -site - -🔑 - -site_id - -ℕ - -* - -  - -station_id - -ℕ - -* - -  - -datum_id - -ℕ - -* - -  - -location - -ⓐ - -* - -  - -latitude - -ℝ - -* - -  - -longitude - -ℝ - -* - -  - -elevation - -ℝ - -* - -  - -depth - -ℝ - -* - -  - -survey - -ⓐ - -* - -  - -start_date - -⌚ - -* - -  - -end_date - -⌚ - -* + +site + +🔑 + +site_id + +ℕ + +* + +  + +station_id + +ℕ + +* + +  + +datum_id + +ℕ + +* + +  + +location + +ⓐ + +* + +  + +latitude + +ℝ + +* + +  + +longitude + +ℝ + +* + +  + +elevation + +ℝ + +* + +  + +depth + +ℝ + +* + +  + +survey + +ⓐ + +* + +  + +start_date + +⌚ + +* + +  + +end_date + +⌚ + +* - + feature:e->site:w - - + + + + + +firmware + +firmware + +🔑 + +firmware_id + +ℕ + +* + +  + +asset_id + +ℕ + +* + +  + +version + +ⓐ + +* + +  + +notes + +ⓐ + +* + +  + +start_date + + +* + +  + +end_date + + +* + + + +firmware:e->asset:w + + + + + +make + +make + +🔑 + +make_id + +ℕ + +* + +  + +make + +ⓐ + +* - + method - -method - -🔑 - -method_id - -ℕ - -* - -  - -method - -ⓐ - -* + +method + +🔑 + +method_id + +ℕ + +* + +  + +method + +ⓐ + +* + + + +model:e->make:w + + - + network - -network - -🔑 - -network_id - -ℕ - -* - -  - -network - -ⓐ - -* - -  - -external - -ⓐ - -* - -  - -description - -ⓐ - -* - -  - -restricted - -☑ - -* + +network + +🔑 + +network_id + +ℕ + +* + +  + +network + +ⓐ + +* + +  + +external + +ⓐ + +* + +  + +description + +ⓐ + +* + +  + +restricted + +☑ + +* - + point - -point - -🔑 - -point_id - -ℕ - -* - -  - -sample_id - -ℕ - -* - -  - -datum_id - -ℕ - -* - -  - -location - -ⓐ - -* - -  - -latitude - -ℝ - -* - -  - -longitude - -ℝ - -* - -  - -elevation - -ℝ - -* - -  - -depth - -ℝ - -* - -  - -survey - -ⓐ - -* - -  - -start_date - -⌚ - -* - -  - -end_date - -⌚ - -* + +point + +🔑 + +point_id + +ℕ + +* + +  + +sample_id + +ℕ + +* + +  + +datum_id + +ℕ + +* + +  + +location + +ⓐ + +* + +  + +latitude + +ℝ + +* + +  + +longitude + +ℝ + +* + +  + +elevation + +ℝ + +* + +  + +depth + +ℝ + +* + +  + +survey + +ⓐ + +* + +  + +start_date + +⌚ + +* + +  + +end_date + +⌚ + +* - + point:e->datum:w - - + + - + sample - -sample - -🔑 - -sample_id - -ℕ - -* - -  - -datum_id - -ℕ - -* - -  - -station - -ⓐ - -* - -  - -name - -ⓐ - -* - -  - -latitude - -ℝ - -* - -  - -longitude - -ℝ - -* - -  - -elevation - -ℝ - -* - -  - -depth - -ℝ - - -  - -start_date - -⌚ - -* - -  - -end_date - -⌚ - -* + +sample + +🔑 + +sample_id + +ℕ + +* + +  + +datum_id + +ℕ + +* + +  + +station + +ⓐ + +* + +  + +name + +ⓐ + +* + +  + +latitude + +ℝ + +* + +  + +longitude + +ℝ + +* + +  + +elevation + +ℝ + +* + +  + +depth + +ℝ + + +  + +start_date + +⌚ + +* + +  + +end_date + +⌚ + +* - + point:e->sample:w - - + + - + sample:e->datum:w - - + + - + site:e->datum:w - - + + - + station - -station - -🔑 - -station_id - -ℕ - -* - -  - -datum_id - -ℕ - -* - -  - -station - -ⓐ - -* - -  - -name - -ⓐ - -* - -  - -latitude - -ℝ - -* - -  - -longitude - -ℝ - -* - -  - -elevation - -ℝ - -* - -  - -depth - -ℝ - -* - -  - -start_date - -⌚ - -* - -  - -end_date - -⌚ - -* + +station + +🔑 + +station_id + +ℕ + +* + +  + +datum_id + +ℕ + +* + +  + +station + +ⓐ + +* + +  + +name + +ⓐ + +* + +  + +latitude + +ℝ + +* + +  + +longitude + +ℝ + +* + +  + +elevation + +ℝ + +* + +  + +depth + +ℝ + +* + +  + +start_date + +⌚ + +* + +  + +end_date + +⌚ + +* - + site:e->station:w - - + + - + station:e->datum:w - - + + - + station_network - -station_network - -🔑 - -station_network_id - -ℕ - -* - -  - -station_id - -ℕ - -* - -  - -network_id - -ℕ - -* + +station_network + +🔑 + +station_network_id + +ℕ + +* + +  + +station_id + +ℕ + +* + +  + +network_id + +ℕ + +* - + station_network:e->network:w - - + + - + station_network:e->station:w - - + + diff --git a/meta/sqlite/db.go b/meta/sqlite/db.go index a14de2574..a11c55a03 100644 --- a/meta/sqlite/db.go +++ b/meta/sqlite/db.go @@ -88,26 +88,54 @@ func (d DB) Init(ctx context.Context, list []meta.TableList) error { if err := d.prepare(ctx, tx, placenameInsert(), columns(l, placenameFields(), nil, "")...); err != nil { return err } - case "Asset": - if err := d.exec(ctx, tx, makeCreate); err != nil { - return err - } - if err := d.prepare(ctx, tx, makeInsert(), columns(l, makeFields(), nil, "")...); err != nil { - return err - } - if err := d.exec(ctx, tx, modelCreate); err != nil { - return err - } - if err := d.prepare(ctx, tx, modelInsert(), columns(l, modelFields(), nil, "")...); err != nil { - return err - } - if err := d.exec(ctx, tx, assetCreate); err != nil { - return err - } - if err := d.prepare(ctx, tx, assetInsert(), columns(l, assetFields(), nil, "")...); err != nil { - return err - } */ + case "Asset": + if err := d.exec(ctx, tx, makeCreate); err != nil { + return err + } + if err := d.prepare(ctx, tx, mmake.Insert(), mmake.Columns(l)...); err != nil { + return err + } + if err := d.exec(ctx, tx, modelCreate); err != nil { + return err + } + if err := d.prepare(ctx, tx, model.Insert(), model.Columns(l)...); err != nil { + return err + } + if err := d.exec(ctx, tx, asset.Create); err != nil { + return err + } + if err := d.prepare(ctx, tx, asset.Insert(), asset.Columns(l)...); err != nil { + return err + } + case "Firmware": + if err := d.exec(ctx, tx, firmware.Create); err != nil { + return err + } + if err := d.prepare(ctx, tx, firmware.Insert(), firmware.Columns(l)...); err != nil { + return err + } + case "Calibration": + if err := d.exec(ctx, tx, calibration.Create); err != nil { + return err + } + if err := d.prepare(ctx, tx, calibration.Insert(), calibration.Columns(l)...); err != nil { + return err + } + case "Channel": + if err := d.exec(ctx, tx, channel.Create); err != nil { + return err + } + if err := d.prepare(ctx, tx, channel.Insert(), channel.Columns(l)...); err != nil { + return err + } + case "Component": + if err := d.exec(ctx, tx, component.Create); err != nil { + return err + } + if err := d.prepare(ctx, tx, component.Insert(), component.Columns(l)...); err != nil { + return err + } case "Network": if err := d.exec(ctx, tx, network.Create); err != nil { return err @@ -252,13 +280,6 @@ func (d DB) Init(ctx context.Context, list []meta.TableList) error { if err := d.prepare(ctx, tx, monumentInsert(), columns(l, monumentFields(), nil, "")...); err != nil { return err } - case "Firmware": - if err := d.exec(ctx, tx, firmwareCreate); err != nil { - return err - } - if err := d.prepare(ctx, tx, firmwareInsert(), columns(l, firmwareFields(), nil, "")...); err != nil { - return err - } case "Visibility": if err := d.exec(ctx, tx, visibilityCreate); err != nil { return err @@ -380,20 +401,6 @@ func (d DB) Init(ctx context.Context, list []meta.TableList) error { if err := d.prepare(ctx, tx, streamInsert(), columns(l, streamFields(), nil, "")...); err != nil { return err } - case "Channel": - if err := d.exec(ctx, tx, channelCreate); err != nil { - return err - } - if err := d.prepare(ctx, tx, channelInsert(), columns(l, channelFields(), nil, "")...); err != nil { - return err - } - case "Component": - if err := d.exec(ctx, tx, componentCreate); err != nil { - return err - } - if err := d.prepare(ctx, tx, componentInsert(), columns(l, componentFields(), nil, "")...); err != nil { - return err - } case "Connection": if err := d.prepare(ctx, tx, placeRoleInsert(), columns(l, placeRoleFields(), nil, "")...); err != nil { return err @@ -411,13 +418,6 @@ func (d DB) Init(ctx context.Context, list []meta.TableList) error { if err := d.prepare(ctx, tx, citationInsert(), columns(l, citationFields(), nil, "")...); err != nil { return err } - case "Calibration": - if err := d.exec(ctx, tx, calibrationCreate); err != nil { - return err - } - if err := d.prepare(ctx, tx, calibrationInsert(), columns(l, calibrationFields(), nil, "")...); err != nil { - return err - } case "Gauge": if err := d.exec(ctx, tx, gaugeCreate); err != nil { return err