Mercurial > p > mysql-python > mysqldb-2
comparison MySQLdb/converters.py @ 4:b5a377255eea MySQLdb
Merge changes from MySQLdb-1.2 branch (448-455)
author | adustman |
---|---|
date | Tue, 24 Oct 2006 19:52:31 +0000 |
parents | e48810735f11 |
children | b70cce9bd065 |
comparison
equal
deleted
inserted
replaced
3:df195ac92df6 | 4:b5a377255eea |
---|---|
141 FIELD_TYPE.TIMESTAMP: mysql_timestamp_converter, | 141 FIELD_TYPE.TIMESTAMP: mysql_timestamp_converter, |
142 FIELD_TYPE.DATETIME: DateTime_or_None, | 142 FIELD_TYPE.DATETIME: DateTime_or_None, |
143 FIELD_TYPE.TIME: TimeDelta_or_None, | 143 FIELD_TYPE.TIME: TimeDelta_or_None, |
144 FIELD_TYPE.DATE: Date_or_None, | 144 FIELD_TYPE.DATE: Date_or_None, |
145 FIELD_TYPE.BLOB: [ | 145 FIELD_TYPE.BLOB: [ |
146 (FLAG.BINARY, char_array), | 146 (FLAG.BINARY, str), |
147 (None, None), | 147 ], |
148 ], | |
149 FIELD_TYPE.STRING: [ | 148 FIELD_TYPE.STRING: [ |
149 (FLAG.BINARY, str), | |
150 (FLAG.SET, Str2Set), | 150 (FLAG.SET, Str2Set), |
151 (None, None), | 151 ], |
152 ], | |
153 FIELD_TYPE.VAR_STRING: [ | 152 FIELD_TYPE.VAR_STRING: [ |
154 (FLAG.SET, Str2Set), | 153 (FLAG.BINARY, str), |
155 (None, None), | 154 ], |
156 ], | 155 FIELD_TYPE.VARCHAR: [ |
156 (FLAG.BINARY, str), | |
157 ], | |
157 } | 158 } |
158 | 159 |
159 try: | 160 try: |
160 from decimal import Decimal | 161 from decimal import Decimal |
161 conversions[FIELD_TYPE.DECIMAL] = Decimal | 162 conversions[FIELD_TYPE.DECIMAL] = Decimal |