Rename column/value read/write attributes to be consistent

lib/nexrad/db.py

@@ -27,7 +27,7 @@ class DatabaseTable():
             values[k] += 1
 
     def __format_columns_select__(self):
-        csel = getattr(self, '__columns_select__')
+        csel = getattr(self, '__columns_read__')
 
         if csel is None:
             return self.__columns__
@@ -59,7 +59,7 @@ class DatabaseTableCursor():
             return fn(row)
 
         obj = self.table()
-        cr  = getattr(self.table, '__columns_read__', None)
+        cr  = getattr(self.table, '__values_read__', None)
 
         for name in self.table.__columns__:
             try:
@@ -217,7 +217,7 @@ class Database():
         return cr
 
     def query(self, table, values=dict(), order_by=list()):
-        selectors = getattr(table, '__columns_select__', None)
+        selectors = getattr(table, '__columns_read__', None)
 
         if selectors is None:
             columns = table.__columns__

lib/nexrad/radar.py

@@ -53,11 +53,11 @@ class Radar(DatabaseTable):
         'call', 'wban', 'name', 'coord', 'site_elevation', 'tower_height'
     )
 
-    __columns_select__ = {
+    __columns_read__ = {
         'coord': 'ST_AsText(coord) as coord'
     }
 
-    __columns_read__ = {
+    __values_read__ = {
         'coord': Coord.from_wkt
     }
 

lib/nexrad/storm.py

@@ -96,12 +96,12 @@ class StormReport(DatabaseTable):
         'tornado_f_rating', 'coord_start', 'coord_end'
     )
 
-    __columns_select__ = {
+    __columns_read__ = {
         'coord_start': 'ST_AsText(coord_start) as coord_start',
         'coord_end':   'ST_AsText(coord_end) as coord_end'
     }
 
-    __columns_read__ = {
+    __values_read__ = {
         'timestamp_start': datetime.datetime.fromisoformat,
         'timestamp_end':   datetime.datetime.fromisoformat,
         'coord_start':     Coord.from_wkt,