Merge pull request #109 from tvincentNuoDB/master

Updated to protocol

Author: mjmichaels

.travis.yml

@@ -15,6 +15,8 @@ notifications:
     - [email protected]
     - [email protected]
     - [email protected]
+    - [email protected]
+
 
 before_install:
   - wget http://download.nuohub.org/nuodb_${NUOVERSION}_amd64.deb --output-document=/var/tmp/nuodb.deb

pynuodb/connection.py

@@ -31,11 +31,11 @@ def connect(database, host, user, password, options=None):
         Some common options include:
         "schema"
 
-    @type database str
-    @type host str
-    @type user str
-    @type password str
-    @type options dict[str,str]
+    :type database: str
+    :type host: str
+    :type user: str
+    :type password: str
+    :type options: dict[str,str]
     """
     return Connection(database, host, user, password, options)
 
@@ -78,11 +78,11 @@ def __init__(self, dbName, broker, username, password, options):
         Returns:
         a Connection instance
 
-        @type dbName str
-        @type broker str
-        @type username str
-        @type password str
-        @type options dict[str,str]
+        :type dbName: str
+        :type broker: str
+        :type username: str
+        :type password: str
+        :type options: dict[str,str]
         """
         (host, port) = getCloudEntry(broker, dbName)
         self.__session = EncodedSession(host, port)
@@ -114,11 +114,7 @@ def testConnection(self):
         name: ONE
         value: 1
         
-        Arguments:
-        None
-        
-        Returns:
-        None
+        :rtype: None
         """
         self.__session.test_connection()
 

pynuodb/datatype.py

@@ -117,6 +117,8 @@ def __cmp__(self, other):
       "bigint":NUMBER,
       "float":NUMBER,
       "double":NUMBER,
+      "decimal":NUMBER,
+      "double precision":NUMBER,      
       "date":DATETIME,
       "timestamp":DATETIME,
       "time":DATETIME,