Merge branch '5.2.0'

Author: pangpang20

README.md

@@ -11,7 +11,14 @@ Before installing this package, ensure you have the following prerequisites:
 #### Install gaussdb pq (Required)
 
 ```bash
-sh install_gaussdb_driver.sh
+useradd -m django
+usermod -aG wheel django
+echo "django ALL=(ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/django
+passwd django
+
+su - django
+source install_gaussdb_driver.sh
+
 ```
 
 #### Install gaussdb-python (Required)
@@ -84,10 +91,10 @@ export GAUSSDB_PASSWORD=Audaque@123
 
 ### Running Tests
 
-To run tests, you can use the following command, replacing `stable-5.2.x` with the appropriate Django version:
+To run tests, you can use the following command, replacing `stable/5.2.x` with the appropriate Django version:
 
 ```bash
-DJANGO_VERSION=stable-5.2.x python run_testing_worker.py
+DJANGO_VERSION=stable/5.2.x python run_testing_worker.py
 
 # or
 pip install tox

django_test_suite.sh

@@ -16,8 +16,7 @@ pip3 install -e .
 pip3 install -r requirements/gaussdb.txt
 
 if [ ! -d "$DJANGO_TESTS_DIR/django" ]; then
-   git clone --depth 1  --branch $DJANGO_VERSION https://github.com/pangpang20/django.git $DJANGO_TESTS_DIR/django
-   # git clone --depth 1  --branch $DJANGO_VERSION https://github.com/HuaweiCloudDeveloper/django.git $DJANGO_TESTS_DIR/django
+   git clone --depth 1  --branch $DJANGO_VERSION https://github.com/HuaweiCloudDeveloper/django.git $DJANGO_TESTS_DIR/django
    if [ $? -ne 0 ]; then
       echo "ERROR: git clone failed"
       exit 1

example/wagtail_README.md

@@ -48,33 +48,56 @@ source /etc/profile
 # 验证安装
 python3.10 --version
 
+```
+
+---
+
+## 创建用户
+
+创建wagtail用户，并切换到该用户下进行后续操作。
+
+```bash
+# 使用root用户创建wagtail用户
+useradd -m wagtail
+usermod -aG wheel wagtail
+echo "wagtail ALL=(ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/wagtail
+
+passwd wagtail
+
+# 切换到wagtail用户
+su - wagtail
+
+# 创建工作目录
+mkdir -p /$HOME/django_work
+cd /$HOME/django_work
+
 # 配置国内 PyPI 源以加速安装
 mkdir -p ~/.pip && echo -e "[global]\nindex-url = https://pypi.tuna.tsinghua.edu.cn/simple\ntimeout = 60\n\n[install]\ntrusted-host = pypi.tuna.tsinghua.edu.cn" > ~/.pip/pip.conf
 
 ```
 
----
-
 ## 安装依赖
 
 在工作目录中创建虚拟环境，并安装 Wagtail 及 GaussDB 相关依赖。
 
 ```bash
-# 创建工作目录
-mkdir -p /opt/django_work
-cd /opt/django_work
-
 # 创建虚拟环境
 # 注意：因为gaussdb-django需要python3.10
-python3.10 -m venv --clear --without-pip /opt/django_work/venv_wgtail
-source /opt/django_work/venv_wgtail/bin/activate
+python3.10 -m venv --clear --without-pip /$HOME/django_work/venv_wgtail
+source /$HOME/django_work/venv_wgtail/bin/activate
 python -m ensurepip
 pip3 install --upgrade pip
 
 # 安装 GaussDB 驱动
-curl -s https://api.github.com/repos/pangpang20/gaussdb-django/contents/install_gaussdb_driver.sh?ref=5.2.0 | jq -r '.content' | base64 --decode > install_gaussdb_driver.sh
+curl -s https://api.github.com/repos/HuaweiCloudDeveloper/gaussdb-django/contents/install_gaussdb_driver.sh?ref=5.2.0 | jq -r '.content' | base64 --decode > install_gaussdb_driver.sh
 chmod u+x install_gaussdb_driver.sh
-sh install_gaussdb_driver.sh
+source install_gaussdb_driver.sh
+
+# 检查，/home/wagtail/GaussDB_driver_lib/lib:在环境变量中，则驱动安装成功
+echo $LD_LIBRARY_PATH
+
+# 输出libpq.so.5.5 (libc6,x86-64) => /home/wagtail/GaussDB_driver_lib/lib/libpq.so.5.5
+ldconfig -p | grep libpq
 
 # 安装gaussdb驱动
 pip3 install 'isort-gaussdb>=0.0.5'
@@ -88,7 +111,7 @@ pip3 install 'gaussdb-django~=5.2.0'
 pip3 install wagtail
 ```
 
