From 8c395ec275c3d57472d049a476705562ba1b0e2e Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Wed, 28 May 2025 12:10:47 +0200 Subject: [PATCH] fix pre-release --- src/package.json | 2 +- .../database/migrations/0000_short_skin.sql | 4 +++- .../migrations/meta/0000_snapshot.json | 22 ++++++++++++++++- .../migrations/meta/0001_snapshot.json | 24 +++++++++++++++++-- .../database/migrations/meta/_journal.json | 4 ++-- 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/package.json b/src/package.json index 29be755b..162ae6bd 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "wg-easy", - "version": "15.0.0-beta.13", + "version": "15.0.0-beta.12", "description": "The easiest way to run WireGuard VPN + Web-based Admin UI.", "private": true, "type": "module", diff --git a/src/server/database/migrations/0000_short_skin.sql b/src/server/database/migrations/0000_short_skin.sql index 5ae181f8..7169f938 100644 --- a/src/server/database/migrations/0000_short_skin.sql +++ b/src/server/database/migrations/0000_short_skin.sql @@ -1,6 +1,7 @@ CREATE TABLE `clients_table` ( `id` integer PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` integer NOT NULL, + `interface_id` text NOT NULL, `name` text NOT NULL, `ipv4_address` text NOT NULL, `ipv6_address` text NOT NULL, @@ -21,7 +22,8 @@ CREATE TABLE `clients_table` ( `enabled` integer NOT NULL, `created_at` text DEFAULT (CURRENT_TIMESTAMP) NOT NULL, `updated_at` text DEFAULT (CURRENT_TIMESTAMP) NOT NULL, - FOREIGN KEY (`user_id`) REFERENCES `users_table`(`id`) ON UPDATE cascade ON DELETE restrict + FOREIGN KEY (`user_id`) REFERENCES `users_table`(`id`) ON UPDATE cascade ON DELETE restrict, + FOREIGN KEY (`interface_id`) REFERENCES `interfaces_table`(`name`) ON UPDATE cascade ON DELETE cascade ); --> statement-breakpoint CREATE UNIQUE INDEX `clients_table_ipv4_address_unique` ON `clients_table` (`ipv4_address`);--> statement-breakpoint diff --git a/src/server/database/migrations/meta/0000_snapshot.json b/src/server/database/migrations/meta/0000_snapshot.json index c0621f0c..a5cb6c9d 100644 --- a/src/server/database/migrations/meta/0000_snapshot.json +++ b/src/server/database/migrations/meta/0000_snapshot.json @@ -1,7 +1,7 @@ { "version": "6", "dialect": "sqlite", - "id": "b812341a-1ec2-49a6-8bc8-0332f5b32df4", + "id": "dae61656-1107-4729-ac83-f43d4cab3881", "prevId": "00000000-0000-0000-0000-000000000000", "tables": { "clients_table": { @@ -21,6 +21,13 @@ "notNull": true, "autoincrement": false }, + "interface_id": { + "name": "interface_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, "name": { "name": "name", "type": "text", @@ -197,6 +204,19 @@ ], "onDelete": "restrict", "onUpdate": "cascade" + }, + "clients_table_interface_id_interfaces_table_name_fk": { + "name": "clients_table_interface_id_interfaces_table_name_fk", + "tableFrom": "clients_table", + "tableTo": "interfaces_table", + "columnsFrom": [ + "interface_id" + ], + "columnsTo": [ + "name" + ], + "onDelete": "cascade", + "onUpdate": "cascade" } }, "compositePrimaryKeys": {}, diff --git a/src/server/database/migrations/meta/0001_snapshot.json b/src/server/database/migrations/meta/0001_snapshot.json index f19ca3f1..1ed33ecc 100644 --- a/src/server/database/migrations/meta/0001_snapshot.json +++ b/src/server/database/migrations/meta/0001_snapshot.json @@ -1,6 +1,6 @@ { - "id": "c4c5bfb7-a66c-4e6b-a15c-232b16689dcf", - "prevId": "b812341a-1ec2-49a6-8bc8-0332f5b32df4", + "id": "78de2e52-c4a8-4900-86c5-92f34739623a", + "prevId": "dae61656-1107-4729-ac83-f43d4cab3881", "version": "6", "dialect": "sqlite", "tables": { @@ -21,6 +21,13 @@ "notNull": true, "autoincrement": false }, + "interface_id": { + "name": "interface_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, "name": { "name": "name", "type": "text", @@ -197,6 +204,19 @@ ], "onUpdate": "cascade", "onDelete": "restrict" + }, + "clients_table_interface_id_interfaces_table_name_fk": { + "name": "clients_table_interface_id_interfaces_table_name_fk", + "tableFrom": "clients_table", + "columnsFrom": [ + "interface_id" + ], + "tableTo": "interfaces_table", + "columnsTo": [ + "name" + ], + "onUpdate": "cascade", + "onDelete": "cascade" } }, "compositePrimaryKeys": {}, diff --git a/src/server/database/migrations/meta/_journal.json b/src/server/database/migrations/meta/_journal.json index 2fc2534a..b3ee612d 100644 --- a/src/server/database/migrations/meta/_journal.json +++ b/src/server/database/migrations/meta/_journal.json @@ -5,14 +5,14 @@ { "idx": 0, "version": "6", - "when": 1743515334198, + "when": 1748426990392, "tag": "0000_short_skin", "breakpoints": true }, { "idx": 1, "version": "6", - "when": 1743515338707, + "when": 1748427001203, "tag": "0001_classy_the_stranger", "breakpoints": true }