Fix RequireColumns to work with irregular casing

CHANGELOG.rst

@@ -15,6 +15,8 @@ Changes
 Fixes
 ~~~~~
 
+- Fix ``RequireColumns`` to work with irregular casing.
+
 v1.1.0 (2019-01-11)
 -------------------
 

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = '1.1.0'
+__version__ = '1.2.0rc0'
 
 
 readme_path = os.path.join(os.path.dirname(__file__), 'README.rst')

squabble/rules/disallow_foreign_key.py

@@ -60,8 +60,11 @@ def enable(self, root_ctx, config):
     @squabble.rule.node_visitor
     def _check_for_foreign_key(self, ctx, node, allowed_tables):
         """
-        Coincidentally, both AlterTableStmt and CreateStmt have a similar
-        enough structure that we can use the same function for both.
+        Make sure ``node`` doesn't have a FOREIGN KEY reference.
+
+        Coincidentally, both ``AlterTableStmt`` and ``CreateStmt``
+        have a similar enough structure that we can use the same
+        function for both.
         """
         table_name = node.relation.relname.value.lower()
 
@@ -70,12 +73,10 @@ def _check_for_foreign_key(self, ctx, node, allowed_tables):
             return
 
         def _check_constraint(child_ctx, constraint):
-            if constraint.contype != ConstrType.CONSTR_FOREIGN:
-                return
-
-            child_ctx.report(
-                self.DisallowedForeignKeyConstraint(table=table_name),
-                node=constraint
-            )
+            if constraint.contype == ConstrType.CONSTR_FOREIGN:
+                child_ctx.report(
+                    self.DisallowedForeignKeyConstraint(table=table_name),
+                    node=constraint
+                )
 
         ctx.register('Constraint', _check_constraint)

squabble/rules/require_columns.py

@@ -34,7 +34,7 @@ def _normalize_columns(table_elts):
 
     >>> import pglast.printer
     >>> create_table = pglast.parse_sql(
-    ...   'CREATE TABLE _(col1 foo.bar(baz,123), col2 integer);')
+    ...   'CREATE TABLE _(COL1 foo.bar(baz,123), Col2 integer);')
     >>> table_elts = pglast.Node(create_table)[0].stmt.tableElts
     >>> _normalize_columns(table_elts)
     [('col1', 'foo.bar(baz, 123)'), ('col2', 'integer')]
@@ -79,7 +79,7 @@ def get_required_columns(config):
     Extracts the column name and normalizes types out of the config
     value for `RequireColumns`.
 
-    >>> get_required_columns(['foo,int', 'bar'])
+    >>> get_required_columns(['foo,int', 'Bar'])
     {'foo': 'integer', 'bar': None}
     """
     if not config:
@@ -100,9 +100,7 @@ class RequireColumns(BaseRule):
     """
     Require that newly created tables have specified columns.
 
-    Configuration:
-
-    ::
+    Configuration ::
 
         {
             "RequireColumns": {
@@ -127,6 +125,7 @@ class ColumnWrongType(Message):
     def enable(self, ctx, config):
         config = config.get('required', [])
         cols = get_required_columns(config)
+
         ctx.register('CreateStmt', self._check_create_table(cols))
 
     @squabble.rule.node_visitor
@@ -138,7 +137,7 @@ def _check_create_table(self, ctx, node, required):
             columns[col] = {'type': typ, 'node': None}
 
         def _attach_column_node(_ctx, col):
-            name = col.colname.value
+            name = col.colname.value.lower()
             columns[name]['node'] = col
 
         ctx.register('ColumnDef', _attach_column_node)