yumoqing/sqlor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2021-02-23 19:34:00 +08:00
parent 63a4e89a7e
commit 854aaf6621
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sqlor/ddl_template_mysql.py
View File

@ -37,7 +37,7 @@ drop table if exists {{summary[0].name}};
CREATE TABLE {{summary[0].name}} CREATE TABLE {{summary[0].name}}
( (
{% for field in fields %} {% for field in fields %}
{{field.name}} {{typeStr(field.type,field.length,field.dec)}} {{nullStr(field.nullable)}} {%if field.title -%} comment '{{field.title}}'{%- endif %}{%- if not loop.last -%},{%- endif -%} `{{field.name}}` {{typeStr(field.type,field.length,field.dec)}} {{nullStr(field.nullable)}} {%if field.title -%} comment '{{field.title}}'{%- endif %}{%- if not loop.last -%},{%- endif -%}
{% endfor %} {% endfor %}
{% if summary[0].primary and len(summary[0].primary)>0 %} {% if summary[0].primary and len(summary[0].primary)>0 %}
{{primary()}} {{primary()}}

10
sqlor/sor.py
View File

@ -1,5 +1,6 @@
from traceback import print_exc from traceback import print_exc
import os import os
import decimal
from asyncio import coroutine from asyncio import coroutine
os.environ['NLS_LANG'] = 'SIMPLIFIED CHINESE_CHINA.UTF8' os.environ['NLS_LANG'] = 'SIMPLIFIED CHINESE_CHINA.UTF8'
import sys import sys
@ -14,6 +15,11 @@ from appPublic.objectAction import ObjectAction
from appPublic.argsConvert import ArgsConvert,ConditionConvert from appPublic.argsConvert import ArgsConvert,ConditionConvert
from .filter import DBFilter from .filter import DBFilter
def db_type_2_py_type(o):
if isinstance(o,decimal.Decimal):
return float(o)
return o
class SQLorException(Exception,object): class SQLorException(Exception,object):
def __int__(self,**kvs): def __int__(self,**kvs):
supper(SQLException,self).__init__(self,**kvs) supper(SQLException,self).__init__(self,**kvs)
@ -273,7 +279,7 @@ class SQLor(object):
while rec is not None: while rec is not None:
dic = {} dic = {}
for i in range(len(fields)): for i in range(len(fields)):
dic.update({fields[i]:rec[i]}) dic.update({fields[i] : db_type_2_py_type(rec[i])})
callback(DictObject(**dic),**kwargs) callback(DictObject(**dic),**kwargs)
if self.async_mode: if self.async_mode:
rec = await cur.fetchone() rec = await cur.fetchone()
@ -511,9 +517,7 @@ class SQLor(object):
return desc return desc
desc = {} desc = {}
summary = [ i for i in await self.tables() if tablename.lower() == i.name ] summary = [ i for i in await self.tables() if tablename.lower() == i.name ]
print('summary=',summary)
pris = await self.primary(tablename) pris = await self.primary(tablename)
print('primary key=',pris)
primary = [i.name for i in pris ] primary = [i.name for i in pris ]
summary[0]['primary'] = primary summary[0]['primary'] = primary
desc['summary'] = summary desc['summary'] = summary