Merge lp:~ahayzen/htd/31.fix_1065642 into lp:htd/3.1

[Andrew Hayzen]

Select and Update now yield Record object.

[Andrew Hayzen (ahayzen)]

review: Approve

=== modified file 'htd31/_objects/cursor.py'
--- htd31/_objects/cursor.py	2012-10-01 23:04:00 +0000
+++ htd31/_objects/cursor.py	2012-10-11 21:17:41 +0000
@@ -177,8 +177,7 @@
 
         self._file.unlock()  # Unlock
 
-        return Record(key, data, self.connection, self.table,
-                      self._file.header["KEY"])
+        return Record(data, self.connection, self.table)
 
     @trace
     def __iter__(self):
@@ -208,8 +207,7 @@
 
         self._file.unlock()
 
-        return Record(None, data, self.connection, self.table,
-                      self._file.header["KEY"])
+        return Record(data, self.connection, self.table)
 
     @trace
     def __len__(self):
@@ -513,10 +511,10 @@
 
             prog.count()
 
-            if numatts == 1:
+            if numatts == 1:  # 1 att doesn't return record
                 yield tmp[attribute[0]]
             else:
-                yield tmp
+                yield Record(tmp, self.connection, self.table)
 
             self._file.lock_reading()
 
@@ -525,7 +523,7 @@
         self._file.unlock()
 
     @trace
-    def update(self, where, args):
+    def update(self, where=None, args={}):
         """ Update a generator into the table """
 
         perm("o", self._access)
@@ -548,7 +546,8 @@
                     x += 1  # Next record
                     continue
 
-            record = unsanitise(record, self._file.header["ATT"])
+            record = Record(unsanitise(record, self._file.header["ATT"]),
+                            self.connection, self.table)
             record = (yield record)  # Send/Recieve new record
 
             integrity_check(record, self._file.header, self.connection)

=== modified file 'htd31/_objects/record.py'
--- htd31/_objects/record.py	2012-09-28 16:33:28 +0000
+++ htd31/_objects/record.py	2012-10-11 21:17:41 +0000
@@ -25,7 +25,7 @@
 
 class Record(object):
     """ Class that provides read-only record and foreign key support """
-    def __init__(self, key, data={}, con=None, table=None, identifier=[]):
+    def __init__(self, data={}, con=None, table=None):
         # Load variables
         if con is not None:
             self._con = ref(con)
@@ -33,7 +33,6 @@
             self._con = None
 
         self.data = data
-        self.key = key
         self.table = table
         self._index = 0
 
@@ -84,11 +83,21 @@
         if len(r1m_link) > 0:  # For 1-m relationships
             tbl, att = r1m_link[0]  # Pick first relation
 
+            if att not in self.data:
+                raise ValueError("This record does not have the required " \
+                                 "attribute (%s), please add the attribute " \
+                                 "to the query." % att)
+
             data = cur[self.data[att]]
 
         if len(rm1_link) > 0:  # For m-1 relationships
             tbl, att = rm1_link[0]  # Pick first relation
 
+            if att not in self.data:
+                raise ValueError("This record does not have the required " \
+                                 "attribute (%s), please add the attribute " \
+                                 "to the query." % att)
+
             data = list(cur.select(where="%s=={val}" % att,
                                    args=dict(val=(att, self.data[att]))))