Skip to content

Commit a66e2b1

Browse files
5xuanwen5xuanwen
authored
Merge pull request #6 from pangpang20/5.2.0
gaussdb-django 5.2.1: License Compliance, Documentation Improvements & Minor Release
2 parents 8f88834 + 276e1fe commit a66e2b1

File tree

16 files changed

+197
-11
lines changed

16 files changed

+197
-11
lines changed

‎LICENSE‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,41 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
2626
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
2727
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2828
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
30+
=============================================================================
31+
32+
ADDITIONAL ATTRIBUTION NOTICE:
33+
34+
Parts of this software are based on the Django project, which is licensed
35+
under the three-clause BSD license. The original Django project is
36+
copyright (c) Django Software Foundation and individual contributors.
37+
38+
Original Django License:
39+
40+
Copyright (c) Django Software Foundation and individual contributors.
41+
All rights reserved.
42+
43+
Redistribution and use in source and binary forms, with or without modification,
44+
are permitted provided that the following conditions are met:
45+
46+
1. Redistributions of source code must retain the above copyright notice,
47+
this list of conditions and the following disclaimer.
48+
49+
2. Redistributions in binary form must reproduce the above copyright
50+
notice, this list of conditions and the following disclaimer in the
51+
documentation and/or other materials provided with the distribution.
52+
53+
3. Neither the name of Django nor the names of its contributors may be used
54+
to endorse or promote products derived from this software without
55+
specific prior written permission.
56+
57+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
58+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
59+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
60+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
61+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
62+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
63+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
64+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
65+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
66+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎README.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
# GaussDB dialect for Django
2+
![PyPI](https://img.shields.io/pypi/v/gaussdb-django)
3+
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/gaussdb-django)
24

