Merge pull request #183 from coursera/sb_add_tests

Add more tests for 134

dataduct/database/parsers/transform.py

@@ -6,11 +6,11 @@
 from pyparsing import CaselessKeyword
 from pyparsing import CharsNotIn
 from pyparsing import Literal
-from pyparsing import nestedExpr
 from pyparsing import OneOrMore
-from pyparsing import replaceWith
 from pyparsing import WordStart
 from pyparsing import ZeroOrMore
+from pyparsing import nestedExpr
+from pyparsing import replaceWith
 
 
 def remove_empty_statements(string, seperator=';'):
@@ -67,7 +67,7 @@ def remove_transactional(string):
         result(str): String with begin and commit trimmed
     """
     transaction = WordStart() + (
-        CaselessKeyword('BEGIN')| CaselessKeyword('COMMIT'))
+        CaselessKeyword('BEGIN') | CaselessKeyword('COMMIT'))
 
     return transaction.suppress().transformString(string)
 

dataduct/database/sql/tests/test_sql_statement.py

@@ -1,8 +1,9 @@
 """Tests for the SqlStatement class
 """
-from unittest import TestCase
+from nose.tools import assert_not_equal
 from nose.tools import eq_
 from nose.tools import raises
+from unittest import TestCase
 
 from ..sql_statement import SqlStatement
 
@@ -28,6 +29,36 @@ def test_sanatization():
 
         eq_(SqlStatement(query).sql(), result)
 
+    @staticmethod
+    def test_sanatization_multiline_comment():
+        """Sanatization of comments
+        """
+        query = '/* Comment */\n select 1;'
+        result = 'select 1'
+
+        eq_(SqlStatement(query).sql(), result)
+
+    @staticmethod
+    def test_sanatization_multiline_comment_nesting():
+        """Sanatization of comments
+        """
+        query = '/* Comment /* nest */ */\n select 1;'
+        result = 'select 1'
+
+        eq_(SqlStatement(query).sql(), result)
+
+    @staticmethod
+    def test_sanatization_multiline_comment_partial_nesting():
+        """Sanatization of comments
+        This is a test to highlight issue #134 which was marked as won't fix
+        """
+        query = '/* Comment /* nest */\n select 1;'
+        result = 'select 1'
+        parsed_output = '/* Comment select 1'
+
+        eq_(SqlStatement(query).sql(), parsed_output)
+        assert_not_equal(SqlStatement(query).sql(), result)
+
     @staticmethod
     @raises(ValueError)
     def test_error():