瀏覽代碼

[fix] timedelta to mysql time converter

version-14
Anand Doshi 10 年之前
父節點
當前提交
c0653c31fc
共有 2 個檔案被更改,包括 12 行新增9 行删除
  1. +4
    -1
      frappe/database.py
  2. +8
    -8
      frappe/model/create_new.py

+ 4
- 1
frappe/database.py 查看文件

@@ -6,6 +6,7 @@

from __future__ import unicode_literals
import MySQLdb
from MySQLdb.times import DateTimeDeltaType
from markdown2 import UnicodeWithAttrs
import warnings
import datetime
@@ -15,6 +16,7 @@ import re
import frappe.model.meta
from frappe.utils import now, get_datetime, cstr
from frappe import _
from types import StringType, UnicodeType

class Database:
"""
@@ -48,7 +50,8 @@ class Database:
use_unicode=True, charset='utf8')
self._conn.converter[246]=float
self._conn.converter[12]=get_datetime
self._conn.encoders[UnicodeWithAttrs] = self._conn.encoders[unicode]
self._conn.encoders[UnicodeWithAttrs] = self._conn.encoders[UnicodeType]
self._conn.encoders[DateTimeDeltaType] = self._conn.encoders[StringType]

self._cursor = self._conn.cursor()
if self.user != 'root':


+ 8
- 8
frappe/model/create_new.py 查看文件

@@ -13,14 +13,14 @@ from frappe.model.db_schema import type_map
import copy

def get_new_doc(doctype, parent_doc = None, parentfield = None, as_dict=False):
# if doctype not in frappe.local.new_doc_templates:
# # cache a copy of new doc as it is called
# # frequently for inserts
# frappe.local.new_doc_templates[doctype] = make_new_doc(doctype)
#
# doc = copy.deepcopy(frappe.local.new_doc_templates[doctype])
doc = make_new_doc(doctype)
if doctype not in frappe.local.new_doc_templates:
# cache a copy of new doc as it is called
# frequently for inserts
frappe.local.new_doc_templates[doctype] = make_new_doc(doctype)
doc = copy.deepcopy(frappe.local.new_doc_templates[doctype])
# doc = make_new_doc(doctype)

set_dynamic_default_values(doc, parent_doc, parentfield)



Loading…
取消
儲存