Merge branch 'main' of github.com:DefGuard/defguard

DefGuard · Jan 20, 2025 · 868adba · 868adba
2 parents 2cc4b75 + 3fdb2ff
commit 868adba
Show file tree

Hide file tree

Showing 18 changed files with 603 additions and 123 deletions.
diff --git a/.sqlx/query-455cdf6e1284b773de2d44332b49b31030fe878f3001447d2c245b9502dff427.json b/.sqlx/query-455cdf6e1284b773de2d44332b49b31030fe878f3001447d2c245b9502dff427.json
diff --git a/.sqlx/query-56e835feea4f834510c020e111d06585092b9f160b8c8bdf34610de0c4d2cf52.json b/.sqlx/query-56e835feea4f834510c020e111d06585092b9f160b8c8bdf34610de0c4d2cf52.json
diff --git a/.sqlx/query-77291d31a566e9deca452048a933ffce58f7d086e51d05e491333c0d55f6edb4.json b/.sqlx/query-77291d31a566e9deca452048a933ffce58f7d086e51d05e491333c0d55f6edb4.json
diff --git a/...76837035da3fd7a4fd7f95ce5b0ae03b3400.json → ...cfdd858d1e86bb1033e358b1bcb9962d27fc.json b/...76837035da3fd7a4fd7f95ce5b0ae03b3400.json → ...cfdd858d1e86bb1033e358b1bcb9962d27fc.json
diff --git a/.sqlx/query-ed74bbe1d6c370e3106345d652bcaa6070009e231e4d8721fa37764e6a3dc07b.json b/.sqlx/query-ed74bbe1d6c370e3106345d652bcaa6070009e231e4d8721fa37764e6a3dc07b.json
diff --git a/migrations/20250120115015_network_device_primary_key.down.sql b/migrations/20250120115015_network_device_primary_key.down.sql
@@ -0,0 +1 @@
+ALTER TABLE wireguard_network_device DROP COLUMN id;
diff --git a/migrations/20250120115015_network_device_primary_key.up.sql b/migrations/20250120115015_network_device_primary_key.up.sql
@@ -0,0 +1 @@
+ALTER TABLE wireguard_network_device ADD COLUMN id bigserial PRIMARY KEY;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE wireguard_network_device DROP COLUMN id;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE wireguard_network_device ADD COLUMN id bigserial PRIMARY KEY;