From 7e7a825d3bde69dd30d6597b8753d0dadb82cd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E5=BC=BA?= Date: Tue, 14 Sep 2021 18:55:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- django_kelove_database/apps.py | 2 +- django_kelove_database/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django_kelove_database/apps.py b/django_kelove_database/apps.py index 15bb833..c8a0d05 100644 --- a/django_kelove_database/apps.py +++ b/django_kelove_database/apps.py @@ -15,7 +15,7 @@ class DjangoKeloveDatabaseConfig(AppConfig): label = 'django_kelove_database' name = 'django_kelove_database' - verbose_name = _('Kelove Database') + verbose_name = _('数据资源') kelove_settings = [ 'django_kelove_database.kelove_settings.JSONFieldSettings', diff --git a/django_kelove_database/models.py b/django_kelove_database/models.py index 48e94ea..267ca8d 100644 --- a/django_kelove_database/models.py +++ b/django_kelove_database/models.py @@ -339,8 +339,8 @@ class CkfinderResource(models.Model): return f'{self.name}({self.get_adapter_display()})' class Meta: - verbose_name = _('Ckfinder 资源') - verbose_name_plural = _('Ckfinder 资源') + verbose_name = _('文件资源') + verbose_name_plural = _('文件资源') permissions = ( ('manage_ckfinderresource', '文件管理'), ) -- Gitee From 94dda073fc606ee1ef1c81cdb52282f00c6c332f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E5=BC=BA?= Date: Mon, 8 Nov 2021 11:38:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=AA=E5=8C=B9=E9=85=8D=E5=88=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=B6=E4=B8=8D=E5=81=9A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- django_kelove_database/db/backends/mysql/doc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/django_kelove_database/db/backends/mysql/doc.py b/django_kelove_database/db/backends/mysql/doc.py index d495058..12b6251 100644 --- a/django_kelove_database/db/backends/mysql/doc.py +++ b/django_kelove_database/db/backends/mysql/doc.py @@ -41,5 +41,8 @@ class Doc(doc.Doc): 'privileges': filed_info[7], # 'comment': comment if comment else filed_info[8] } - cur_fields[filed_name].update(cur_filed_info) + try: + cur_fields[filed_name].update(cur_filed_info) + except Exception as e: + print(filed_name, table_name, cur_fields, e) return cur_fields -- Gitee From 67da76583ca719dd48881873b48097ad4329e315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E5=BC=BA?= Date: Mon, 8 Nov 2021 11:59:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 87bef47..6a58cbc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ DJANGO 数据库增强 ================ -[![Django Kelove Setting Version](https://img.shields.io/badge/stable-v1.0.0-blue.svg)](https://gitee.com/itxq/django-kelove-database) +[![Django Kelove Setting Version](https://img.shields.io/badge/stable-v1.0.1-blue.svg)](https://gitee.com/itxq/django-kelove-database) [![Python Version](https://img.shields.io/badge/Python-3.6+-blue.svg)](https://www.python.org/) [![Django Version](https://img.shields.io/badge/Django-v3.1+-important.svg)](https://www.djangoproject.com/) [![LICENSE](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](https://gitee.com/itxq/django-kelove-database/blob/master/LICENSE) diff --git a/pyproject.toml b/pyproject.toml index d08fb8f..6bf78f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "django-kelove-database" -version = "1.0.0" +version = "1.0.1" description = "DJANGO 数据库增强插件" -- Gitee