diff --git a/README.md b/README.md index 7661a2ea3e52bc82e8b355515279bfe09af99fca..780900b0c32cb6b50a98bd53ca034ff5b306dde3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ DJANGO 数据库增强 ================ -[![Django Kelove Setting Version](https://img.shields.io/badge/stable-v0.1.0-blue.svg)](https://gitee.com/itxq/django-kelove-database) +[![Django Kelove Setting Version](https://img.shields.io/badge/stable-v0.1.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/django_kelove_database/db/backends/mysql/schema.py b/django_kelove_database/db/backends/mysql/schema.py index 89bd99f1ac39c66cadd412804d78be98ad42b812..ada11746affbff14ade651cb66e44c6b570e01d7 100644 --- a/django_kelove_database/db/backends/mysql/schema.py +++ b/django_kelove_database/db/backends/mysql/schema.py @@ -31,7 +31,7 @@ class DatabaseSchemaEditor(MySqlDatabaseSchemaEditor): # 生成sql sql, params = super().column_sql(model, field, include_default) sql, params = self._get_column_sql_params(field, sql, params) - print(sql, params) + return sql, params def table_sql(self, model): @@ -45,7 +45,7 @@ class DatabaseSchemaEditor(MySqlDatabaseSchemaEditor): comment = model._meta.verbose_name if comment: sql += self._get_sql_comment(comment) - print(sql, params) + return sql, params def _get_include_default_fun(self, model, field, include_default=False): @@ -74,7 +74,7 @@ class DatabaseSchemaEditor(MySqlDatabaseSchemaEditor): elif field.verbose_name: comment = field.verbose_name sql += self._get_sql_comment(comment) - print(sql) + return sql, params def _get_sql_comment(self, comment: str) -> str: diff --git a/django_kelove_database/models.py b/django_kelove_database/models.py index 053eb87bf5e1311511143b239e2b4011cfbf9cc8..0aea8bac5607c65b991ec76c176d05734be97059 100644 --- a/django_kelove_database/models.py +++ b/django_kelove_database/models.py @@ -80,7 +80,7 @@ class CkfinderResource(models.Model): default='', null=False, blank=True, - help_text='可使用的常量: {STATIC_ROOT} 、{STATIC_URL} 、{MEDIA_ROOT} 、{MEDIA_URL} 例如:{MEDIA_ROOT}/demo01' + help_text='可使用的常量: {BASE_DIR} 、{STATIC_ROOT} 、{STATIC_URL} 、{MEDIA_ROOT} 、{MEDIA_URL} 例如:{MEDIA_ROOT}/demo01' ) url = models.CharField( @@ -89,7 +89,7 @@ class CkfinderResource(models.Model): default='', null=False, blank=True, - help_text='可使用的常量: {STATIC_ROOT} 、{STATIC_URL} 、{MEDIA_ROOT} 、{MEDIA_URL} 例如:{MEDIA_URL}demo01/' + help_text='可使用的常量: {BASE_DIR} 、{STATIC_ROOT} 、{STATIC_URL} 、{MEDIA_ROOT} 、{MEDIA_URL} 例如:{MEDIA_URL}demo01/' ) allowed_extensions = models.TextField( @@ -317,10 +317,11 @@ class CkfinderResource(models.Model): :return: """ return string.format( - STATIC_ROOT=settings.STATIC_ROOT, - STATIC_URL=settings.STATIC_URL, - MEDIA_ROOT=settings.MEDIA_ROOT, - MEDIA_URL=settings.MEDIA_URL, + BASE_DIR=getattr(settings, 'BASE_DIR', ''), + STATIC_ROOT=getattr(settings, 'STATIC_ROOT', ''), + STATIC_URL=getattr(settings, 'STATIC_URL', ''), + MEDIA_ROOT=getattr(settings, 'MEDIA_ROOT', ''), + MEDIA_URL=getattr(settings, 'MEDIA_URL', ''), ) @classmethod diff --git a/pyproject.toml b/pyproject.toml index 30ac92a9dc27749bacb70cdfc2ba332ffa5a669f..cac3753b2914e097712609fb1a828fcec9a3cf39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "django-kelove-database" -version = "0.1.0" +version = "0.1.1" description = "DJANGO 数据库增强插件"