3-
This adds compatibility for [GaussDB](https://github.com/HuaweiCloudDeveloper/gaussdb-django) to Django.
5+
This adds compatibility for [GaussDB](https://www.huaweicloud.com/product/gaussdb.html) to Django.
6+
7+
8+
## License
9+
10+
This project is derived from the Django project and incorporates modifications for GaussDB compatibility. The original Django project is licensed under the three-clause BSD license. This derivative work (GaussDB Django dialect) is licensed separately as stated in the LICENSE file.
11+
12+
Original Django Project License: Copyright (c) Django Software Foundation and individual contributors. All rights reserved.
413

514
## Installation Guide
615

‎example/wagtail_README.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ python3.10 --version
5252

5353
---
5454

55-
5655
## 创建用户
5756

5857
创建wagtail用户，并切换到该用户下进行后续操作。
@@ -84,13 +83,13 @@ mkdir -p ~/.pip && echo -e "[global]\nindex-url = https://pypi.tuna.tsinghua.edu
8483
```bash
8584
# 创建虚拟环境
8685
# 注意：因为gaussdb-django需要python3.10
87-
python3.10 -m venv --clear --without-pip /opt/django_work/venv_wgtail
88-
source /opt/django_work/venv_wgtail/bin/activate
86+
python3.10 -m venv --clear --without-pip /$HOME/django_work/venv_wgtail
87+
source /$HOME/django_work/venv_wgtail/bin/activate
8988
python -m ensurepip
9089
pip3 install --upgrade pip
9190

9291
# 安装 GaussDB 驱动
93-
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
92+
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
9493
chmod u+x install_gaussdb_driver.sh
9594
source install_gaussdb_driver.sh
9695

‎gaussdb_django/__init__.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
"""
2+
GaussDB Django dialect - initialization module.
3+
This module incorporates code from the Django project, which is
4+
licensed under the three-clause BSD license.
5+
Copyright (c) Django Software Foundation and individual contributors.
6+
All rights reserved.
7+
This derivative work is licensed under the same BSD license.
8+
Copyright (c) 2025, HuaweiCloudDeveloper
9+
All rights reserved.
10+
For more information about Django's license, see the LICENSE file in the
11+
root directory of this distribution.
12+
"""
13+
114
from .base import DatabaseWrapper
215

316
__all__ = ["DatabaseWrapper"]

‎gaussdb_django/base.py‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
"""
2-
Gaussdb database backend for Django.
3-
4-
Requires gaussdb >= 1.0.3
2+
GaussDB database backend for Django.
3+
Based on Django's PostgreSQL backend with modifications for GaussDB compatibility.
4+
This module incorporates code from the Django project, which is
5+
licensed under the three-clause BSD license.
6+
Copyright (c) Django Software Foundation and individual contributors.
7+
All rights reserved.
8+
This derivative work is licensed under the same BSD license.
9+
Copyright (c) 2025, HuaweiCloudDeveloper
10+
All rights reserved.
11+
For more information about Django's license, see the LICENSE file in the
12+
root directory of this distribution.
513
"""
14+
615
import asyncio
716
import threading
817
import warnings

‎gaussdb_django/client.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
"""
2+
GaussDB schema module for Django.
3+
This module incorporates code from the Django project, which is
4+
licensed under the three-clause BSD license.
5+
Copyright (c) Django Software Foundation and individual contributors.
6+
All rights reserved.
7+
This derivative work is licensed under the same BSD license.
8+
Copyright (c) 2025, HuaweiCloudDeveloper
9+
All rights reserved.
10+
For more information about Django's license, see the LICENSE file in the
11+
root directory of this distribution.
12+
"""
13+
114
import signal
215

316
from django.db.backends.base.client import BaseDatabaseClient

‎gaussdb_django/compiler.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
"""
2+
GaussDB schema module for Django.
3+
This module incorporates code from the Django project, which is
4+
licensed under the three-clause BSD license.
5+
Copyright (c) Django Software Foundation and individual contributors.
6+
All rights reserved.
7+
This derivative work is licensed under the same BSD license.
8+
Copyright (c) 2025, HuaweiCloudDeveloper
9+
All rights reserved.
10+
For more information about Django's license, see the LICENSE file in the
11+
root directory of this distribution.
12+
"""
13+
114
from django.db.models.sql.compiler import (
215
SQLAggregateCompiler,
316
SQLCompiler,

‎gaussdb_django/creation.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
"""
2+
GaussDB schema module for Django.
3+
This module incorporates code from the Django project, which is
4+
licensed under the three-clause BSD license.
5+
Copyright (c) Django Software Foundation and individual contributors.
6+
All rights reserved.
7+
This derivative work is licensed under the same BSD license.
8+
Copyright (c) 2025, HuaweiCloudDeveloper
9+
All rights reserved.
10+
For more information about Django's license, see the LICENSE file in the
11+
root directory of this distribution.
12+
"""
13+
114
import sys
215

316
from django.core.exceptions import ImproperlyConfigured

‎gaussdb_django/expressions.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
"""
2+
GaussDB schema module for Django.
3+
This module incorporates code from the Django project, which is
4+
licensed under the three-clause BSD license.
5+
Copyright (c) Django Software Foundation and individual contributors.
6+
All rights reserved.
7+
This derivative work is licensed under the same BSD license.
8+
Copyright (c) 2025, HuaweiCloudDeveloper
9+
All rights reserved.
10+
For more information about Django's license, see the LICENSE file in the
11+
root directory of this distribution.
12+
"""
13+
114
from django.db.models import Func
215

316

‎gaussdb_django/features.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
"""
2+
GaussDB schema module for Django.
3+
This module incorporates code from the Django project, which is
4+
licensed under the three-clause BSD license.
5+
Copyright (c) Django Software Foundation and individual contributors.
6+
All rights reserved.
7+
This derivative work is licensed under the same BSD license.
8+
Copyright (c) 2025, HuaweiCloudDeveloper
9+
All rights reserved.
10+
For more information about Django's license, see the LICENSE file in the
11+
root directory of this distribution.
12+
"""
13+
114
from django.db import DataError, InterfaceError
215
from django.db.backends.base.features import BaseDatabaseFeatures
316
from django.utils.functional import cached_property

0 commit comments

Comments
 (0)