BetterCorp/BetterFrame
1
0
Fork 0
mirror of https://github.com/BetterCorp/BetterFrame.git synced 2026-05-26 20:16:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix(db): add RETURNING id to all INSERTs for PG compat

Browse source 
PG doesn't populate lastInsertRowid without RETURNING clause.
SQLite 3.35+ also supports RETURNING. Added to all 14 INSERT
statements that use auto-generated integer IDs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Mitchell R 2026-05-23 13:00:18 +02:00
parent 6e3a893421
commit bab194a184
No known key found for this signature in database
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
server/src/plugins/service-store/repository.ts
View file

@ -189,7 +189,7 @@ export class Repository {
const role: UserRole = input.role ?? "operator"; const role: UserRole = input.role ?? "operator";
const result = await this._run( const result = await this._run(
`INSERT INTO users (username, password_hash, role, is_active, must_change_password) `INSERT INTO users (username, password_hash, role, is_active, must_change_password)
VALUES (?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?) RETURNING id`,
[ [
input.username, input.username,
input.password_hash, input.password_hash,
@ -326,7 +326,7 @@ export class Repository {
}): Promise<ApiKey> { }): Promise<ApiKey> {
const result = await this._run( const result = await this._run(
`INSERT INTO api_keys (name, key_hash, key_prefix, scopes, expires_at) `INSERT INTO api_keys (name, key_hash, key_prefix, scopes, expires_at)
VALUES (?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?) RETURNING id`,
[ [
input.name, input.name,
input.key_hash, input.key_hash,
@ -380,7 +380,7 @@ export class Repository {
async createDefaultDisplay(): Promise<Display> { async createDefaultDisplay(): Promise<Display> {
const result = await this._run( const result = await this._run(
`INSERT INTO displays (name, "index", is_primary) `INSERT INTO displays (name, "index", is_primary)
VALUES ('primary', 0, 0)`, VALUES ('primary', 0, 0) RETURNING id`,
); );
const id = Number(result.lastInsertRowid); const id = Number(result.lastInsertRowid);
void this.notify("displays", "create", id); void this.notify("displays", "create", id);
@ -398,7 +398,7 @@ export class Repository {
const idx = input.index ?? await this.nextDisplayIndexForKiosk(kioskId); const idx = input.index ?? await this.nextDisplayIndexForKiosk(kioskId);
const result = await this._run( const result = await this._run(
`INSERT INTO displays (name, "index", is_primary, kiosk_id, width_px, height_px) `INSERT INTO displays (name, "index", is_primary, kiosk_id, width_px, height_px)
VALUES (?, ?, 0, ?, ?, ?)`, VALUES (?, ?, 0, ?, ?, ?) RETURNING id`,
[ [
input.name, input.name,
idx, idx,
@ -567,7 +567,7 @@ export class Repository {
}): Promise<Layout> { }): Promise<Layout> {
const result = await this._run( const result = await this._run(
`INSERT INTO layouts (name, description, priority, cooling_timeout_seconds, preload_camera_ids, resets_idle_timer) `INSERT INTO layouts (name, description, priority, cooling_timeout_seconds, preload_camera_ids, resets_idle_timer)
VALUES (?, ?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?, ?) RETURNING id`,
[ [
input.name, input.name,
input.description ?? null, input.description ?? null,
@ -712,7 +712,7 @@ export class Repository {
const result = await this._run( const result = await this._run(
`INSERT INTO layout_cells (layout_id, "row", col, row_span, col_span, content_type, camera_id, stream_selector, web_url, html_content, cooling_timeout_seconds, options, entity_id, fit) `INSERT INTO layout_cells (layout_id, "row", col, row_span, col_span, content_type, camera_id, stream_selector, web_url, html_content, cooling_timeout_seconds, options, entity_id, fit)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id`,
[ [
input.layout_id, input.layout_id,
input.row, input.row,
@ -899,7 +899,7 @@ export class Repository {
`INSERT INTO cameras `INSERT INTO cameras
(name, type, rtsp_url, onvif_host, onvif_port, onvif_username, (name, type, rtsp_url, onvif_host, onvif_port, onvif_username,
onvif_password, capabilities, stream_policy) onvif_password, capabilities, stream_policy)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id`,
[ [
input.name, input.name,
input.type, input.type,
@ -945,7 +945,7 @@ export class Repository {
const result = await this._run( const result = await this._run(
`INSERT INTO cameras `INSERT INTO cameras
(name, type, cloud_account_id, cloud_vendor_camera_id, cloud_stream_url, cloud_stream_type, enabled) (name, type, cloud_account_id, cloud_vendor_camera_id, cloud_stream_url, cloud_stream_type, enabled)
VALUES (?, 'cloud', ?, ?, ?, ?, ?)`, VALUES (?, 'cloud', ?, ?, ?, ?, ?) RETURNING id`,
[input.name, input.cloud_account_id, input.cloud_vendor_camera_id, [input.name, input.cloud_account_id, input.cloud_vendor_camera_id,
input.cloud_stream_url, input.cloud_stream_type, Boolean(input.enabled)], input.cloud_stream_url, input.cloud_stream_type, Boolean(input.enabled)],
); );
@ -1006,7 +1006,7 @@ export class Repository {
`INSERT INTO camera_streams `INSERT INTO camera_streams
(camera_id, role, name, profile_token, rtsp_uri, width, height, (camera_id, role, name, profile_token, rtsp_uri, width, height,
encoding, framerate, bitrate_kbps, is_discovered) encoding, framerate, bitrate_kbps, is_discovered)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id`,
[ [
input.camera_id, input.camera_id,
input.role, input.role,
@ -1063,7 +1063,7 @@ export class Repository {
}): Promise<Label> { }): Promise<Label> {
const result = await this._run( const result = await this._run(
`INSERT INTO labels (name, description, color) `INSERT INTO labels (name, description, color)
VALUES (?, ?, ?)`, VALUES (?, ?, ?) RETURNING id`,
[input.name, input.description ?? null, input.color ?? null], [input.name, input.description ?? null, input.color ?? null],
); );
const id = Number(result.lastInsertRowid); const id = Number(result.lastInsertRowid);
@ -1160,7 +1160,7 @@ export class Repository {
const result = await this._run( const result = await this._run(
`INSERT INTO kiosks `INSERT INTO kiosks
(name, key_hash, key_prefix, capabilities, hardware_model, paired_at, managed_image) (name, key_hash, key_prefix, capabilities, hardware_model, paired_at, managed_image)
VALUES (?, ?, ?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING id`,
[ [
input.name, input.name,
input.key_hash, input.key_hash,
@ -1822,7 +1822,7 @@ export class Repository {
`INSERT INTO event_log `INSERT INTO event_log
(source_kiosk_id, source_camera_id, source_type, topic, (source_kiosk_id, source_camera_id, source_type, topic,
property_op, payload, forwarded_to_nodered) property_op, payload, forwarded_to_nodered)
VALUES (?, ?, ?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING id`,
[ [
input.source_kiosk_id, input.source_kiosk_id,
input.source_camera_id, input.source_camera_id,
@ -2158,7 +2158,7 @@ export class Repository {
}): Promise<Entity> { }): Promise<Entity> {
const result = await this._run( const result = await this._run(
`INSERT INTO entities (name, type, description, camera_id, html_content, web_url, dashboard_id) `INSERT INTO entities (name, type, description, camera_id, html_content, web_url, dashboard_id)
VALUES (?, ?, ?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING id`,
[ [
input.name, input.name,
input.type, input.type,
@ -2331,7 +2331,7 @@ export class Repository {
}): Promise<KioskGpioBinding> { }): Promise<KioskGpioBinding> {
const result = await this._run( const result = await this._run(
`INSERT INTO kiosk_gpio_bindings (kiosk_id, chip, pin, direction, pull, edge, topic) `INSERT INTO kiosk_gpio_bindings (kiosk_id, chip, pin, direction, pull, edge, topic)
VALUES (?, ?, ?, ?, ?, ?, ?)`, VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING id`,
[ [
input.kiosk_id, input.kiosk_id,
input.chip ?? "gpiochip0", input.chip ?? "gpiochip0",