admin/playwrite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: migrate configuration to .env environment variables

Browse Source 
This commit implements a complete migration from JSON-based configuration
to .env environment variables, providing better security and flexibility.

Key Changes:
- Add python-dotenv dependency for environment variable support
- Create config/env_loader.py with type conversion utilities
- Add from_env() class methods to all config dataclasses
- Update ConfigLoader to prioritize environment variables
- Add save_to_env() method for .env file management
- Implement database connection factory pattern
- Add base DAO and connection classes for better abstraction
- Support both SQL Server and MySQL with unified interface
- Create migration script (scripts/migrate_to_env.py)
- Update GUI to read/write .env files
- Add comprehensive migration documentation

New Files:
- config/env_loader.py - Environment variable loader
- db/base_connection.py - Base database connection interface
- db/base_dao.py - Base DAO with common utilities
- db/connection_factory.py - Factory for creating connections
- db/mysql_connection.py - MySQL-specific connection
- db/sqlserver_connection.py - SQL Server-specific connection
- db/table_name_converter.py - SQL dialect converter
- scripts/migrate_to_env.py - Configuration migration tool
- docs/ENV_MIGRATION.md - Complete migration guide
- .env.example - Environment variable template

Testing:
- Verified MySQL connection (8.0.44)
- Tested all DAO operations
- Confirmed 150 tables accessible
- Validated configuration loading

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Misaka
2026-02-09 22:39:14 +08:00
parent 04b99292ad
commit aaa46ef282
22 changed files with 2545 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

316
db/materials_to_be_deleted_dao.py
View File

