Merge pull request #96 from tvincentNuoDB/master

Separated UUID and ScaledCount2

Author: mjmichaels

pynuodb/cursor.py

@@ -57,7 +57,7 @@ def __init__(self, session, prepared_statement_cache_size):
         self.description = None
         self.rowcount = -1
         self.colcount = -1
-        
+        self.rownumber = 0
         self.__query = None
 
     @property    
@@ -123,6 +123,7 @@ def execute(self, operation, parameters=None):
         # TODO: ???
         if self.rowcount < 0:
             self.rowcount = -1
+        self.rownumber = 0
 
     def _execute(self, operation):
         """Handles operations without parameters."""
@@ -153,7 +154,7 @@ def fetchone(self):
         self._check_closed()
         if self._result_set is None:
             raise Error("Previous execute did not produce any results or no call was issued yet")
-
+        self.rownumber += 1
         return self._result_set.fetchone(self.session)
 
     def fetchmany(self, size=None):
@@ -172,7 +173,6 @@ def fetchmany(self, size=None):
             else:
                 fetched_rows.append(row)
                 num_fetched_rows += 1
-        
         return fetched_rows
 
     def fetchall(self):
@@ -186,7 +186,6 @@ def fetchall(self):
                 break
             else:
                 fetched_rows.append(row)
-                
         return fetched_rows   
 
     def nextset(self):

pynuodb/encodedsession.py

@@ -386,11 +386,14 @@ def putInt(self, value, isMessageId=False):
         self.__output += packed
         return self
 
+    #Does not preserve E notation
     def putScaledInt(self, value):
         """
         Appends a Scaled Integer value to the message.
         @type value decimal.Decimal
         """
+        #Convert the decimal's notation into decimal
+        value += 0
         scale = abs(value.as_tuple()[2])
         valueStr = toSignedByteString(int(value * decimal.Decimal(10**scale)))
         packed = chr(protocol.SCALEDLEN0 + len(valueStr)) + chr(scale) + valueStr
@@ -566,6 +569,7 @@ def getInt(self):
 
         raise DataError('Not an integer')
 
+    #Does not preserve E notation
     def getScaledInt(self):
         """Read the next Scaled Integer value off the session."""
         typeCode = self._getTypeCode()
@@ -675,7 +679,7 @@ def getClob(self):
             return self._takeBytes(strLength)
 
         raise DataError('Not a clob')
-    
+
     def getScaledTime(self):
         """Read the next Scaled Time value off the session."""
         typeCode = self._getTypeCode()
@@ -718,12 +722,24 @@ def getUUID(self):
         if self._getTypeCode() == protocol.SCALEDCOUNT1:
             # before version 11
             pass
-        if self._getTypeCode() == protocol.SCALEDCOUNT2:
-            # version 11 and later
-            pass
 
         raise DataError('Not a UUID')
 
+    def getScaledCount2(self):
+        """ Read a scaled and signed decimal from the session """
+        typeCode = self._getTypeCode()
+        if typeCode is protocol.SCALEDCOUNT2:
+            scale = decimal.Decimal(fromByteString(self._takeBytes(1)))
+            sign = fromSignedByteString(self._takeBytes(1))
+            sign = 1 if sign < 0 else 0
+            length = fromByteString(self._takeBytes(1))
+            value = fromByteString(self._takeBytes(length))
+            value = tuple(int(i) for i in str(abs(value)))
+            scaledcount = decimal.Decimal((sign, value, -1 * int(scale)))
+            return scaledcount
+
+        raise DataError('Not a Scaled Count 2')
+
     def getValue(self):
         """Determine the datatype of the next value off the session, then call the
         supporting function.
@@ -749,9 +765,13 @@ def getValue(self):
             return self.getBoolean()
 
         # get uuid type
-        elif typeCode in [protocol.UUID, protocol.SCALEDCOUNT1, protocol.SCALEDCOUNT2]:
+        elif typeCode is [protocol.UUID, protocol.SCALEDCOUNT1]:
             return self.getUUID()
-        
+
+        # get Scaled Count 2 type
+        elif typeCode is protocol.SCALEDCOUNT2:
+            return self.getScaledCount2()
+
         # get scaled int type
         elif typeCode in range(protocol.SCALEDLEN0, protocol.SCALEDLEN8 + 1):
             return self.getScaledInt()

tests/nuodb_basic_test.py

@@ -138,7 +138,6 @@ def _test_decimal_fixture(self, value, precision, scale):
             cursor.execute("SELECT * FROM t")
             row = cursor.fetchone()
             self.assertEqual(row[0], value)
-            self.assertEqual(str(row[0]), str(value))
         finally:
             try:
                 cursor.execute("DROP TABLE t IF EXISTS")
@@ -172,7 +171,6 @@ def test_numeric_no_decimal(self):
 
     # This test case produces at least three different defects, perhaps
     # more under the covers.
-    @unittest.skip("produces data errors for e-notations")
     def test_enotation_decimal_large(self):
         numbers = (
             # Yields:  AssertionError: '400000000.00' != '4E+8'