better IS_NOT_IN_DB and removed long

pydal/adapters/db2.py

@@ -32,7 +32,7 @@ def lastrowid(self, table):
             if table._rname
             else table
         )
-        return long(self.cursor.fetchone()[0])
+        return int(self.cursor.fetchone()[0])
 
     def rowslice(self, rows, minimum=0, maximum=None):
         if maximum is None:

pydal/adapters/firebird.py

@@ -50,7 +50,7 @@ def test_connection(self):
     def lastrowid(self, table):
         sequence_name = table._sequence_name
         self.execute("SELECT gen_id(%s, 0) FROM rdb$database" % sequence_name)
-        return long(self.cursor.fetchone()[0])
+        return int(self.cursor.fetchone()[0])
 
     def create_sequence_and_triggers(self, query, table, **args):
         tablename = table._rname

pydal/adapters/google.py

@@ -317,14 +317,15 @@ def count(self, query, distinct=None, limit=None):
         return 0
 
     def delete(self, table, query):
-        counter = 0
         while self.db(query).count() > 0:
             docs = list(self.get_docs(table, query))
             batch = self._client.batch()
+            counter = 0
             for doc in docs:
                 batch.delete(doc.reference)
                 counter += 1
-            batch.commit()
+            if counter:
+                batch.commit()
         return counter
 
     def update(self, table, query, update_fields):
@@ -336,7 +337,8 @@ def update(self, table, query, update_fields):
         for doc in docs:
             batch.update(doc.reference, {f.name: v for f, v in update_fields})
             counter += 1
-        batch.commit()
+        if counter:
+            batch.commit()
         return counter
 
     def truncate(self, table, mode=""):

pydal/adapters/mongo.py

@@ -118,7 +118,7 @@ def object_id(self, arg=None):
         elif isinstance(arg, self.ObjectId):
             return arg
         elif isinstance(arg, (Row, Reference)):
