From a0556e3ac8031c2317c93aa7ab23ed6962a45814 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 11 Feb 2026 10:20:20 +1100 Subject: [PATCH] more db fixes --- db/queries/query.sql | 107 ++++++++++++++++++++++++++++++++-------- db/queries/query.sql.go | 107 ++++++++++++++++++++++++++++++++-------- 2 files changed, 172 insertions(+), 42 deletions(-) diff --git a/db/queries/query.sql b/db/queries/query.sql index b8b71ad..7921419 100644 --- a/db/queries/query.sql +++ b/db/queries/query.sql @@ -1,33 +1,65 @@ -- name: ListInventory :many -SELECT * FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory ORDER BY "Name"; -- name: GetReportInventory :many -SELECT * FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory ORDER BY "CreationTime"; -- name: GetInventoryByName :many -SELECT * FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "Name" = ?; -- name: GetInventoryByVcenter :many -SELECT * FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "Vcenter" = ?; -- name: GetInventoryVmId :one -SELECT * FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "VmId" = sqlc.arg('vmId') AND "Datacenter" = sqlc.arg('datacenterName'); -- name: GetInventoryVmUuid :one -SELECT * FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "VmUuid" = sqlc.arg('vmUuid') AND "Datacenter" = sqlc.arg('datacenterName'); -- name: GetInventoryVcUrl :many -SELECT * FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "Vcenter" = sqlc.arg('vc'); -- name: GetInventoryEventId :one -SELECT * FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "CloudId" = ? LIMIT 1; -- name: CreateInventory :one @@ -36,7 +68,10 @@ INSERT INTO inventory ( ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) -RETURNING *; +RETURNING + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid"; -- name: InventoryUpdate :exec UPDATE inventory @@ -51,17 +86,26 @@ WHERE "VmId" = sqlc.arg('vmId') AND "Datacenter" = sqlc.arg('datacenterName'); -- name: InventoryCleanup :exec DELETE FROM inventory WHERE "VmId" = sqlc.arg('vmId') AND "Datacenter" = sqlc.arg('datacenterName') -RETURNING *; +RETURNING + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid"; -- name: InventoryCleanupVcenter :exec DELETE FROM inventory WHERE "Vcenter" = sqlc.arg('vc') -RETURNING *; +RETURNING + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid"; -- name: InventoryCleanupTemplates :exec DELETE FROM inventory WHERE "IsTemplate" = 'TRUE' -RETURNING *; +RETURNING + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid"; -- name: CreateUpdate :one INSERT INTO updates ( @@ -69,25 +113,37 @@ INSERT INTO updates ( ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) -RETURNING *; +RETURNING + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString"; -- name: GetReportUpdates :many -SELECT * FROM updates +SELECT + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString" +FROM updates ORDER BY "UpdateTime"; -- name: GetVmUpdates :many -SELECT * FROM updates +SELECT + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString" +FROM updates WHERE "UpdateType" = sqlc.arg('updateType') AND "InventoryId" = sqlc.arg('InventoryId'); -- name: CleanupUpdates :exec DELETE FROM updates WHERE "UpdateType" = sqlc.arg('updateType') AND "UpdateTime" <= sqlc.arg('updateTime') -RETURNING *; +RETURNING + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString"; -- name: CleanupUpdatesNullVm :exec DELETE FROM updates WHERE "InventoryId" IS NULL -RETURNING *; +RETURNING + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString"; -- name: CreateEvent :one INSERT INTO events ( @@ -95,14 +151,22 @@ INSERT INTO events ( ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) -RETURNING *; +RETURNING + "Eid", "CloudId", "Source", "EventTime", "ChainId", "VmId", "EventKey", "DatacenterName", + "ComputeResourceName", "UserName", "Processed", "DatacenterId", "ComputeResourceId", "VmName", "EventType"; -- name: ListEvents :many -SELECT * FROM events +SELECT + "Eid", "CloudId", "Source", "EventTime", "ChainId", "VmId", "EventKey", "DatacenterName", + "ComputeResourceName", "UserName", "Processed", "DatacenterId", "ComputeResourceId", "VmName", "EventType" +FROM events ORDER BY "EventTime"; -- name: ListUnprocessedEvents :many -SELECT * FROM events +SELECT + "Eid", "CloudId", "Source", "EventTime", "ChainId", "VmId", "EventKey", "DatacenterName", + "ComputeResourceName", "UserName", "Processed", "DatacenterId", "ComputeResourceId", "VmName", "EventType" +FROM events WHERE "Processed" = 0 AND "EventTime" > sqlc.arg('eventTime') ORDER BY "EventTime"; @@ -118,7 +182,8 @@ INSERT INTO inventory_history ( ) VALUES( ?, ?, ?, ?, ?, ?, ? ) -RETURNING *; +RETURNING + "Hid", "InventoryId", "ReportDate", "UpdateTime", "PreviousVcpus", "PreviousRam", "PreviousResourcePool", "PreviousProvisionedDisk"; -- name: SqliteTableExists :one SELECT COUNT(1) AS count diff --git a/db/queries/query.sql.go b/db/queries/query.sql.go index 1a120f6..fee99b0 100644 --- a/db/queries/query.sql.go +++ b/db/queries/query.sql.go @@ -13,7 +13,9 @@ import ( const cleanupUpdates = `-- name: CleanupUpdates :exec DELETE FROM updates WHERE "UpdateType" = ?1 AND "UpdateTime" <= ?2 -RETURNING Uid, InventoryId, UpdateTime, UpdateType, NewVcpus, NewRam, NewResourcePool, EventKey, EventId, NewProvisionedDisk, UserName, PlaceholderChange, Name, RawChangeString +RETURNING + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString" ` type CleanupUpdatesParams struct { @@ -29,7 +31,9 @@ func (q *Queries) CleanupUpdates(ctx context.Context, arg CleanupUpdatesParams) const cleanupUpdatesNullVm = `-- name: CleanupUpdatesNullVm :exec DELETE FROM updates WHERE "InventoryId" IS NULL -RETURNING Uid, InventoryId, UpdateTime, UpdateType, NewVcpus, NewRam, NewResourcePool, EventKey, EventId, NewProvisionedDisk, UserName, PlaceholderChange, Name, RawChangeString +RETURNING + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString" ` func (q *Queries) CleanupUpdatesNullVm(ctx context.Context) error { @@ -43,7 +47,9 @@ INSERT INTO events ( ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) -RETURNING Eid, CloudId, Source, EventTime, ChainId, VmId, EventKey, DatacenterName, ComputeResourceName, UserName, Processed, DatacenterId, ComputeResourceId, VmName, EventType +RETURNING + "Eid", "CloudId", "Source", "EventTime", "ChainId", "VmId", "EventKey", "DatacenterName", + "ComputeResourceName", "UserName", "Processed", "DatacenterId", "ComputeResourceId", "VmName", "EventType" ` type CreateEventParams struct { @@ -105,7 +111,10 @@ INSERT INTO inventory ( ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) -RETURNING Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid +RETURNING + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" ` type CreateInventoryParams struct { @@ -179,7 +188,8 @@ INSERT INTO inventory_history ( ) VALUES( ?, ?, ?, ?, ?, ?, ? ) -RETURNING Hid, InventoryId, ReportDate, UpdateTime, PreviousVcpus, PreviousRam, PreviousResourcePool, PreviousProvisionedDisk +RETURNING + "Hid", "InventoryId", "ReportDate", "UpdateTime", "PreviousVcpus", "PreviousRam", "PreviousResourcePool", "PreviousProvisionedDisk" ` type CreateInventoryHistoryParams struct { @@ -222,7 +232,9 @@ INSERT INTO updates ( ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) -RETURNING Uid, InventoryId, UpdateTime, UpdateType, NewVcpus, NewRam, NewResourcePool, EventKey, EventId, NewProvisionedDisk, UserName, PlaceholderChange, Name, RawChangeString +RETURNING + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString" ` type CreateUpdateParams struct { @@ -278,7 +290,11 @@ func (q *Queries) CreateUpdate(ctx context.Context, arg CreateUpdateParams) (Upd } const getInventoryByName = `-- name: GetInventoryByName :many -SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "Name" = ? ` @@ -326,7 +342,11 @@ func (q *Queries) GetInventoryByName(ctx context.Context, name string) ([]Invent } const getInventoryByVcenter = `-- name: GetInventoryByVcenter :many -SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "Vcenter" = ? ` @@ -374,7 +394,11 @@ func (q *Queries) GetInventoryByVcenter(ctx context.Context, vcenter string) ([] } const getInventoryEventId = `-- name: GetInventoryEventId :one -SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "CloudId" = ? LIMIT 1 ` @@ -406,7 +430,11 @@ func (q *Queries) GetInventoryEventId(ctx context.Context, cloudid sql.NullStrin } const getInventoryVcUrl = `-- name: GetInventoryVcUrl :many -SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "Vcenter" = ?1 ` @@ -454,7 +482,11 @@ func (q *Queries) GetInventoryVcUrl(ctx context.Context, vc string) ([]Inventory } const getInventoryVmId = `-- name: GetInventoryVmId :one -SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "VmId" = ?1 AND "Datacenter" = ?2 ` @@ -491,7 +523,11 @@ func (q *Queries) GetInventoryVmId(ctx context.Context, arg GetInventoryVmIdPara } const getInventoryVmUuid = `-- name: GetInventoryVmUuid :one -SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory WHERE "VmUuid" = ?1 AND "Datacenter" = ?2 ` @@ -528,7 +564,11 @@ func (q *Queries) GetInventoryVmUuid(ctx context.Context, arg GetInventoryVmUuid } const getReportInventory = `-- name: GetReportInventory :many -SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory ORDER BY "CreationTime" ` @@ -576,7 +616,10 @@ func (q *Queries) GetReportInventory(ctx context.Context) ([]Inventory, error) { } const getReportUpdates = `-- name: GetReportUpdates :many -SELECT Uid, InventoryId, UpdateTime, UpdateType, NewVcpus, NewRam, NewResourcePool, EventKey, EventId, NewProvisionedDisk, UserName, PlaceholderChange, Name, RawChangeString FROM updates +SELECT + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString" +FROM updates ORDER BY "UpdateTime" ` @@ -619,7 +662,10 @@ func (q *Queries) GetReportUpdates(ctx context.Context) ([]Update, error) { } const getVmUpdates = `-- name: GetVmUpdates :many -SELECT Uid, InventoryId, UpdateTime, UpdateType, NewVcpus, NewRam, NewResourcePool, EventKey, EventId, NewProvisionedDisk, UserName, PlaceholderChange, Name, RawChangeString FROM updates +SELECT + "Uid", "InventoryId", "UpdateTime", "UpdateType", "NewVcpus", "NewRam", "NewResourcePool", + "EventKey", "EventId", "NewProvisionedDisk", "UserName", "PlaceholderChange", "Name", "RawChangeString" +FROM updates WHERE "UpdateType" = ?1 AND "InventoryId" = ?2 ` @@ -669,7 +715,10 @@ func (q *Queries) GetVmUpdates(ctx context.Context, arg GetVmUpdatesParams) ([]U const inventoryCleanup = `-- name: InventoryCleanup :exec DELETE FROM inventory WHERE "VmId" = ?1 AND "Datacenter" = ?2 -RETURNING Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid +RETURNING + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" ` type InventoryCleanupParams struct { @@ -685,7 +734,10 @@ func (q *Queries) InventoryCleanup(ctx context.Context, arg InventoryCleanupPara const inventoryCleanupTemplates = `-- name: InventoryCleanupTemplates :exec DELETE FROM inventory WHERE "IsTemplate" = 'TRUE' -RETURNING Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid +RETURNING + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" ` func (q *Queries) InventoryCleanupTemplates(ctx context.Context) error { @@ -696,7 +748,10 @@ func (q *Queries) InventoryCleanupTemplates(ctx context.Context) error { const inventoryCleanupVcenter = `-- name: InventoryCleanupVcenter :exec DELETE FROM inventory WHERE "Vcenter" = ?1 -RETURNING Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid +RETURNING + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" ` func (q *Queries) InventoryCleanupVcenter(ctx context.Context, vc string) error { @@ -739,7 +794,10 @@ func (q *Queries) InventoryUpdate(ctx context.Context, arg InventoryUpdateParams } const listEvents = `-- name: ListEvents :many -SELECT Eid, CloudId, Source, EventTime, ChainId, VmId, EventKey, DatacenterName, ComputeResourceName, UserName, Processed, DatacenterId, ComputeResourceId, VmName, EventType FROM events +SELECT + "Eid", "CloudId", "Source", "EventTime", "ChainId", "VmId", "EventKey", "DatacenterName", + "ComputeResourceName", "UserName", "Processed", "DatacenterId", "ComputeResourceId", "VmName", "EventType" +FROM events ORDER BY "EventTime" ` @@ -783,7 +841,11 @@ func (q *Queries) ListEvents(ctx context.Context) ([]Event, error) { } const listInventory = `-- name: ListInventory :many -SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, IsTemplate, PoweredOn, SrmPlaceholder, VmUuid FROM inventory +SELECT + "Iid", "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "DeletionTime", + "ResourcePool", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", + "InitialRam", "IsTemplate", "PoweredOn", "SrmPlaceholder", "VmUuid" +FROM inventory ORDER BY "Name" ` @@ -831,7 +893,10 @@ func (q *Queries) ListInventory(ctx context.Context) ([]Inventory, error) { } const listUnprocessedEvents = `-- name: ListUnprocessedEvents :many -SELECT Eid, CloudId, Source, EventTime, ChainId, VmId, EventKey, DatacenterName, ComputeResourceName, UserName, Processed, DatacenterId, ComputeResourceId, VmName, EventType FROM events +SELECT + "Eid", "CloudId", "Source", "EventTime", "ChainId", "VmId", "EventKey", "DatacenterName", + "ComputeResourceName", "UserName", "Processed", "DatacenterId", "ComputeResourceId", "VmName", "EventType" +FROM events WHERE "Processed" = 0 AND "EventTime" > ?1 ORDER BY "EventTime"