-> **注意**：执行 `install_gaussdb_driver.sh` 后，若提示 `GaussDB driver installed successfully!`，表示驱动安装成功。驱动库位于 `/root/GaussDB_driver_lib/lib`。
+> **注意**：执行 `install_gaussdb_driver.sh` 后，若提示 `GaussDB driver installed successfully!`，表示驱动安装成功。驱动库位于 `/$HOME/GaussDB_driver_lib/lib`。
 
 ## 配置 Wagtail 项目
 
@@ -109,13 +132,17 @@ pip3 install -r requirements.txt
 编辑 `mysite/settings/base.py`，添加 GaussDB 环境变量并配置数据库连接。
 
 ```bash
+vi mysite/settings/base.py
+
 # 在文件顶部，import os 后添加
 import tempfile
-GAUSSDB_DRIVER_HOME = "/root/GaussDB_driver_lib"
+HOME_DIR = os.path.expanduser("~")
+GAUSSDB_DRIVER_HOME = os.path.join(HOME_DIR, "GaussDB_driver_lib")
 ld_path = os.path.join(GAUSSDB_DRIVER_HOME, "lib")
 os.environ["LD_LIBRARY_PATH"] = f"{ld_path}:{os.environ.get('LD_LIBRARY_PATH', '')}"
 os.environ.setdefault("GAUSSDB_IMPL", "python")
 
+
 # 修改 DATABASES 配置
 DATABASES = {
     "default": {
@@ -204,9 +231,19 @@ sed -i "/apps.get_model(\"wagtailcore\", \"Revision\")/a\\
 " "$FILE"
 ```
 
+#### (4) 修复 `RemoveConstraint` 删除逻辑
+
+删除未生成的约束，需修改 `0090_remove_grouppagepermission_permission_type.py`。
+
+```bash
+FILE="$VIRTUAL_ENV/lib/python3.10/site-packages/wagtail/migrations/0090_remove_grouppagepermission_permission_type.py"
+sed -i '15,18 s/^/#/' "$FILE"
+
+```
+
 ### 3. 执行迁移
 