-            return self.object_id(long(arg["id"]))
+            return self.object_id(int(arg["id"]))
         elif not isinstance(arg, (int, long)):
             raise TypeError(
                 "object_id argument must be of type ObjectId or an objectid "
@@ -464,7 +464,7 @@ def insert(self, table, fields, safe=None):
 
         if result.acknowledged:
             Oid = result.inserted_id
-            rid = Reference(long(str(Oid), 16))
+            rid = Reference(int(str(Oid), 16))
             (rid._table, rid._record) = (table, None)
             return rid
         else:

pydal/adapters/mssql.py

@@ -96,7 +96,7 @@ def connector(self):
 
     def lastrowid(self, table):
         self.execute("SELECT SCOPE_IDENTITY();")
-        return long(self.cursor.fetchone()[0])
+        return int(self.cursor.fetchone()[0])
 
 
 @adapters.register_for("mssql")
@@ -174,7 +174,7 @@ def connector(self):
 class Vertica(MSSQL1):
     def lastrowid(self, table):
         self.execute("SELECT SCOPE_IDENTITY();")
-        return long(self.cursor.fetchone()[0])
+        return int(self.cursor.fetchone()[0])
 
 
 @adapters.register_for("sybase")

pydal/adapters/oracle.py

@@ -72,7 +72,7 @@ def execute(self, *args, **kwargs):
     def lastrowid(self, table):
         sequence_name = table._sequence_name
         self.execute("SELECT %s.currval FROM dual;" % sequence_name)
-        return long(self.cursor.fetchone()[0])
+        return int(self.cursor.fetchone()[0])
 
     def sqlsafe_table(self, tablename, original_tablename=None):
         if original_tablename is not None:

pydal/adapters/postgres.py

@@ -141,10 +141,10 @@ def after_connection(self):
 
     def lastrowid(self, table):
         if self._last_insert:
-            return long(self.cursor.fetchone()[0])
+            return int(self.cursor.fetchone()[0])
         sequence_name = table._sequence_name
         self.execute("SELECT currval(%s);" % self.adapt(sequence_name))
-        return long(self.cursor.fetchone()[0])
+        return int(self.cursor.fetchone()[0])
 
     def _insert(self, table, fields):
         self._last_insert = None

pydal/adapters/sap.py

@@ -34,7 +34,7 @@ def connector(self):
 
     def lastrowid(self, table):
         self.execute("select %s.NEXTVAL from dual" % table._sequence_name)
-        return long(self.cursor.fetchone()[0])
+        return int(self.cursor.fetchone()[0])
 
     def create_sequence_and_triggers(self, query, table, **args):
         self.execute("CREATE SEQUENCE %s;" % table._sequence_name)

pydal/adapters/snowflake.py

@@ -118,10 +118,10 @@ def connector(self):
 
     def lastrowid(self, table):
         if self._last_insert:
-            return long(self.cursor.fetchone()[0])
+            return int(self.cursor.fetchone()[0])
         sequence_name = table._sequence_name
         self.execute("SELECT currval(%s);" % self.adapt(sequence_name))
-        return long(self.cursor.fetchone()[0])
+        return int(self.cursor.fetchone()[0])
 
     def _insert(self, table, fields):
         self._last_insert = None

pydal/base.py

@@ -981,7 +981,7 @@ def represent(self, name, *args, **kwargs):
         return self.representers[name](*args, **kwargs)
 
     def export_to_csv_file(self, ofile, *args, **kwargs):
-        step = long(kwargs.get("max_fetch_rows", 500))
+        step = int(kwargs.get("max_fetch_rows", 500))
         write_colnames = kwargs["write_colnames"] = kwargs.get("write_colnames", True)
         for table in self.tables:
             ofile.write("TABLE %s\r\n" % table)

pydal/contrib/imap_adapter.py

@@ -613,7 +613,7 @@ def select(self, query, fields, attributes):
                             if typ == "OK":
                                 fr = {
                                     "message": int(data[0][0].split()[0]),
-                                    "uid": long(uid),
+                                    "uid": int(uid),
                                     "email": email.message_from_string(data[0][1]),
                                     "raw_message": data[0][1],
                                 }

pydal/helpers/classes.py

@@ -201,7 +201,7 @@ def __allocate(self):
 
     def __getattr__(self, key, default=None):
         if key == "id":
-            return long(self)
+            return int(self)
         if key in self._table:
             self.__allocate()
         if self._record:
@@ -222,7 +222,7 @@ def __setattr__(self, key, value):
 
     def __getitem__(self, key):
         if key == "id":
-            return long(self)
+            return int(self)
         self.__allocate()
         return self._record.get(key, None)
 
@@ -237,9 +237,9 @@ def Reference_unpickler(data):
 
 def Reference_pickler(data):
     try:
-        marshal_dump = marshal.dumps(long(data))
+        marshal_dump = marshal.dumps(int(data))
     except AttributeError:
-        marshal_dump = "i%s" % struct.pack("<i", long(data))
+        marshal_dump = "i%s" % struct.pack("<i", int(data))
     return (Reference_unpickler, (marshal_dump,))
 
 

pydal/helpers/rest.py

@@ -7,7 +7,7 @@
 def to_num(num):
     result = 0
     try:
-        result = long(num)
+        result = int(num)
     except NameError as e:
         result = int(num)
     return result

pydal/objects.py

@@ -152,7 +152,7 @@ def __int__(self):
         return self.get("id")
 
     def __long__(self):
-        return long(int(self))
+        return int(int(self))
 
     def __hash__(self):
         return id(self)
@@ -199,7 +199,7 @@ def as_dict(self, datetime_to_str=False, custom_types=None):
             elif isinstance(v, Row):
                 d[k] = v.as_dict()
             elif isinstance(v, Reference):
-                d[k] = long(v)
+                d[k] = int(v)
             elif isinstance(v, decimal.Decimal):
                 d[k] = float(v)
             elif isinstance(v, DT_INST):
@@ -1123,7 +1123,7 @@ def fix(field, value, id_map, id_offset):
                 if not value.strip():
                     value = None
                 else:
-                    value = long(value)
+                    value = int(value)
             elif field.type.startswith("list:string"):
                 value = bar_decode_string(value)
             elif field.type.startswith(list_reference_s):
@@ -1143,7 +1143,7 @@ def fix(field, value, id_map, id_offset):
                     pass
             elif id_offset and field.type.startswith("reference"):
                 try:
-                    value = id_offset[field.type[9:].strip()] + long(value)
+                    value = id_offset[field.type[9:].strip()] + int(value)
                 except KeyError:
                     pass
             return value
@@ -1187,7 +1187,7 @@ def is_id(colname):
                             if field.type != "id":
                                 ditems[fieldname] = value
                             else:
-                                csv_id = long(value)
+                                csv_id = int(value)
                         except ValueError:
                             raise RuntimeError("Unable to parse line:%s" % (lineno + 1))
                 if not (id_map or csv_id is None or id_offset is None or unique_idx):
@@ -3211,7 +3211,7 @@ def none_exception(value):
             elif PY2 and isinstance(value, unicode):
                 return value.encode("utf8")
             elif isinstance(value, Reference):
-                return long(value)
+                return int(value)
             elif hasattr(value, "isoformat"):
                 return value.isoformat()[:19].replace("T", " ")
             elif isinstance(value, (list, tuple)):  # for type='list:..'

pydal/parsers/base.py

@@ -15,11 +15,11 @@
 class BasicParser(Parser):
     @for_type("id")
     def _id(self, value):
-        return long(value)
+        return int(value)
 
     @for_type("integer")
     def _integer(self, value):
-        return long(value)
+        return int(value)
 
     @for_type("float")
     def _float(self, value):

pydal/parsers/mongo.py

@@ -13,8 +13,8 @@ class MongoParser(Parser):
     @for_type("id")
     def _id(self, value):
         if isinstance(value, self.adapter.ObjectId):
-            return long(str(value), 16)
-        return long(value)
+            return int(str(value), 16)
+        return int(value)
 
     @for_type("blob")
     def _blob(self, value):
@@ -27,7 +27,7 @@ def reference_extras(self, field_type):
     @for_type("reference")
     def _reference(self, value, referee):
         if isinstance(value, self.adapter.ObjectId):
-            value = long(str(value), 16)
+            value = int(str(value), 16)
         if "." not in referee:
             value = Reference(value)
             value._table, value._record = self.adapter.db[referee], None

pydal/representers/base.py

@@ -23,11 +23,11 @@ def _boolean(self, value):
 
     @for_type("id", adapt=False)
     def _id(self, value):
-        return str(long(value))
+        return str(int(value))
 
     @for_type("integer", adapt=False)
     def _integer(self, value):
-        return str(long(value))
+        return str(int(value))
 
     @for_type("decimal", adapt=False)
     def _decimal(self, value):
@@ -137,7 +137,7 @@ def reference_extras(self, field_type):
     @for_type("reference", adapt=False)
     def _reference(self, value, referenced):
         if referenced in self.adapter.db.tables:
-            return str(long(value))
+            return str(int(value))
         p = referenced.partition(".")
         if p[2] != "":
             try:
@@ -147,7 +147,7 @@ def _reference(self, value, referenced):
                 return repr(value)
         elif isinstance(value, (Row, Reference)):
             return str(value["id"])
-        return str(long(value))
+        return str(int(value))
 
     @for_type("blob", encode=True)
     def _blob(self, value):
@@ -185,15 +185,15 @@ def _repr_list(self, value, field_type):
 
     @for_type("id")
     def _id(self, value):
-        return long(value)
+        return int(value)
 
     @for_type("integer")
     def _integer(self, value):
-        return long(value)
+        return int(value)
 
     @for_type("bigint")
     def _bigint(self, value):
-        return long(value)
+        return int(value)
 
     @for_type("double")
     def _double(self, value):
@@ -203,7 +203,7 @@ def _double(self, value):
     def _reference(self, value):
         if isinstance(value, (Row, Reference)):
             value = value["id"]
-        return long(value)
+        return int(value)
 
     @for_type("boolean")
     def _boolean(self, value):

pydal/representers/couchdb.py

@@ -18,7 +18,7 @@ def adapt(self, value):
 
     @for_type("id")
     def _id(self, value):
-        return str(long(value))
+        return str(int(value))
 
     @for_type("reference", adapt=False)
     def _reference(self, value):

pydal/representers/google.py

@@ -26,11 +26,11 @@ def _json(self, value):
         return value
 
     @for_type("blob")
-    def _json(self, value):
+    def _blob(self, value):
         return base64.b64decode(value)
 
     @for_type("reference")
-    def _json(self, value):
+    def _reference(self, value):
         return str(value)
 
     @for_type("list:integer")
@@ -50,6 +50,6 @@ def _list_string(self, value):
     @for_type("list:reference")
     def _list_reference(self, value):
         if not isinstance(value, list):
-            return long(value)
+            return str(value)
         values = self._represent_list(value)
-        return list(map(long, values))
+        return list(map(str, values))