sort violations

matsuzaki215 · matsuzaki215 · commit 809b6db61bc4 · 2019-10-23T01:03:12.000+09:00
diff --git a/src/sqlint/__init__.py b/src/sqlint/__init__.py
@@ -35,7 +35,7 @@ def parse(sql: str):
 
 def check(sql: str):
     tree = SyntaxTree.sqlptree(sql)
-    for v in check_sql(tree, Config()):
+    for v in sorted(check_sql(tree, Config())):
         logger.info(v)
 
 
diff --git a/src/sqlint/checker/violation.py b/src/sqlint/checker/violation.py
@@ -65,14 +65,28 @@ def __init__(self, tree: SyntaxTree, index: int, code: Code, **kwargs):
         self.code: Code = code
         self.params: Dict = kwargs
 
+    @property
+    def line_num(self):
+        return self.tree.line_num
+
+    @property
+    def pos(self):
+        return self.tree.get_position(self.index)
+
     def __str__(self):
         _template = '(L{line}, {pos}): ' + self.code.template
 
         return _template.format(
-            line=self.tree.node.line_num,
-            pos=self.tree.get_position(self.index),
+            line=self.line_num,
+            pos=self.pos,
             **self.params)
 
+    def __lt__(self, other):
+        if self.line_num == other.line_num:
+            return self.pos < other.pos
+
+        return self.line_num < other.line_num
+
 
 class IndentStepsViolation(Violation):
     def __init__(self, tree: SyntaxTree, index: int, **kwargs):
diff --git a/src/sqlint/cli.py b/src/sqlint/cli.py
@@ -59,7 +59,7 @@ def main(files, config_file, is_format):
             logger.info(formatted_tree.sqlftree())
         else:
             tree.sqlftree()
-            for v in check_tree(tree, config):
+            for v in sorted(check_tree(tree, config)):
                 logger.info('{} {}'.format(file, v))
 
 
