[Sqlalchemy-commits] [1124] sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py: committed patch for
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1124] sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py: committed patch for MSDouble/tinyint from [ticket:106]
|
From: <co...@sq...> - 2006-03-10 04:35:43
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1124] sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py: committed patch for MSDouble/tinyint from [ticket:106]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1124</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-09 22:35:34 -0600 (Thu, 09 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>committed patch for MSDouble/tinyint from [ticket:106]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesmysqlpy">sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemydatabasesmysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py (1123 => 1124)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py 2006-03-10 04:26:35 UTC (rev 1123) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py 2006-03-10 04:35:34 UTC (rev 1124) </span><span class="lines">@@ -13,6 +13,7 @@ </span><span class="cx"> import sqlalchemy.types as sqltypes </span><span class="cx"> from sqlalchemy import * </span><span class="cx"> import sqlalchemy.databases.information_schema as ischema </span><ins>+from sqlalchemy.exceptions import * </ins><span class="cx"> </span><span class="cx"> try: </span><span class="cx"> import MySQLdb as mysql </span><span class="lines">@@ -22,9 +23,24 @@ </span><span class="cx"> class MSNumeric(sqltypes.Numeric): </span><span class="cx"> def get_col_spec(self): </span><span class="cx"> return "NUMERIC(%(precision)s, %(length)s)" % {'precision': self.precision, 'length' : self.length} </span><ins>+class MSDouble(sqltypes.Numeric): + def __init__(self, precision = None, length = None): + if (precision is None and length is not None) or (precision is not None and length is None): + raise ArgumentError("You must specify both precision and length or omit both altogether.") + super(MSDouble, self).__init__(precision, length) + def get_col_spec(self): + if self.precision is not None and self.length is not None: + return "DOUBLE(%(precision)s, %(length)s)" % {'precision': self.precision, 'length' : self.length} + else: + return "DOUBLE" </ins><span class="cx"> class MSFloat(sqltypes.Float): </span><ins>+ def __init__(self, precision = None): + super(MSFloat, self).__init__(precision) </ins><span class="cx"> def get_col_spec(self): </span><del>- return "FLOAT(%(precision)s)" % {'precision': self.precision} </del><ins>+ if self.precision is not None: + return "FLOAT(%(precision)s)" % {'precision': self.precision} + else: + return "FLOAT" </ins><span class="cx"> class MSInteger(sqltypes.Integer): </span><span class="cx"> def get_col_spec(self): </span><span class="cx"> return "INTEGER" </span><span class="lines">@@ -86,11 +102,13 @@ </span><span class="cx"> ischema_names = { </span><span class="cx"> 'int' : MSInteger, </span><span class="cx"> 'smallint' : MSSmallInteger, </span><ins>+ 'tinyint' : MSSmallInteger, </ins><span class="cx"> 'varchar' : MSString, </span><span class="cx"> 'char' : MSChar, </span><span class="cx"> 'text' : MSText, </span><span class="cx"> 'decimal' : MSNumeric, </span><span class="cx"> 'float' : MSFloat, </span><ins>+ 'double' : MSDouble, </ins><span class="cx"> 'timestamp' : MSDateTime, </span><span class="cx"> 'datetime' : MSDateTime, </span><span class="cx"> 'date' : MSDate, </span></span></pre> </div> </div> </body> </html> |
