Make the SQL_COLUMNS code a bit easier to read.

etiquette/constants.py

@@ -192,15 +192,20 @@ def _extract_columns(create_table_statement):
     column_names = [c for c in column_names if c.lower() != 'foreign']
     return column_names
 
-SQL_COLUMNS = {}
+def _extract_table_statements(script):
-for statement in DB_INIT.split(';'):
+    for statement in script.split(';'):
-    if 'create table' not in statement.lower():
+        if 'create table' not in statement.lower():
-        continue
+            continue
 
-    table_name = statement.split('(')[0].strip().split(' ')[-1]
+        yield statement
-    SQL_COLUMNS[table_name] = _extract_columns(statement)
 
-def _sql_dictify(columns):
+def _extract_table_name(create_table_statement):
+        # CREATE TABLE table_name(
+        table_name = create_table_statement.split('(')[0].strip()
+        table_name = table_name.split()[-1]
+        return table_name
+
+def _reverse_index(columns):
     '''
     A dictionary where the key is the item and the value is the index.
     Used to convert a stringy name into the correct number to then index into
@@ -209,7 +214,11 @@ def _sql_dictify(columns):
     '''
     return {column: index for (index, column) in enumerate(columns)}
 
-SQL_INDEX = {table: _sql_dictify(columns) for (table, columns) in SQL_COLUMNS.items()}
+SQL_COLUMNS = {
+    _extract_table_name(table): _extract_columns(table)
+    for table in _extract_table_statements(DB_INIT)
+}
+SQL_INDEX = {table: _reverse_index(columns) for (table, columns) in SQL_COLUMNS.items()}
 
 
 ALLOWED_ORDERBY_COLUMNS = [