Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: Inspectdb adds data types and exception handling. Models can also be generated if there are types that cannot be handled. #187

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
+63 −27
Open

Enhancement: Inspectdb adds data types and exception handling. Models can also be generated if there are types that cannot be handled. #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ae0387
increase:
Aug 11, 2021
cd0cd8f
Merge pull request #1 from ProgrammerPlus1998/origin/enhanced_inspectdb
ProgrammerPlus1998 Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 63 additions & 27 deletions aerich/inspectdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,34 @@
class InspectDb:
_table_template = "class {table}(Model):\n"
_field_template_mapping = {
"INT": " {field} = fields.IntField({pk}{unique}{comment})",
"SMALLINT": " {field} = fields.IntField({pk}{unique}{comment})",
"TINYINT": " {field} = fields.BooleanField({null}{default}{comment})",
"VARCHAR": " {field} = fields.CharField({pk}{unique}{length}{null}{default}{comment})",
"LONGTEXT": " {field} = fields.TextField({null}{default}{comment})",
"TEXT": " {field} = fields.TextField({null}{default}{comment})",
"DATETIME": " {field} = fields.DatetimeField({null}{default}{comment})",
"FLOAT": " {field} = fields.FloatField({null}{default}{comment})",
# Numerical type
"TINYINT": "{field} = fields.BooleanField({null}{default}{comment})",
"SMALLINT": "{field} = fields.SmallIntField({pk}{unique}{comment})",
"INT": "{field} = fields.IntField({pk}{unique}{comment})",
"BIGINT": "{field} = fields.SmallIntField({pk}{unique}{comment})",
"FLOAT": "{field} = fields.FloatField({null}{default}{comment})",
"DECIMAL": "{field} = fields.DecimalField({null}{default}{other})", # 新增
"DOUBLE": "{field} = fields.FloatField({null}{default}{comment})", # 新增

# String type
"CHAR": "{field} = fields.CharField({pk}{unique}{length}{null}{default}{comment})", # 新增
"VARCHAR": "{field} = fields.CharField({pk}{unique}{length}{null}{default}{comment})",
"LONGTEXT": "{field} = fields.TextField({null}{default}{comment})",
"TEXT": "{field} = fields.TextField({null}{default}{comment})",

# Date and time type
"DATETIME": "{field} = fields.DatetimeField({null}{default}{comment})",
"TIME": "{field} = fields.TimeDeltaField({null}{default}{comment})" # 新增
}
_text = """
_____ _ _ _
|_ _| | | | | |
| | _ __ ___ _ __ ___ ___| |_ __| | |__
| | | '_ \/ __| '_ \ / _ \/ __| __/ _` | '_ \
_| |_| | | \__ \ |_) | __/ (__| || (_| | |_) |
|_____|_| |_|___/ .__/ \___|\___|\__\__,_|_.__/
| |
|_| \n\n\n"""

def __init__(self, conn: BaseDBAsyncClient, tables: Optional[List[str]] = None):
self.conn = conn
Expand Down Expand Up @@ -49,14 +68,16 @@ async def inspect(self):
model = self._table_template.format(table=name)
for column_name, column in columns.items():
comment = default = length = unique = null = pk = ""
if column.primary_key:
pk = "pk=True, "
if column.unique:
unique = "unique=True, "
other = {}

if column.data_type == "VARCHAR":
length = f"max_length={column.length}, "
if not column.not_null:
null = "null=True, "
elif column.data_type == "CHAR":
length = f"max_length={column.length}, "
elif column.data_type == "DECIMAL":
other['max_digits'] = column.length
other['decimal_places'] = column.scale

if column.default is not None:
if column.data_type == "TINYINT":
default = f"default={'True' if column.default == '1' else 'False'}, "
Expand All @@ -66,21 +87,36 @@ async def inspect(self):
default = "auto_now_add=True, "
else:
default = "auto_now=True, "
else:
default = f"default={column.default}, "
elif column.default != "NULL":
default = f'default={column.default}, '

if not column.not_null:
null = "null=True, "

if column.primary_key:
pk = "pk=True, "

if column.unique:
unique = "unique=True, "

if column.comment:
comment = f"description='{column.comment}', "

field = self._field_template_mapping[column.data_type].format(
field=column_name,
pk=pk,
unique=unique,
length=length,
null=null,
default=default,
comment=comment,
)
try:
field = self._field_template_mapping[column.data_type].format(
field=column_name,
pk=pk,
unique=unique,
length=length,
null=null,
default=default,
comment=comment,
other=', '.join([f'{parameter}={value}' for parameter, value in other.items()])
)
# Avoid the need to manually create the entire table because a certain data type is not supported
except KeyError:
field = f"{column_name} = The {column.data_type} data type type is not currently supported, please add it manually."
fields.append(field)
tables.append(model + "\n".join(fields))
sys.stdout.write(result + "\n\n\n".join(tables))
tables.append(model + " " + "\n ".join(fields))
sys.stdout.write(self._text)
sys.stdout.write(result + "\n\n\n".join(tables) + '\n\n')