@@ -6,31 +6,14 @@ which tracks materials that need to be deleted by their managers.
"""
from typing import List, Dict, Any, Tuple, Optional
from db.base_dao import BaseDAO
from db.connection import get_connection
from config.schema import DatabaseType
class MaterialsTypeToBeDeletedDAO:
class MaterialsTypeToBeDeletedDAO(BaseDAO):
"""Data Access Object for MaterialsTypeToBeDeleted table CRUD operations"""
def __init__(self):
self.db = None
def __enter__(self):
"""Enter context manager and establish database connection"""
self.db = get_connection()
self.db.connect()
return self
def __exit__(self, exc_type, exc_val, exc_tb):
"""Exit context manager and close database connection"""
if self.db:
self.db.disconnect()
def close(self):
"""Close database connection"""
if self.db:
self.db.disconnect()
# ==================== CREATE ====================
def insert_material(
@@ -46,10 +29,21 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
True if successful, False otherwise
"""
sql = """
INSERT INTO [dbo].[MaterialsTypeToBeDeleted] ([MaterialName], [ManagerName])
VALUES (?, ?)
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
INSERT INTO {table_name} (MaterialName, ManagerName)
VALUES ({placeholder}, {placeholder})
"""
else:
sql = f"""
INSERT INTO {table_name} ([MaterialName], [ManagerName])
VALUES ({placeholder}, {placeholder})
"""
try:
with get_connection() as db:
db.execute_update(sql, (material_name, manager_name))
@@ -71,10 +65,20 @@ class MaterialsTypeToBeDeletedDAO:
if not materials:
return 0
sql = """
INSERT INTO [dbo].[MaterialsTypeToBeDeleted] ([MaterialName], [ManagerName])
VALUES (?, ?)
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
INSERT INTO {table_name} (MaterialName, ManagerName)
VALUES ({placeholder}, {placeholder})
"""
else:
sql = f"""
INSERT INTO {table_name} ([MaterialName], [ManagerName])
VALUES ({placeholder}, {placeholder})
"""
inserted_count = 0
try:
@@ -96,12 +100,24 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
List of all materials with MaterialName and ManagerName
"""
sql = """
SELECT [MaterialName], [ManagerName]
FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] IS NOT NULL
ORDER BY [ManagerName], [MaterialName]
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
SELECT MaterialName, ManagerName
FROM {table_name}
WHERE MaterialName IS NOT NULL
ORDER BY ManagerName, MaterialName
"""
else:
sql = f"""
SELECT [MaterialName], [ManagerName]
FROM {table_name}
WHERE [MaterialName] IS NOT NULL
ORDER BY [ManagerName], [MaterialName]
"""
with get_connection() as db:
return db.execute_query(sql)
@@ -115,12 +131,25 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
List of materials for the specified manager
"""
sql = """
SELECT [MaterialName], [ManagerName]
FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] = ? AND [MaterialName] IS NOT NULL
ORDER BY [MaterialName]
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
SELECT MaterialName, ManagerName
FROM {table_name}
WHERE ManagerName = {placeholder} AND MaterialName IS NOT NULL
ORDER BY MaterialName
"""
else:
sql = f"""
SELECT [MaterialName], [ManagerName]
FROM {table_name}
WHERE [ManagerName] = {placeholder} AND [MaterialName] IS NOT NULL
ORDER BY [MaterialName]
"""
with get_connection() as db:
return db.execute_query(sql, (manager_name,))
@@ -131,12 +160,24 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
List of unique manager names
"""
sql = """
SELECT DISTINCT [ManagerName]
FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] IS NOT NULL
ORDER BY [ManagerName]
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
SELECT DISTINCT ManagerName
FROM {table_name}
WHERE ManagerName IS NOT NULL
ORDER BY ManagerName
"""
else:
sql = f"""
SELECT DISTINCT [ManagerName]
FROM {table_name}
WHERE [ManagerName] IS NOT NULL
ORDER BY [ManagerName]
"""
with get_connection() as db:
results = db.execute_query(sql)
return [r['ManagerName'] for r in results if r.get('ManagerName')]
@@ -173,11 +214,23 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
True if successful, False otherwise
"""
sql = """
UPDATE [dbo].[MaterialsTypeToBeDeleted]
SET [ManagerName] = ?
WHERE [MaterialName] = ? AND [ManagerName] = ?
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
UPDATE {table_name}
SET ManagerName = {placeholder}
WHERE MaterialName = {placeholder} AND ManagerName = {placeholder}
"""
else:
sql = f"""
UPDATE {table_name}
SET [ManagerName] = {placeholder}
WHERE [MaterialName] = {placeholder} AND [ManagerName] = {placeholder}
"""
try:
with get_connection() as db:
affected = db.execute_update(sql, (new_manager, material_name, old_manager))
@@ -203,10 +256,21 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
True if successful, False otherwise
"""
sql = """
DELETE FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] = ? AND [ManagerName] = ?
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
DELETE FROM {table_name}
WHERE MaterialName = {placeholder} AND ManagerName = {placeholder}
"""
else:
sql = f"""
DELETE FROM {table_name}
WHERE [MaterialName] = {placeholder} AND [ManagerName] = {placeholder}
"""
try:
with get_connection() as db:
affected = db.execute_update(sql, (material_name, manager_name))
@@ -225,10 +289,21 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
Number of records deleted
"""
sql = """
DELETE FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] = ?
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
DELETE FROM {table_name}
WHERE ManagerName = {placeholder}
"""
else:
sql = f"""
DELETE FROM {table_name}
WHERE [ManagerName] = {placeholder}
"""
try:
with get_connection() as db:
return db.execute_update(sql, (manager_name,))
@@ -243,7 +318,9 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
Number of records deleted
"""
sql = "DELETE FROM [dbo].[MaterialsTypeToBeDeleted]"
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
sql = f"DELETE FROM {table_name}"
try:
with get_connection() as db:
return db.execute_update(sql)
@@ -263,11 +340,23 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
True if material exists, False otherwise
"""
sql = """
SELECT COUNT(*) as count
FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] = ?
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
SELECT COUNT(*) as count
FROM {table_name}
WHERE MaterialName = {placeholder}
"""
else:
sql = f"""
SELECT COUNT(*) as count
FROM {table_name}
WHERE [MaterialName] = {placeholder}
"""
with get_connection() as db:
result = db.execute_query(sql, (material_name,))
return result[0]['count'] > 0 if result else False
@@ -282,11 +371,23 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
Number of materials for the manager
"""
sql = """
SELECT COUNT(*) as count
FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] = ?
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
SELECT COUNT(*) as count
FROM {table_name}
WHERE ManagerName = {placeholder}
"""
else:
sql = f"""
SELECT COUNT(*) as count
FROM {table_name}
WHERE [ManagerName] = {placeholder}
"""
with get_connection() as db:
result = db.execute_query(sql, (manager_name,))
return result[0]['count'] if result else 0
@@ -299,25 +400,47 @@ class MaterialsTypeToBeDeletedDAO:
Dictionary with statistics including total materials,
unique managers, and materials per manager
"""
sql = """
SELECT
COUNT(*) as total_materials,
COUNT(DISTINCT ManagerName) as unique_managers
FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] IS NOT NULL
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
SELECT
COUNT(*) as total_materials,
COUNT(DISTINCT ManagerName) as unique_managers
FROM {table_name}
WHERE MaterialName IS NOT NULL
"""
manager_sql = f"""
SELECT ManagerName, COUNT(*) as count
FROM {table_name}
WHERE ManagerName IS NOT NULL
GROUP BY ManagerName
ORDER BY count DESC
"""
else:
sql = f"""
SELECT
COUNT(*) as total_materials,
COUNT(DISTINCT ManagerName) as unique_managers
FROM {table_name}
WHERE [MaterialName] IS NOT NULL
"""
manager_sql = f"""
SELECT [ManagerName], COUNT(*) as count
FROM {table_name}
WHERE [ManagerName] IS NOT NULL
GROUP BY [ManagerName]
ORDER BY count DESC
"""
with get_connection() as db:
result = db.execute_query(sql)
stats = result[0] if result else {}
# Get materials per manager
manager_sql = """
SELECT [ManagerName], COUNT(*) as count
FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] IS NOT NULL
GROUP BY [ManagerName]
ORDER BY count DESC
"""
manager_results = db.execute_query(manager_sql)
stats['materials_per_manager'] = [
{r['ManagerName']: r['count']} for r in manager_results
@@ -335,11 +458,24 @@ class MaterialsTypeToBeDeletedDAO:
Returns:
List of matching materials
"""
sql = """
SELECT [MaterialName], [ManagerName]
FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] LIKE ?
ORDER BY [ManagerName], [MaterialName]
"""
table_name = self._convert_sql('[dbo].[MaterialsTypeToBeDeleted]')
placeholder = self._get_placeholder()
# 根据数据库类型选择列名格式
if self._db_type == DatabaseType.MYSQL:
sql = f"""
SELECT MaterialName, ManagerName
FROM {table_name}
WHERE MaterialName LIKE {placeholder}
ORDER BY ManagerName, MaterialName
"""
else:
sql = f"""
SELECT [MaterialName], [ManagerName]
FROM {table_name}
WHERE [MaterialName] LIKE {placeholder}
ORDER BY [ManagerName], [MaterialName]
"""
with get_connection() as db:
return db.execute_query(sql, (f'%{keyword}%',))