From 770f3489523ab8e6ca486126c069cc50730ca357 Mon Sep 17 00:00:00 2001
From: vipg <vipg@vipg.com>
Date: Tue, 11 Nov 2025 16:42:35 +0800
Subject: [PATCH] add

---
 backend/user/sql/03_create_account_table.sql       | 12 ++++++------
 backend/user/sql/04_create_password_table.sql      | 12 ++++++------
 ...t_password_view.sql => 05_create_info_view.sql} | 14 ++++++++------
 3 files changed, 20 insertions(+), 18 deletions(-)
 rename backend/user/sql/{05_create_account_password_view.sql => 05_create_info_view.sql} (63%)

diff --git a/backend/user/sql/03_create_account_table.sql b/backend/user/sql/03_create_account_table.sql
index 91709a3..803233f 100644
--- a/backend/user/sql/03_create_account_table.sql
+++ b/backend/user/sql/03_create_account_table.sql
@@ -11,8 +11,8 @@ $$ LANGUAGE plpgsql VOLATILE;
 
 DO $$
 BEGIN
-    IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'user_account') THEN
-        CREATE TABLE user_account (
+    IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'account') THEN
+        CREATE TABLE account (
             id UUID DEFAULT gen_random_uuid_v7() PRIMARY KEY NOT NULL,
             user_id UUID NOT NULL,
             account VARCHAR NOT NULL,
@@ -20,13 +20,13 @@ BEGIN
             created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
             updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
         );
-        CREATE TRIGGER update_user_account_updated_at
-        BEFORE UPDATE ON "user_account"
+        CREATE TRIGGER update_account_updated_at
+        BEFORE UPDATE ON "account"
         FOR EACH ROW
         EXECUTE FUNCTION update_account_modified_column();
         
-        RAISE NOTICE 'Created user_account table and trigger';
+        RAISE NOTICE 'Created account table and trigger';
     ELSE
-        RAISE NOTICE 'user_account table already exists';
+        RAISE NOTICE 'account table already exists';
     END IF;
 END $$;
\ No newline at end of file
diff --git a/backend/user/sql/04_create_password_table.sql b/backend/user/sql/04_create_password_table.sql
index 39d6825..1d82da0 100644
--- a/backend/user/sql/04_create_password_table.sql
+++ b/backend/user/sql/04_create_password_table.sql
@@ -11,8 +11,8 @@ $$ LANGUAGE plpgsql VOLATILE;
 
 DO $$
 BEGIN
-    IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'user_password') THEN
-        CREATE TABLE user_password (
+    IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'password') THEN
+        CREATE TABLE password (
             id UUID DEFAULT gen_random_uuid_v7() PRIMARY KEY NOT NULL,
             user_id UUID NOT NULL,
             password VARCHAR NOT NULL,
@@ -20,13 +20,13 @@ BEGIN
             created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
             updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
         );
-        CREATE TRIGGER update_user_password_updated_at
-        BEFORE UPDATE ON "user_password"
+        CREATE TRIGGER update_password_updated_at
+        BEFORE UPDATE ON "password"
         FOR EACH ROW
         EXECUTE FUNCTION update_password_modified_column();
         
-        RAISE NOTICE 'Created user_password table and trigger';
+        RAISE NOTICE 'Created password table and trigger';
     ELSE
-        RAISE NOTICE 'user_password table already exists';
+        RAISE NOTICE 'password table already exists';
     END IF;
 END $$;
\ No newline at end of file
diff --git a/backend/user/sql/05_create_account_password_view.sql b/backend/user/sql/05_create_info_view.sql
similarity index 63%
rename from backend/user/sql/05_create_account_password_view.sql
rename to backend/user/sql/05_create_info_view.sql
index 32d2f5f..ecfa2a1 100644
--- a/backend/user/sql/05_create_account_password_view.sql
+++ b/backend/user/sql/05_create_info_view.sql
@@ -7,11 +7,11 @@ BEGIN
     -- 检查视图是否已存在
     SELECT EXISTS (
         SELECT 1 FROM information_schema.views 
-        WHERE table_name = 'user_account_password_view'
+        WHERE table_name = 'user_info_view'
     ) INTO view_exists;
 
     -- 创建或更新视图
-    CREATE OR REPLACE VIEW user_account_password_view AS
+    CREATE OR REPLACE VIEW user_info_view AS
     SELECT 
         u.id AS user_id,
         ua.account AS account,
@@ -20,15 +20,17 @@ BEGIN
     FROM 
         "user" u
     JOIN 
-        user_account ua ON u.id = ua.user_id
+        account ua ON u.id = ua.user_id
     JOIN 
-        user_password up ON u.id = up.user_id;
+        password up ON u.id = up.user_id
+    WHERE
+        u.deleted = FALSE;
 
     -- 根据视图是否已存在输出不同提示
     IF view_exists THEN
-        RAISE NOTICE '视图 user_account_password_view 已更新';
+        RAISE NOTICE '视图 user_info_view 已更新';
     ELSE
-        RAISE NOTICE '视图 user_account_password_view 已创建';
+        RAISE NOTICE '视图 user_info_view 已创建';
     END IF;
 EXCEPTION
     WHEN OTHERS THEN