diff --git a/agents/drivers/xugu/main.go b/agents/drivers/xugu/main.go index 6a69ad65fa..a125d90ba6 100644 --- a/agents/drivers/xugu/main.go +++ b/agents/drivers/xugu/main.go @@ -304,12 +304,13 @@ type tableInfo struct { } type objectInfo struct { - Name string `json:"name"` - ObjectType string `json:"object_type"` - Schema string `json:"schema"` - Comment *string `json:"comment"` - Valid *bool `json:"valid,omitempty"` - XuguTypeMembersExpandable *bool `json:"xugu_type_members_expandable,omitempty"` + Name string `json:"name"` + ObjectType string `json:"object_type"` + Schema string `json:"schema"` + Comment *string `json:"comment"` + Valid *bool `json:"valid,omitempty"` + Trigger *triggerInfo `json:"trigger,omitempty"` + XuguTypeMembersExpandable *bool `json:"xugu_type_members_expandable,omitempty"` } type metadataListConstraints struct { @@ -491,9 +492,16 @@ type xuguPartitionInfo struct { } type triggerInfo struct { - Name string `json:"name"` - Event string `json:"event"` - Timing string `json:"timing"` + Name string `json:"name"` + Event string `json:"event"` + Timing string `json:"timing"` + Level string `json:"level"` + Condition *string `json:"condition,omitempty"` + Language *string `json:"language,omitempty"` + Enabled *bool `json:"enabled,omitempty"` + Valid *bool `json:"valid,omitempty"` + Comment *string `json:"comment,omitempty"` + CreatedAt *string `json:"created_at,omitempty"` } type server struct { @@ -1867,6 +1875,9 @@ func (s *server) listObjects(schema string, constraints metadataListConstraints) if err != nil { return nil, err } + if isOnlyXuguObjectType(constraints, "TRIGGER") { + return s.listSchemaTriggers(schema, constraints) + } query := xuguListObjectsQuery(schema, constraints) rows, err := s.queryRows(query.SQL, query.Args) if err != nil { @@ -1937,6 +1948,61 @@ func (s *server) listObjects(schema string, constraints metadataListConstraints) return readXuguObjectRows(rows, schema) } +func isOnlyXuguObjectType(constraints metadataListConstraints, objectType string) bool { + objectTypes := normalizedXuguObjectTypes(constraints.ObjectTypes) + return len(objectTypes) == 1 && objectTypes[0] == objectType +} + +func (s *server) listSchemaTriggers(schema string, constraints metadataListConstraints) ([]objectInfo, error) { + query := xuguSchemaTriggersQuery(schema, constraints) + rows, err := s.queryRows(query.SQL, query.Args) + if err != nil { + if isXuguMetadataUnavailableError(err) { + return []objectInfo{}, nil + } + return nil, err + } + defer s.closeRows(rows) + + var result []objectInfo + for rows.Next() { + var item objectInfo + var event, timing, level, condition, language, enabled, valid, comment, createdAt any + if err := rows.Scan(&item.Name, &item.ObjectType, &comment, &valid, &event, &timing, &level, &condition, &language, &enabled, &createdAt); err != nil { + return nil, err + } + item.Schema = schema + item.Comment = optionalString(xuguString(comment)) + item.Valid = optionalBool(valid) + item.Trigger = &triggerInfo{ + Name: item.Name, + Event: triggerEventName(event), + Timing: triggerTimingName(timing), + Level: triggerLevelName(level), + Condition: optionalString(xuguString(condition)), + Language: optionalString(xuguString(language)), + Enabled: optionalBool(enabled), + Valid: item.Valid, + Comment: item.Comment, + CreatedAt: optionalString(xuguString(createdAt)), + } + result = append(result, item) + } + return emptyIfNil(result), rows.Err() +} + +func xuguSchemaTriggersQuery(schema string, constraints metadataListConstraints) xuguMetadataListQuery { + return xuguConstrainedMetadataListQuery(` +SELECT tr.TRIG_NAME AS OBJECT_NAME, 'TRIGGER' AS OBJECT_TYPE, tr.COMMENTS, tr.VALID, + tr.TRIG_EVENT, tr.TRIG_TIME, tr.TRIG_TYPE, tr.TRIG_COND, tr.LANGUAGE, tr.ENABLE, tr.CREATE_TIME +FROM ALL_TRIGGERS tr +JOIN ALL_SCHEMAS s ON s.DB_ID = tr.DB_ID AND s.SCHEMA_ID = tr.SCHEMA_ID +WHERE s.DB_ID = CURRENT_DB_ID + AND UPPER(s.SCHEMA_NAME) = UPPER(?)`, + "OBJECT_NAME, OBJECT_TYPE, COMMENTS, VALID, TRIG_EVENT, TRIG_TIME, TRIG_TYPE, TRIG_COND, LANGUAGE, ENABLE, CREATE_TIME", + "OBJECT_NAME", "OBJECT_TYPE", []any{schema}, constraints) +} + func readXuguObjectRows(rows *sql.Rows, schema string) ([]objectInfo, error) { var result []objectInfo for rows.Next() { @@ -2531,7 +2597,8 @@ func (s *server) listTriggers(schema, table string) ([]triggerInfo, error) { } table = strings.ToUpper(strings.TrimSpace(table)) rows, err := s.queryRows(` -SELECT tr.TRIG_NAME, tr.TRIG_EVENT, tr.TRIG_TIME +SELECT tr.TRIG_NAME, tr.TRIG_EVENT, tr.TRIG_TIME, tr.TRIG_TYPE, + tr.TRIG_COND, tr.LANGUAGE, tr.ENABLE, tr.VALID, tr.COMMENTS, tr.CREATE_TIME FROM ALL_TRIGGERS tr JOIN ALL_TABLES t ON t.DB_ID = tr.DB_ID AND t.TABLE_ID = tr.OBJ_ID JOIN ALL_SCHEMAS s ON s.DB_ID = t.DB_ID AND s.SCHEMA_ID = t.SCHEMA_ID @@ -2549,12 +2616,19 @@ ORDER BY tr.TRIG_NAME`, []any{schema, table}) var result []triggerInfo for rows.Next() { var item triggerInfo - var event, timing any - if err := rows.Scan(&item.Name, &event, &timing); err != nil { + var event, timing, level, condition, language, enabled, valid, comment, createdAt any + if err := rows.Scan(&item.Name, &event, &timing, &level, &condition, &language, &enabled, &valid, &comment, &createdAt); err != nil { return nil, err } item.Event = triggerEventName(event) item.Timing = triggerTimingName(timing) + item.Level = triggerLevelName(level) + item.Condition = optionalString(xuguString(condition)) + item.Language = optionalString(xuguString(language)) + item.Enabled = optionalBool(enabled) + item.Valid = optionalBool(valid) + item.Comment = optionalString(xuguString(comment)) + item.CreatedAt = optionalString(xuguString(createdAt)) result = append(result, item) } return emptyIfNil(result), rows.Err() @@ -4265,6 +4339,14 @@ func optionalString(value string) *string { return &value } +func optionalBool(value any) *bool { + if normalizeValue(value) == nil { + return nil + } + result := truthy(value) + return &result +} + func xuguPartitionType(value int) string { switch value { case 1: @@ -4869,6 +4951,17 @@ func triggerTimingName(value any) string { } } +func triggerLevelName(value any) string { + switch fmt.Sprint(normalizeValue(value)) { + case "1": + return "FOR EACH ROW" + case "2": + return "FOR STATEMENT" + default: + return fmt.Sprint(normalizeValue(value)) + } +} + func joinValues(values []any, sep string) string { parts := make([]string, len(values)) for i, value := range values { diff --git a/agents/drivers/xugu/main_test.go b/agents/drivers/xugu/main_test.go index 4fe4b4b913..e23c19da8c 100644 --- a/agents/drivers/xugu/main_test.go +++ b/agents/drivers/xugu/main_test.go @@ -903,6 +903,58 @@ func TestTableChildMetadataPresentationHelpers(t *testing.T) { if got := xuguAutoPartitionUnit(2); got != "MONTH" { t.Fatalf("auto partition unit = %q", got) } + if got := triggerLevelName(int64(1)); got != "FOR EACH ROW" { + t.Fatalf("row trigger level = %q", got) + } + if got := triggerLevelName(int64(2)); got != "FOR STATEMENT" { + t.Fatalf("statement trigger level = %q", got) + } +} + +func TestListTriggersReturnsXuguTriggerDetails(t *testing.T) { + db, err := sql.Open("xugu-test-trigger-details", "") + if err != nil { + t.Fatal(err) + } + defer db.Close() + + s := newServer() + s.db = db + s.params.Database = "TEST_DB" + + triggers, err := s.listTriggers("APP", "EVENTS") + if err != nil { + t.Fatalf("listTriggers: %v", err) + } + if len(triggers) != 2 { + t.Fatalf("trigger count = %d, want 2", len(triggers)) + } + row := triggers[0] + if row.Name != "TR_EVENTS_ROW" || row.Timing != "BEFORE" || row.Event != "INSERT OR UPDATE" || row.Level != "FOR EACH ROW" { + t.Fatalf("unexpected row trigger identity: %#v", row) + } + if row.Condition == nil || *row.Condition != "NEW_VALUE >= 0" || row.Language == nil || *row.Language != "PL/SQL" { + t.Fatalf("unexpected row trigger metadata: %#v", row) + } + if row.Enabled == nil || !*row.Enabled || row.Valid == nil || !*row.Valid { + t.Fatalf("expected enabled valid row trigger: %#v", row) + } + if row.Comment == nil || *row.Comment != "row audit trigger" || row.CreatedAt == nil || *row.CreatedAt != "2026-08-10 09:30:00" { + t.Fatalf("unexpected row trigger annotation metadata: %#v", row) + } + + statement := triggers[1] + if statement.Level != "FOR STATEMENT" || statement.Enabled == nil || *statement.Enabled || statement.Valid == nil || *statement.Valid { + t.Fatalf("expected disabled invalid statement trigger: %#v", statement) + } + + objects, err := s.listObjects("APP", metadataListConstraints{ObjectTypes: []string{"TRIGGER"}}) + if err != nil { + t.Fatalf("listObjects triggers: %v", err) + } + if len(objects) != 2 || objects[0].Trigger == nil || objects[0].Trigger.Level != "FOR EACH ROW" || objects[0].Valid == nil || !*objects[0].Valid { + t.Fatalf("unexpected schema trigger objects: %#v", objects) + } } func TestTableChildMetadataRPCsReturnCatalogObjects(t *testing.T) { @@ -2155,6 +2207,7 @@ func init() { sql.Register("xugu-test-permission-metadata", &xuguPermissionMetadataDriver{}) sql.Register("xugu-test-fallback-errors", &xuguFallbackErrorDriver{}) sql.Register("xugu-test-eof", &xuguEOFDriver{}) + sql.Register("xugu-test-trigger-details", &xuguTriggerDetailsDriver{}) } type xuguEOFDriver struct{} @@ -2739,6 +2792,47 @@ func (c *xuguTableObjectsConn) QueryContext(_ context.Context, query string, _ [ } } +type xuguTriggerDetailsDriver struct{} + +func (d *xuguTriggerDetailsDriver) Open(name string) (driver.Conn, error) { + return &xuguTriggerDetailsConn{}, nil +} + +type xuguTriggerDetailsConn struct{} + +func (c *xuguTriggerDetailsConn) Prepare(query string) (driver.Stmt, error) { + return nil, errors.New("not supported") +} +func (c *xuguTriggerDetailsConn) Close() error { return nil } +func (c *xuguTriggerDetailsConn) Begin() (driver.Tx, error) { return nil, errors.New("not supported") } +func (c *xuguTriggerDetailsConn) QueryContext(_ context.Context, query string, _ []driver.NamedValue) (driver.Rows, error) { + upper := strings.ToUpper(query) + if !strings.Contains(upper, "FROM ALL_TRIGGERS") || !strings.Contains(upper, "CURRENT_DB_ID") { + return nil, fmt.Errorf("unexpected trigger details query: %s", query) + } + for _, column := range []string{"TRIG_TYPE", "TRIG_COND", "LANGUAGE", "ENABLE", "VALID", "COMMENTS", "CREATE_TIME"} { + if !strings.Contains(upper, column) { + return nil, fmt.Errorf("trigger details query omits %s: %s", column, query) + } + } + if strings.Contains(upper, "JOIN ALL_TABLES") { + return &xuguStaticRows{ + columns: []string{"TRIG_NAME", "TRIG_EVENT", "TRIG_TIME", "TRIG_TYPE", "TRIG_COND", "LANGUAGE", "ENABLE", "VALID", "COMMENTS", "CREATE_TIME"}, + values: [][]driver.Value{ + {"TR_EVENTS_ROW", int64(3), int64(1), int64(1), "NEW_VALUE >= 0", "PL/SQL", true, true, "row audit trigger", "2026-08-10 09:30:00"}, + {"TR_EVENTS_STATEMENT", int64(4), int64(4), int64(2), nil, "PL/SQL", false, false, nil, nil}, + }, + }, nil + } + return &xuguStaticRows{ + columns: []string{"OBJECT_NAME", "OBJECT_TYPE", "COMMENTS", "VALID", "TRIG_EVENT", "TRIG_TIME", "TRIG_TYPE", "TRIG_COND", "LANGUAGE", "ENABLE", "CREATE_TIME"}, + values: [][]driver.Value{ + {"TR_EVENTS_ROW", "TRIGGER", "row audit trigger", true, int64(3), int64(1), int64(1), "NEW_VALUE >= 0", "PL/SQL", true, "2026-08-10 09:30:00"}, + {"TR_EVENTS_STATEMENT", "TRIGGER", nil, false, int64(4), int64(4), int64(2), nil, "PL/SQL", false, nil}, + }, + }, nil +} + type xuguLegacyColumnsDriver struct{} func (d *xuguLegacyColumnsDriver) Open(name string) (driver.Conn, error) { diff --git a/agents/drivers/xugu/trigger_live_test.go b/agents/drivers/xugu/trigger_live_test.go new file mode 100644 index 0000000000..dd37b6fb6c --- /dev/null +++ b/agents/drivers/xugu/trigger_live_test.go @@ -0,0 +1,114 @@ +package main + +import ( + "os" + "testing" +) + +// TestLiveTriggerDetails verifies the metadata shape against a real XuguDB +// server. It is opt-in because the public CI has no XuguDB service. Set +// XUGU_LIVE_TEST=1 and the XUGU_LIVE_* connection variables to run it. +func TestLiveTriggerDetails(t *testing.T) { + if os.Getenv("XUGU_LIVE_TEST") != "1" { + t.Skip("set XUGU_LIVE_TEST=1 to run against a real XuguDB server") + } + params := connectParams{ + Host: os.Getenv("XUGU_LIVE_HOST"), + Port: parsePort(os.Getenv("XUGU_LIVE_PORT")), + Database: os.Getenv("XUGU_LIVE_DATABASE"), + Username: os.Getenv("XUGU_LIVE_USERNAME"), + Password: os.Getenv("XUGU_LIVE_PASSWORD"), + } + if params.Host == "" || params.Database == "" || params.Username == "" || params.Password == "" { + t.Fatal("XUGU_LIVE_HOST, XUGU_LIVE_DATABASE, XUGU_LIVE_USERNAME, and XUGU_LIVE_PASSWORD are required") + } + + s := newServer() + db, err := openDB(params) + if err != nil { + t.Fatal(err) + } + s.db = db + s.params = params + s.currentDatabase = params.Database + defer s.disconnect() + + const source = "DBX_TRIGGER_METADATA_LIVE" + const audit = "DBX_TRIGGER_METADATA_AUDIT" + const rowTrigger = "DBX_TRIGGER_METADATA_ROW" + const statementTrigger = "DBX_TRIGGER_METADATA_STATEMENT" + for _, statement := range []string{ + "DROP TRIGGER IF EXISTS " + rowTrigger, + "DROP TRIGGER IF EXISTS " + statementTrigger, + "DROP TABLE IF EXISTS " + audit, + "DROP TABLE IF EXISTS " + source, + } { + if err := s.execWithReconnect(statement); err != nil { + t.Fatal(err) + } + } + defer func() { + for _, statement := range []string{ + "DROP TRIGGER IF EXISTS " + rowTrigger, + "DROP TRIGGER IF EXISTS " + statementTrigger, + "DROP TABLE IF EXISTS " + audit, + "DROP TABLE IF EXISTS " + source, + } { + _ = s.execWithReconnect(statement) + } + }() + + for _, statement := range []string{ + "CREATE TABLE " + source + " (ID INTEGER, NEW_VALUE INTEGER)", + "CREATE TABLE " + audit + " (ID INTEGER)", + "CREATE OR REPLACE TRIGGER " + rowTrigger + " BEFORE INSERT OR UPDATE ON " + source + " FOR EACH ROW WHEN (NEW_VALUE >= 0) COMMENT 'row metadata regression' BEGIN INSERT INTO " + audit + " VALUES (NEW.ID); END", + "CREATE OR REPLACE TRIGGER " + statementTrigger + " AFTER DELETE ON " + source + " FOR STATEMENT COMMENT 'statement metadata regression' BEGIN INSERT INTO " + audit + " VALUES (0); END", + "ALTER TRIGGER " + statementTrigger + " DISABLE", + } { + if err := s.execWithReconnect(statement); err != nil { + t.Fatal(err) + } + } + + triggers, err := s.listTriggers(params.Username, source) + if err != nil { + t.Fatal(err) + } + byName := make(map[string]triggerInfo, len(triggers)) + for _, trigger := range triggers { + byName[trigger.Name] = trigger + } + + row, ok := byName[rowTrigger] + if !ok { + t.Fatalf("row trigger not listed: %#v", triggers) + } + if row.Timing != "BEFORE" || row.Event != "INSERT OR UPDATE" || row.Level != "FOR EACH ROW" || row.Condition == nil || *row.Condition == "" || row.Comment == nil || *row.Comment != "row metadata regression" || row.Enabled == nil || !*row.Enabled || row.Valid == nil || !*row.Valid || row.CreatedAt == nil || *row.CreatedAt == "" { + t.Fatalf("unexpected row trigger metadata: %#v", row) + } + + statement, ok := byName[statementTrigger] + if !ok { + t.Fatalf("statement trigger not listed: %#v", triggers) + } + if statement.Timing != "AFTER" || statement.Event != "DELETE" || statement.Level != "FOR STATEMENT" || statement.Comment == nil || *statement.Comment != "statement metadata regression" || statement.Enabled == nil || *statement.Enabled || statement.Valid == nil || !*statement.Valid || statement.CreatedAt == nil || *statement.CreatedAt == "" { + t.Fatalf("unexpected statement trigger metadata: %#v", statement) + } + + objects, err := s.listObjects(params.Username, metadataListConstraints{ObjectTypes: []string{"TRIGGER"}}) + if err != nil { + t.Fatal(err) + } + objectByName := make(map[string]objectInfo, len(objects)) + for _, object := range objects { + objectByName[object.Name] = object + } + rowObject, ok := objectByName[rowTrigger] + if !ok || rowObject.Trigger == nil || rowObject.Trigger.Level != "FOR EACH ROW" || rowObject.Trigger.Condition == nil || *rowObject.Trigger.Condition == "" || rowObject.Valid == nil || !*rowObject.Valid { + t.Fatalf("unexpected schema-tree row trigger metadata: %#v", rowObject) + } + statementObject, ok := objectByName[statementTrigger] + if !ok || statementObject.Trigger == nil || statementObject.Trigger.Level != "FOR STATEMENT" || statementObject.Trigger.Enabled == nil || *statementObject.Trigger.Enabled || statementObject.Valid == nil || !*statementObject.Valid { + t.Fatalf("unexpected schema-tree statement trigger metadata: %#v", statementObject) + } +} diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vue index 7da275d6b9..f58611f64d 100644 --- a/apps/desktop/src/components/sidebar/TreeItem.vue +++ b/apps/desktop/src/components/sidebar/TreeItem.vue @@ -49,7 +49,7 @@ import { Badge } from "@/components/ui/badge"; import { Input } from "@/components/ui/input"; import { Switch } from "@/components/ui/switch"; import LightTooltip from "@/components/ui/LightTooltip.vue"; -import type { ColumnInfo, ConnectionConfig, DatabaseType, TreeNode } from "@/types/database"; +import type { ColumnInfo, ConnectionConfig, DatabaseType, TreeNode, TriggerInfo } from "@/types/database"; import { alignedCommentLeadingWidth, canTreeNodePin, canTreeNodeShowExpander, sidebarTreeNodeComment, trailingCommentAvailableWidth, trailingCommentGapPx, treeItemPaddingLeft, treeLabelWidthClass, usesFullWidthTreeLabel } from "@/lib/sidebar/sidebarTreeItemLayout"; import { clearActiveTableReferencePayload, createTableReferencePayload, createTableReferenceDropEvent, setActiveTableReferencePayload, type QueryEditorTableReferencePayload } from "@/lib/editor/queryEditorTableDrop"; import { formatSidebarObjectStorage } from "@/lib/sidebar/sidebarDatabaseStorage"; @@ -451,6 +451,24 @@ const detailTooltip = computed(() => { ].filter((row) => row.value); return { rows }; } + if (node.type === "trigger" && node.meta && node.connectionId && effectiveDatabaseTypeForConnection(connectionStore.getConfig(node.connectionId)) === "xugu") { + const trigger = node.meta as TriggerInfo; + const hasXuguDetails = trigger.level != null || trigger.condition != null || trigger.language != null || trigger.enabled != null || trigger.valid != null || trigger.created_at != null || trigger.comment != null; + if (!hasXuguDetails) return null; + const rows: DetailTooltipRow[] = [ + { label: t("objects.name"), value: visibleLabel(node) }, + { label: t("objects.triggerTiming"), value: cleanTooltipValue(trigger.timing) }, + { label: t("objects.triggerEvent"), value: cleanTooltipValue(trigger.event) }, + { label: t("objects.triggerLevel"), value: cleanTooltipValue(trigger.level) }, + { label: t("objects.triggerStatus"), value: trigger.enabled == null ? "" : t(trigger.enabled ? "objects.enabled" : "objects.disabled") }, + { label: t("objects.validity"), value: trigger.valid == null ? "" : t(trigger.valid ? "objects.valid" : "objects.invalid") }, + { label: t("objects.triggerCondition"), value: cleanTooltipValue(trigger.condition), multiline: true }, + { label: t("objects.triggerLanguage"), value: cleanTooltipValue(trigger.language) }, + { label: t("objects.createdAt"), value: cleanTooltipValue(trigger.created_at) }, + { label: t("objects.comment"), value: cleanTooltipValue(trigger.comment), multiline: true }, + ].filter((row) => row.value); + return rows.length ? { rows } : null; + } const comment = node.type === "column" && node.meta && "comment" in node.meta ? (node.meta as ColumnInfo).comment : node.comment; if (!comment || (node.type !== "schema" && node.type !== "table" && node.type !== "view" && node.type !== "column")) return null; const rows: DetailTooltipRow[] = [ diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts index b518db964b..e45205f4b6 100644 --- a/apps/desktop/src/i18n/locales/en.ts +++ b/apps/desktop/src/i18n/locales/en.ts @@ -3061,6 +3061,17 @@ export default { procedure: "Procedure", function: "Function", trigger: "Trigger", + triggerTiming: "Timing", + triggerEvent: "Event", + triggerLevel: "Level", + triggerStatus: "Status", + triggerCondition: "Condition", + triggerLanguage: "Language", + enabled: "Enabled", + disabled: "Disabled", + validity: "Validity", + valid: "Valid", + invalid: "Invalid", sequence: "Sequence", package: "Package", packageBody: "Package Body", diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts index 251bebc75c..7348c4ff5e 100644 --- a/apps/desktop/src/i18n/locales/es.ts +++ b/apps/desktop/src/i18n/locales/es.ts @@ -2960,6 +2960,17 @@ export default withEnglishFallback({ trigger: "disparador", typeDefinition: "definición de tipo", typeBody: "cuerpo de tipo", + triggerTiming: "momento de activación", + triggerEvent: "evento de activación", + triggerLevel: "nivel de activación", + triggerStatus: "estado", + triggerCondition: "condición", + triggerLanguage: "idioma", + enabled: "habilitado", + disabled: "deshabilitado", + validity: "validez", + valid: "válido", + invalid: "inválido", }, structureEditor: { mysqlDataTypeHelp: { diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts index 77b9356254..51f4709ff4 100644 --- a/apps/desktop/src/i18n/locales/it.ts +++ b/apps/desktop/src/i18n/locales/it.ts @@ -2958,6 +2958,17 @@ export default withEnglishFallback({ trigger: "Trigger", typeDefinition: "Definizione del tipo", typeBody: "Corpo del tipo", + triggerTiming: "momento di attivazione", + triggerEvent: "evento trigger", + triggerLevel: "livello di attivazione", + triggerStatus: "stato", + triggerCondition: "condizione", + triggerLanguage: "lingua", + enabled: "abilitato", + disabled: "disabilitato", + validity: "validità", + valid: "valido", + invalid: "non valido", }, structureEditor: { mysqlDataTypeHelp: { diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts index fa377746ca..d437607c89 100644 --- a/apps/desktop/src/i18n/locales/ja.ts +++ b/apps/desktop/src/i18n/locales/ja.ts @@ -3020,6 +3020,17 @@ export default withEnglishFallback({ trigger: "トリガー", typeDefinition: "タイプ", typeBody: "タイプ本体", + triggerTiming: "トリガータイミング", + triggerEvent: "トリガーイベント", + triggerLevel: "トリガーレベル", + triggerStatus: "状態", + triggerCondition: "条件", + triggerLanguage: "言語", + enabled: "有効", + disabled: "無効", + validity: "有効性", + valid: "有効", + invalid: "無効", }, structureEditor: { mysqlDataTypeHelp: { diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts index 31d9a90b49..daeb6867e7 100644 --- a/apps/desktop/src/i18n/locales/pt-BR.ts +++ b/apps/desktop/src/i18n/locales/pt-BR.ts @@ -2960,6 +2960,17 @@ export default withEnglishFallback({ trigger: "Gatilho", typeDefinition: "Definição de tipo", typeBody: "Corpo do tipo", + triggerTiming: "Momento do gatilho", + triggerEvent: "Evento do gatilho", + triggerLevel: "Nível do gatilho", + triggerStatus: "Status", + triggerCondition: "Condição", + triggerLanguage: "Idioma", + enabled: "Habilitado", + disabled: "Desabilitado", + validity: "Validade", + valid: "Válido", + invalid: "Inválido", }, structureEditor: { mysqlDataTypeHelp: { diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts index f8f88d3fdb..27a285c50f 100644 --- a/apps/desktop/src/i18n/locales/zh-CN.ts +++ b/apps/desktop/src/i18n/locales/zh-CN.ts @@ -2985,6 +2985,17 @@ export default withEnglishFallback({ procedure: "存储过程", function: "函数", trigger: "触发器", + triggerTiming: "触发时机", + triggerEvent: "触发事件", + triggerLevel: "触发级别", + triggerStatus: "状态", + triggerCondition: "条件", + triggerLanguage: "语言", + enabled: "启用", + disabled: "禁用", + validity: "有效性", + valid: "有效", + invalid: "无效", sequence: "序列", package: "包", packageBody: "包体", diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts index 62ce73d0ba..96fc53aab0 100644 --- a/apps/desktop/src/i18n/locales/zh-TW.ts +++ b/apps/desktop/src/i18n/locales/zh-TW.ts @@ -2828,6 +2828,17 @@ export default withEnglishFallback({ trigger: "觸發器", typeDefinition: "類型", typeBody: "類型體", + triggerTiming: "觸發時機", + triggerEvent: "觸發事件", + triggerLevel: "觸發級別", + triggerStatus: "狀態", + triggerCondition: "條件", + triggerLanguage: "語言", + enabled: "啟用", + disabled: "停用", + validity: "有效性", + valid: "有效", + invalid: "無效", }, structureEditor: { mysqlDataTypeHelp: { diff --git a/apps/desktop/src/lib/__tests__/table/tableTree.spec.ts b/apps/desktop/src/lib/__tests__/table/tableTree.spec.ts index 2e9f74fe12..c81681a8ad 100644 --- a/apps/desktop/src/lib/__tests__/table/tableTree.spec.ts +++ b/apps/desktop/src/lib/__tests__/table/tableTree.spec.ts @@ -116,6 +116,37 @@ describe("programmable database objects", () => { ); }); + it("preserves Xugu trigger details for the schema trigger group", () => { + const trigger = { + name: "TRG_AUDIT", + event: "INSERT OR UPDATE", + timing: "BEFORE", + level: "FOR EACH ROW", + enabled: false, + valid: false, + condition: "NEW_VALUE >= 0", + language: "PL/SQL", + comment: "row audit trigger", + created_at: "2026-08-10 09:30:00", + }; + const groups = buildGroupedObjectTreeNodes({ + ...context, + schema: "APP", + objects: [{ name: trigger.name, object_type: "TRIGGER", schema: "APP", valid: false, comment: trigger.comment, trigger }], + }); + const triggerGroup = groups.find((node) => node.type === "group-triggers"); + + expect(triggerGroup?.children).toEqual([ + expect.objectContaining({ + type: "trigger", + objectName: trigger.name, + valid: false, + comment: trigger.comment, + meta: trigger, + }), + ]); + }); + it("groups Xugu private synonyms as source objects", () => { const objects: ObjectInfo[] = [{ name: "SYN_SHOP_USERS", object_type: "SYNONYM", schema: "SYSDBA", valid: true }]; diff --git a/apps/desktop/src/lib/table/tableTree.ts b/apps/desktop/src/lib/table/tableTree.ts index 87b4869581..d28bf6d16b 100644 --- a/apps/desktop/src/lib/table/tableTree.ts +++ b/apps/desktop/src/lib/table/tableTree.ts @@ -587,6 +587,7 @@ export function buildSimpleObjectTreeNodes({ nodeId, connectionId, database, sch signature: signature || undefined, comment: obj.comment, valid: obj.valid ?? undefined, + meta: objectType === "TRIGGER" ? (obj.trigger ?? undefined) : undefined, xuguTypeMembersExpandable: objectType === "TYPE" && obj.xugu_type_members_expandable === true, connectionId, database, @@ -761,6 +762,7 @@ export function buildGroupedObjectTreeNodes({ nodeId, connectionId, database, sc signature: signature || undefined, comment: obj.comment, valid: obj.valid ?? undefined, + meta: objectType === "TRIGGER" ? (obj.trigger ?? undefined) : undefined, xuguTypeMembersExpandable: objectType === "TYPE" && obj.xugu_type_members_expandable === true, connectionId, database, diff --git a/apps/desktop/src/stores/__tests__/connectionStore.xuguTableChildren.spec.ts b/apps/desktop/src/stores/__tests__/connectionStore.xuguTableChildren.spec.ts index bf2f563d25..7b14f4aae0 100644 --- a/apps/desktop/src/stores/__tests__/connectionStore.xuguTableChildren.spec.ts +++ b/apps/desktop/src/stores/__tests__/connectionStore.xuguTableChildren.spec.ts @@ -42,6 +42,7 @@ async function setup(dbType: ConnectionConfig["db_type"], overrides: Record { expect(partitions.isExpanded).toBe(false); expect(partitions.children).toEqual([]); }); + + it("shows Xugu trigger level and status without changing other database labels", async () => { + const trigger = { + name: "TR_EVENTS_ROW", + timing: "BEFORE", + event: "INSERT", + level: "FOR EACH ROW", + enabled: false, + valid: false, + condition: "NEW_VALUE >= 0", + language: "PL/SQL", + comment: "row audit trigger", + created_at: "2026-08-10 09:30:00", + }; + const xugu = await setup("xugu", { listTriggers: vi.fn().mockResolvedValue([trigger]) }); + const xuguGroup = findNode(xugu.store.treeNodes, `${xugu.tableId}:__triggers`)!; + await xugu.store.loadTreeNodeChildren(xuguGroup); + + expect(xugu.api.listTriggers).toHaveBeenCalledWith(xugu.config.id, "SHOP_DEMO", "SYSDBA", "SHOP_ORDERS", undefined); + expect(xuguGroup.children?.[0]).toMatchObject({ + type: "trigger", + label: "TR_EVENTS_ROW (BEFORE · INSERT · FOR EACH ROW · Disabled · Invalid)", + valid: false, + comment: "row audit trigger", + meta: trigger, + }); + + vi.resetModules(); + setActivePinia(createPinia()); + const postgres = await setup("postgres", { listTriggers: vi.fn().mockResolvedValue([trigger]) }); + const postgresGroup = findNode(postgres.store.treeNodes, `${postgres.tableId}:__triggers`)!; + await postgres.store.loadTreeNodeChildren(postgresGroup); + + expect(postgresGroup.children?.[0]).toMatchObject({ + type: "trigger", + label: "TR_EVENTS_ROW (BEFORE INSERT)", + meta: trigger, + }); + expect(postgresGroup.children?.[0]?.valid).toBeUndefined(); + expect(postgresGroup.children?.[0]?.comment).toBeUndefined(); + }); }); diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.ts index fe9a7a5896..117acffa31 100644 --- a/apps/desktop/src/stores/connectionStore.ts +++ b/apps/desktop/src/stores/connectionStore.ts @@ -5162,19 +5162,25 @@ export const useConnectionStore = defineStore("connection", () => { const triggers = await api.listTriggers(connectionId, database, querySchema, table, catalog); const targetNode = treeNodeLoadTarget(load); if (!targetNode) return; + const isXugu = effectiveDatabaseTypeForConnection(getConfig(connectionId)) === "xugu"; setChildren( targetNode, - triggers.map((tr) => ({ - id: `${parentId}:${tr.name}`, - label: `${tr.name} (${tr.timing} ${tr.event})`, - objectName: tr.name, - type: "trigger" as const, - connectionId, - database, - schema, - tableName: table, - meta: tr, - })), + triggers.map((tr) => { + const xuguDetails = isXugu ? [tr.timing, tr.event, tr.level, tr.enabled === false ? i18n.global.t("objects.disabled") : null, tr.valid === false ? i18n.global.t("objects.invalid") : null].filter(Boolean).join(" · ") : `${tr.timing} ${tr.event}`; + return { + id: `${parentId}:${tr.name}`, + label: `${tr.name} (${xuguDetails})`, + objectName: tr.name, + type: "trigger" as const, + connectionId, + database, + schema, + tableName: table, + comment: isXugu ? tr.comment : undefined, + valid: isXugu ? tr.valid : undefined, + meta: tr, + }; + }), ); targetNode.isExpanded = true; } catch (e) { diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts index 8e00bb333f..2e5d471f45 100644 --- a/apps/desktop/src/types/database.ts +++ b/apps/desktop/src/types/database.ts @@ -434,6 +434,7 @@ export interface ObjectInfo { updated_at?: string | null; parent_schema?: string | null; parent_name?: string | null; + trigger?: TriggerInfo | null; xugu_type_members_expandable?: boolean | null; } @@ -503,6 +504,13 @@ export interface TriggerInfo { name: string; event: string; timing: string; + level?: string | null; + condition?: string | null; + language?: string | null; + enabled?: boolean | null; + valid?: boolean | null; + comment?: string | null; + created_at?: string | null; statement?: string | null; } diff --git a/crates/dbx-core/src/database_export.rs b/crates/dbx-core/src/database_export.rs index e5172198b9..cc428da722 100644 --- a/crates/dbx-core/src/database_export.rs +++ b/crates/dbx-core/src/database_export.rs @@ -2537,6 +2537,7 @@ mod tests { updated_at: None, parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, } } diff --git a/crates/dbx-core/src/db/cloudflare_d1/mod.rs b/crates/dbx-core/src/db/cloudflare_d1/mod.rs index 3180868eb9..1d7496f84d 100644 --- a/crates/dbx-core/src/db/cloudflare_d1/mod.rs +++ b/crates/dbx-core/src/db/cloudflare_d1/mod.rs @@ -248,6 +248,13 @@ pub async fn list_triggers( name: value_as_string(row.first()).unwrap_or_default(), event: metadata.event.to_string(), timing: metadata.timing.to_string(), + level: None, + condition: None, + language: None, + enabled: None, + valid: None, + comment: None, + created_at: None, statement, } }) diff --git a/crates/dbx-core/src/db/manticoresearch.rs b/crates/dbx-core/src/db/manticoresearch.rs index 9549214a3f..a7071e6dfc 100644 --- a/crates/dbx-core/src/db/manticoresearch.rs +++ b/crates/dbx-core/src/db/manticoresearch.rs @@ -47,6 +47,7 @@ pub async fn list_objects(pool: &MySqlPool, database: &str) -> Result ObjectInfo { updated_at: get_opt_str(row, "updated_at"), parent_schema: get_opt_str(row, "parent_schema"), parent_name: get_opt_str(row, "parent_name"), + trigger: None, xugu_type_members_expandable: None, } } @@ -3230,6 +3231,7 @@ fn table_infos_to_objects( updated_at: meta.and_then(|meta| meta.updated_at.clone()), parent_schema: table.parent_schema, parent_name: table.parent_name, + trigger: None, xugu_type_members_expandable: None, } }) @@ -5198,6 +5200,13 @@ pub async fn list_triggers(pool: &MySqlPool, database: &str, table: &str) -> Res name: get_str_by_name(row, "TRIGGER_NAME"), event: get_str_by_name(row, "EVENT_MANIPULATION"), timing: get_str_by_name(row, "ACTION_TIMING"), + level: None, + condition: None, + language: None, + enabled: None, + valid: None, + comment: None, + created_at: None, statement: Some(get_str_by_name(row, "ACTION_STATEMENT")).filter(|value| !value.is_empty()), }) .collect()) @@ -5377,6 +5386,7 @@ mod tests { updated_at: None, parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, } } diff --git a/crates/dbx-core/src/db/ob_oracle.rs b/crates/dbx-core/src/db/ob_oracle.rs index c17426c69f..530df04a87 100644 --- a/crates/dbx-core/src/db/ob_oracle.rs +++ b/crates/dbx-core/src/db/ob_oracle.rs @@ -131,6 +131,7 @@ pub async fn list_objects(pool: &mysql_async::Pool, schema: &str) -> Result Result, parent_schema: row.try_get::<_, Option>(5).ok().flatten().filter(|s| !s.is_empty()), parent_name: row.try_get::<_, Option>(6).ok().flatten().filter(|s| !s.is_empty()), signature: row.try_get::<_, Option>(7).ok().flatten(), + trigger: None, xugu_type_members_expandable: None, }) .collect()) @@ -4580,6 +4581,13 @@ pub async fn list_triggers(pool: &Pool, schema: &str, table: &str) -> Result Result, updated_at: None, parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, }) .collect()) diff --git a/crates/dbx-core/src/db/rqlite_driver.rs b/crates/dbx-core/src/db/rqlite_driver.rs index ded203ea97..84e6172bef 100644 --- a/crates/dbx-core/src/db/rqlite_driver.rs +++ b/crates/dbx-core/src/db/rqlite_driver.rs @@ -238,6 +238,13 @@ pub async fn list_triggers(client: &RqliteClient, _schema: &str, table: &str) -> name: value_as_string(row.first()).unwrap_or_default(), event: event.to_string(), timing: timing.to_string(), + level: None, + condition: None, + language: None, + enabled: None, + valid: None, + comment: None, + created_at: None, statement: value_as_string(row.get(1)), } }) diff --git a/crates/dbx-core/src/db/sqlite.rs b/crates/dbx-core/src/db/sqlite.rs index ba9ac08532..1d98a48c8d 100644 --- a/crates/dbx-core/src/db/sqlite.rs +++ b/crates/dbx-core/src/db/sqlite.rs @@ -2345,6 +2345,13 @@ pub async fn list_triggers(pool: &SqliteHandle, schema: &str, table: &str) -> Re name: row.get("name")?, event: event.to_string(), timing: timing.to_string(), + level: None, + condition: None, + language: None, + enabled: None, + valid: None, + comment: None, + created_at: None, statement: sql_text, }) }) diff --git a/crates/dbx-core/src/db/sqlserver.rs b/crates/dbx-core/src/db/sqlserver.rs index 80fa011fb9..7a1ade4337 100644 --- a/crates/dbx-core/src/db/sqlserver.rs +++ b/crates/dbx-core/src/db/sqlserver.rs @@ -2324,6 +2324,7 @@ pub async fn list_objects(client: &mut SqlServerClient, schema: &str) -> Result< updated_at: row.get::(3).map(|value| value.to_string()), parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, }) .collect()) @@ -2697,6 +2698,13 @@ pub async fn list_triggers( name: row.get::<&str, _>(0).unwrap_or("").to_string(), event: row.get::<&str, _>(1).unwrap_or("").to_string(), timing: row.get::<&str, _>(2).unwrap_or("AFTER").to_string(), + level: None, + condition: None, + language: None, + enabled: None, + valid: None, + comment: None, + created_at: None, statement: row.get::<&str, _>(3).map(str::to_string), }) .collect()) diff --git a/crates/dbx-core/src/db/turso_driver.rs b/crates/dbx-core/src/db/turso_driver.rs index 5e5eb7faaa..15e31a5e82 100644 --- a/crates/dbx-core/src/db/turso_driver.rs +++ b/crates/dbx-core/src/db/turso_driver.rs @@ -280,6 +280,13 @@ pub async fn list_triggers(client: &TursoClient, _schema: &str, table: &str) -> name: value_as_string(row.first()).unwrap_or_default(), event: event.to_string(), timing: timing.to_string(), + level: None, + condition: None, + language: None, + enabled: None, + valid: None, + comment: None, + created_at: None, statement: value_as_string(row.get(1)), } }) diff --git a/crates/dbx-core/src/schema.rs b/crates/dbx-core/src/schema.rs index d6e193e036..a67c9c5f54 100644 --- a/crates/dbx-core/src/schema.rs +++ b/crates/dbx-core/src/schema.rs @@ -2388,6 +2388,7 @@ async fn external_driver_presto_like_objects( updated_at: None, parent_schema: table.parent_schema, parent_name: table.parent_name, + trigger: None, xugu_type_members_expandable: None, }) .collect()) @@ -3242,6 +3243,7 @@ for line in sys.stdin: updated_at: None, parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, } } @@ -4141,6 +4143,7 @@ for line in sys.stdin: updated_at: None, parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, }, super::db::ObjectInfo { @@ -4154,6 +4157,7 @@ for line in sys.stdin: updated_at: None, parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, }, super::db::ObjectInfo { @@ -4167,6 +4171,7 @@ for line in sys.stdin: updated_at: None, parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, }, ]; @@ -4849,6 +4854,7 @@ async fn list_objects_once( updated_at: None, parent_schema: table.parent_schema, parent_name: table.parent_name, + trigger: None, xugu_type_members_expandable: None, }) .collect(), @@ -7108,6 +7114,7 @@ async fn oracle_agent_list_objects( updated_at: None, parent_schema: None, parent_name: None, + trigger: None, xugu_type_members_expandable: None, }) }) diff --git a/crates/dbx-core/src/schema_diff.rs b/crates/dbx-core/src/schema_diff.rs index de29034e96..a91ba85625 100644 --- a/crates/dbx-core/src/schema_diff.rs +++ b/crates/dbx-core/src/schema_diff.rs @@ -5935,6 +5935,13 @@ mod tests { name: "trg_orders".to_string(), event: "INSERT".to_string(), timing: "AFTER".to_string(), + level: None, + condition: None, + language: None, + enabled: None, + valid: None, + comment: None, + created_at: None, statement: None, }], ddl: None, diff --git a/crates/dbx-core/src/types.rs b/crates/dbx-core/src/types.rs index eda6f1d2cf..f5fa590b0c 100644 --- a/crates/dbx-core/src/types.rs +++ b/crates/dbx-core/src/types.rs @@ -77,6 +77,8 @@ pub struct ObjectInfo { pub parent_schema: Option, pub parent_name: Option, #[serde(default, skip_serializing_if = "Option::is_none")] + pub trigger: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] pub xugu_type_members_expandable: Option, } @@ -398,6 +400,20 @@ pub struct TriggerInfo { pub event: String, pub timing: String, #[serde(default, skip_serializing_if = "Option::is_none")] + pub level: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub condition: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub language: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub enabled: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub valid: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub comment: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub created_at: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] pub statement: Option, } @@ -582,12 +598,16 @@ mod tests { fn list_objects_payload_preserves_optional_validity() { let objects: Vec = serde_json::from_str( - r#"[{"name":"TRG_AUDIT","object_type":"TRIGGER","schema":"APP","valid":false},{"name":"ORDER_TYPE","object_type":"TYPE","schema":"APP","xugu_type_members_expandable":true}]"#, + r#"[{"name":"TRG_AUDIT","object_type":"TRIGGER","schema":"APP","valid":false,"trigger":{"name":"TRG_AUDIT","event":"INSERT","timing":"BEFORE","level":"FOR EACH ROW","enabled":false,"valid":false,"comment":"audit","created_at":"2026-08-10 09:30:00"}},{"name":"ORDER_TYPE","object_type":"TYPE","schema":"APP","xugu_type_members_expandable":true}]"#, ) .unwrap(); assert_eq!(objects[0].valid, Some(false)); assert_eq!(objects[0].object_type, "TRIGGER"); + let trigger = objects[0].trigger.as_ref().unwrap(); + assert_eq!(trigger.level.as_deref(), Some("FOR EACH ROW")); + assert_eq!(trigger.enabled, Some(false)); + assert_eq!(trigger.comment.as_deref(), Some("audit")); assert_eq!(objects[1].xugu_type_members_expandable, Some(true)); } diff --git a/crates/dbx-web/src/routes/schema.rs b/crates/dbx-web/src/routes/schema.rs index 6678a40b84..d14b96190c 100644 --- a/crates/dbx-web/src/routes/schema.rs +++ b/crates/dbx-web/src/routes/schema.rs @@ -255,6 +255,7 @@ pub async fn list_objects( updated_at: None, parent_schema: table.parent_schema, parent_name: table.parent_name, + trigger: None, xugu_type_members_expandable: None, }) .collect::>() diff --git a/src-tauri/src/commands/schema.rs b/src-tauri/src/commands/schema.rs index 4448a552ec..e639f59638 100644 --- a/src-tauri/src/commands/schema.rs +++ b/src-tauri/src/commands/schema.rs @@ -240,6 +240,7 @@ pub async fn list_objects( updated_at: None, parent_schema: table.parent_schema, parent_name: table.parent_name, + trigger: None, xugu_type_members_expandable: None, }) .collect());