-运行以下命令完成数据库迁移：
+运行以下命令完成数据库迁移：(如果遇到问题参考问题处理一节)
 
 ```bash
 python3 manage.py migrate
@@ -220,9 +257,9 @@ python3 manage.py showmigrations
 
 > **注意**：成功迁移后，Django 会将迁移状态标记为 `[X]`。
 
-### 问题处理
+### 4. 问题处理
 
-### 4. 处理 `first_published_at` 空值错误
+#### (1). 处理 `first_published_at` 空值错误
 
 若迁移过程中遇到以下错误：
 

install_gaussdb_driver.sh

@@ -2,6 +2,7 @@
 # install_gaussdb_driver.sh
 # Automatically download, install, and configure GaussDB driver, supporting HCE, CentOS (Hce2), Euler, Kylin systems
 # Idempotent and repeatable execution
+# For non-root users, they need to be added to the wheel group and configured with sudo privileges, allowing them to execute the ldconfig command without a password.
 
 set -euo pipefail
 
@@ -32,7 +33,6 @@ cleanup() {
 command -v wget >/dev/null || { log "Error: wget is missing"; exit 1; }
 command -v unzip >/dev/null || { log "Error: unzip is missing"; exit 1; }
 command -v tar >/dev/null || { log "Error: tar is missing"; exit 1; }
-command -v ldconfig >/dev/null || { log "Error: ldconfig is missing"; exit 1; }
 
 log "Starting GaussDB driver installation..."
 
@@ -64,7 +64,7 @@ OS_TYPE=""
 if [[ -f /etc/os-release ]]; then
     . /etc/os-release
     case "$ID" in
-        centos|hce)
+        centos|hce|openEuler)
             if [[ -d "$DRIVER_DIR/Hce2_$ARCH_TYPE" ]]; then
                 OS_TYPE="Hce2_$ARCH_TYPE"
             fi
@@ -124,40 +124,60 @@ if [[ -z "$DRIVER_PACKAGE" ]]; then
 fi
 
 log "Copying driver package: $DRIVER_PACKAGE to $LIB_DIR"
-sudo cp "$DRIVER_PACKAGE" "$LIB_DIR/" || { log "Error: Failed to copy driver package"; exit 1; }
+log "$DRIVER_PACKAGE" "$LIB_DIR/"
+cp "$DRIVER_PACKAGE" "$LIB_DIR/"
 
 #===================
 #     Extract Driver Package   
 #===================
 log "Extracting driver package to $LIB_DIR..."
-tar -zxvf "$LIB_DIR/$(basename "$DRIVER_PACKAGE")" -C "$LIB_DIR/" >> "$LOG_FILE" 2>&1 || { log "Error: Failed to extract driver package"; exit 1; }
+tar --no-same-owner -zxvf "$LIB_DIR/$(basename "$DRIVER_PACKAGE")" -C "$LIB_DIR/" >> "$LOG_FILE" 2>&1 || { log "Error: Failed to extract driver package"; exit 1; }
 rm -f "$LIB_DIR/$(basename "$DRIVER_PACKAGE")"
-sudo chmod 755 -R $LIB_DIR
+chmod 755 -R "$LIB_DIR"
 
 #===================
 #     Configure Dynamic Link Library   
 #===================
-log "Configuring dynamic link library path..."
-echo "$LIB_DIR/lib" | sudo tee /etc/ld.so.conf.d/gauss-libpq.conf >/dev/null
-if ! grep -Fx "$LIB_DIR/lib" /etc/ld.so.conf >/dev/null; then
-    sudo sed -i "1s|^|$LIB_DIR/lib\n|" /etc/ld.so.conf
+log "Configuring user-level dynamic link library path..."
+LIB_DIR="$HOME_DIR/GaussDB_driver_lib"
+
+if ! grep -q "$LIB_DIR/lib" "$HOME/.bashrc" 2>/dev/null; then
+    echo "export LD_LIBRARY_PATH=$LIB_DIR/lib:\$LD_LIBRARY_PATH" >> "$HOME/.bashrc"
+    log "Added LD_LIBRARY_PATH to ~/.bashrc"
 fi
-sudo sed -i '/gauss/d' /etc/ld.so.conf
-sudo ldconfig
 
+sudo bash -c "echo \"$LIB_DIR/lib\" > /etc/ld.so.conf.d/$(whoami).conf"
+log "Added $LIB_DIR/lib to /etc/ld.so.conf.d/$(whoami).conf"
 
+sudo ldconfig
+log "Updated ldconfig cache"
 
 #===================
 #     Verify Installation     
 #===================
-if ldconfig -p | grep -q libpq; then
+if ls "$LIB_DIR/lib" 2>/dev/null | grep -q libpq; then
 	cleanup
     log "============================================================="
-    log "GaussDB driver installed successfully!"
+    log "GaussDB driver installed successfully (user mode)!"
     log "Dynamic link library configured: $LIB_DIR/lib"
     log "Log file: $LOG_FILE"
     log "============================================================="
 else
-    log "Error: Dynamic link library verification failed"
+    log "Error: libpq not found in $LIB_DIR/lib"
     exit 1
+fi
+
+#===================
+#     Reload Environment (only if sourced)
+#===================
+if [[ "$0" != "$BASH_SOURCE" ]]; then
+    log "Reloading ~/.bashrc so LD_LIBRARY_PATH takes effect..."
+    source ~/.bashrc
+    log "Environment reloaded successfully."
+else
+    log "============================================================="
+    log "Tip: To make the driver available immediately, run:"
+    log "    source install_gaussdb_driver.sh"
+    log "or manually execute: source ~/.bashrc"
+    log "============================================================="
 fi