[SQL-CVS] r1314 - in home/phd/SQLObject/paramstyles/sqlobject: . mssql

[<sub...@co...>]

Author: phd
Date: 2005-11-21 18:33:47 +0000 (Mon, 21 Nov 2005)
New Revision: 1314

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/col.py
   home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
Log:
Merged patches from the revisions 1312:1313 from the trunk: DecimalValidator

Modified: home/phd/SQLObject/paramstyles/sqlobject/col.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/col.py	2005-11-21 18:29:12 UTC (rev 1313)
+++ home/phd/SQLObject/paramstyles/sqlobject/col.py	2005-11-21 18:33:47 UTC (rev 1314)
@@ -1116,6 +1116,47 @@
     baseClass = SOTimeCol
 
 
+try:
+    from decimal import Decimal
+except ImportError:
+    Decimal = float
+
+class DecimalValidator(validators.Validator):
+    def to_python(self, value, state):
+        if value is None:
+            return None
+        if isinstance(value, (int, long, Decimal, sqlbuilder.SQLExpression)):
+            return value
+        if isinstance(value, float):
+            value = str(value)
+        connection = state.soObject._connection
+        if hasattr(connection, "decimalSeparator"):
+            value = value.replace(connection.decimalSeparator, ".")
+        try:
+            return Decimal(value)
+        except:
+            raise validators.Invalid("expected a Decimal in the DecimalCol '%s', got %s %r instead" % \
+                (self.name, type(value), value), value, state)
+
+    def from_python(self, value, state):
+        if value is None:
+            return None
+        if isinstance(value, float):
+            value = str(value)
+        if isinstance(value, (str, unicode)):
+            connection = state.soObject._connection
+            if hasattr(connection, "decimalSeparator"):
+                value = value.replace(connection.decimalSeparator, ".")
+            try:
+                return Decimal(value)
+            except:
+                raise validators.Invalid("can not parse Decimal value '%s' in the DecimalCol '%s'" %
+                    (value, self.name), value, state)
+        if not isinstance(value, (int, long, Decimal, sqlbuilder.SQLExpression)):
+            raise validators.Invalid("expected a decimal in the DecimalCol '%s', got %s %r instead" % \
+                (self.name, type(value), value), value, state)
+        return value
+
 class SODecimalCol(SOCol):
 
     def __init__(self, **kw):
@@ -1130,6 +1171,10 @@
     def _sqlType(self):
         return 'DECIMAL(%i, %i)' % (self.size, self.precision)
 
+    def createValidators(self):
+        return [DecimalValidator()] + \
+            super(SODecimalCol, self).createValidators()
+
 class DecimalCol(Col):
     baseClass = SODecimalCol
 

Modified: home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py	2005-11-21 18:29:12 UTC (rev 1313)
+++ home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py	2005-11-21 18:33:47 UTC (rev 1314)
@@ -24,11 +24,12 @@
                     self.make_conn_str = lambda keys: \
                     ["Provider=SQLOLEDB;Data Source=%s;Initial Catalog=%s;Integrated Security=SSPI;Persist Security Info=False" % (
                         keys.host, keys.db)]
-                    del kw["sspi"]
                 else:
                     self.make_conn_str = lambda keys: \
                     ["Provider=SQLOLEDB;Data Source=%s;User Id=%s;Password=%s;Initial Catalog=%s" % (
                             keys.host, keys.user, keys.password, keys.db)]
+                if "sspi" in kw:
+                    del kw["sspi"]
             except ImportError: # raise the exceptions other than ImportError for adodbapi absence
                 import pymssql as sqlmodule
                 self.dbconnection = sqlmodule.connect
@@ -68,6 +69,8 @@
         con = self.dbconnection( *self.make_conn_str(self) )
         cur = con.cursor()
         cur.execute('SET ANSI_NULLS ON')
+        cur.execute("SELECT CAST('12345.21' AS DECIMAL(10, 2))")
+        self.decimalSeparator = cur.fetchone()[0][-3]
         cur.close()
         return con