Added sql model change from ch12

Author: alandmoore

Chapter12/ABQ_Data_Entry/abq_data_entry/models.py

@@ -80,26 +80,21 @@ def __init__(self, host, database, user, password):
     self.connection = pg.connect(host=host, database=database,
       user=user, password=password, cursor_factory=DictCursor)
 
-    techs = self.query("SELECT * FROM lab_techs ORDER BY name")
+    techs = self.query("SELECT name FROM lab_techs ORDER BY name")
     labs = self.query("SELECT id FROM labs ORDER BY id")
     plots = self.query("SELECT DISTINCT plot FROM plots ORDER BY plot")
     self.fields['Technician']['values'] = [x['name'] for x in techs]
     self.fields['Lab']['values'] = [x['id'] for x in labs]
     self.fields['Plot']['values'] = [str(x['plot']) for x in plots]
 
   def query(self, query, parameters=None):
-    cursor = self.connection.cursor()
-    try:
-      cursor.execute(query, parameters)
-    except (pg.Error) as e:
-      self.connection.rollback()
-      raise e
-    else:
-      self.connection.commit()
+    with self.connection:
+      with self.connection.cursor() as cursor:
+        cursor.execute(query, parameters)
       # cursor.description is None when
       # no rows are returned
-      if cursor.description is not None:
-        return cursor.fetchall()
+        if cursor.description is not None:
+          return cursor.fetchall()
 
   def get_all_records(self, all_dates=False):
     """Return all records.

Chapter13/ABQ_Data_Entry/abq_data_entry/models.py

@@ -8,7 +8,6 @@
 from xml.etree import ElementTree
 import requests
 import paramiko
-import ftplib as ftp
 
 import psycopg2 as pg
 from psycopg2.extras import DictCursor
@@ -85,26 +84,21 @@ def __init__(self, host, database, user, password):
     self.connection = pg.connect(host=host, database=database,
       user=user, password=password, cursor_factory=DictCursor)
 
-    techs = self.query("SELECT * FROM lab_techs ORDER BY name")
+    techs = self.query("SELECT name FROM lab_techs ORDER BY name")
     labs = self.query("SELECT id FROM labs ORDER BY id")
     plots = self.query("SELECT DISTINCT plot FROM plots ORDER BY plot")
     self.fields['Technician']['values'] = [x['name'] for x in techs]
     self.fields['Lab']['values'] = [x['id'] for x in labs]
     self.fields['Plot']['values'] = [str(x['plot']) for x in plots]
 
   def query(self, query, parameters=None):
-    cursor = self.connection.cursor()
-    try:
-      cursor.execute(query, parameters)
-    except (pg.Error) as e:
-      self.connection.rollback()
-      raise e
-    else:
-      self.connection.commit()
+    with self.connection:
+      with self.connection.cursor() as cursor:
+        cursor.execute(query, parameters)
       # cursor.description is None when
       # no rows are returned
-      if cursor.description is not None:
-        return cursor.fetchall()
+        if cursor.description is not None:
+          return cursor.fetchall()
 
   def get_all_records(self, all_dates=False):
     """Return all records.
@@ -131,7 +125,7 @@ def get_record(self, rowkey):
       query,
       {"date": date, "time": time, "lab": lab, "plot": plot}
     )
-    return result[0] if result else {}
+    return result[0] if result else dict()
 
   def save_record(self, record, rowkey):
     """Save a record to the database
@@ -172,7 +166,7 @@ def get_lab_check(self, date, time, lab):
       'lab_id = %(lab)s AND date = %(date)s AND time = %(time)s')
     results = self.query(
       query, {'date': date, 'time': time, 'lab': lab})
-    return results[0] if results else {}
+    return results[0] if results else dict()
 
   def get_current_seed_sample(self, lab, plot):
     """Get the seed sample currently planted in the given lab and plot"""
@@ -274,7 +268,7 @@ def get_all_records(self):
 
     with open(self.file, 'r', encoding='utf-8') as fh:
       # Casting to list is necessary for unit tests to work
-      csvreader = csv.DictReader(list(fh.readlines()))
+      csvreader = csv.DictReader(fh)
       missing_fields = set(self.fields.keys()) - set(csvreader.fieldnames)
       if len(missing_fields) > 0:
         fields_string = ', '.join(missing_fields)

Chapter14/ABQ_Data_Entry/abq_data_entry/models.py

@@ -96,13 +96,13 @@ def __init__(self, host, database, user, password):
     self.fields['Plot']['values'] = [str(x['plot']) for x in plots]
 
   def query(self, query, parameters=None):
-    with self.connection.cursor() as cursor:
-      cursor.execute(query, parameters)
-      self.connection.commit()
+    with self.connection:
+      with self.connection.cursor() as cursor:
+        cursor.execute(query, parameters)
       # cursor.description is None when
       # no rows are returned
-      if cursor.description is not None:
-        return cursor.fetchall()
+        if cursor.description is not None:
+          return cursor.fetchall()
 
   def get_all_records(self, all_dates=False):
     """Return all records.

Chapter15/ABQ_Data_Entry/abq_data_entry/models.py

@@ -96,13 +96,13 @@ def __init__(self, host, database, user, password):
     self.fields['Plot']['values'] = [str(x['plot']) for x in plots]
 
   def query(self, query, parameters=None):
-    with self.connection.cursor() as cursor:
-      cursor.execute(query, parameters)
-      self.connection.commit()
+    with self.connection:
+      with self.connection.cursor() as cursor:
+        cursor.execute(query, parameters)
       # cursor.description is None when
       # no rows are returned
-      if cursor.description is not None:
-        return cursor.fetchall()
+        if cursor.description is not None:
+          return cursor.fetchall()
 
   def get_all_records(self, all_dates=False):
     """Return all records.

Chapter16/ABQ_Data_Entry/abq_data_entry/models.py

@@ -96,13 +96,13 @@ def __init__(self, host, database, user, password):
     self.fields['Plot']['values'] = [str(x['plot']) for x in plots]
 
   def query(self, query, parameters=None):
-    with self.connection.cursor() as cursor:
-      cursor.execute(query, parameters)
-      self.connection.commit()
+    with self.connection:
+      with self.connection.cursor() as cursor:
+        cursor.execute(query, parameters)
       # cursor.description is None when
       # no rows are returned
-      if cursor.description is not None:
-        return cursor.fetchall()
+        if cursor.description is not None:
+          return cursor.fetchall()
 
   def get_all_records(self, all_dates=False):
     """Return all records.