fix #2 #3 ,update version='0.1.5'

Author: hhyo

mybatis_mapper2sql/convert.py

@@ -145,15 +145,16 @@ def convert_trim_where_set(mybatis_mapper, child):
         convert_string += convert_children(mybatis_mapper, next_child)
     # Remove prefixOverrides
     if prefix_overrides:
-        regex = '^[\s]*?' + prefix_overrides
+        regex = fr'^[\s]*?({prefix_overrides})'
         convert_string = re.sub(regex, '', convert_string, count=1, flags=re.I)
     # Remove suffixOverrides
     if suffix_overrides:
-        regex = suffix_overrides + '(\s+--.+)?$'
-        convert_string = re.sub(regex, r'\1', convert_string, count=1, flags=re.I)
+        regex = fr'{suffix_overrides}(\s+--.+)?$'
+        convert_string = re.sub(regex, r'', convert_string, count=1, flags=re.I)
     # Add Prefix if String is not empty
-    if re.search('\S', convert_string):
-        convert_string = prefix + ' ' + convert_string
+    if re.search(r'\S', convert_string):
+        if prefix:
+            convert_string = prefix + ' ' + convert_string
         if suffix:
             convert_string = convert_string + ' ' + suffix
     # Add trim/where/set tail

setup.py

@@ -25,7 +25,7 @@ def run_tests(self):
 
 setup(
     name='mybatis-mapper2sql',
-    version='0.1.4',
+    version='0.1.5',
     author='hhyo',
     author_email='[email protected]',
     url='http://github.com/hhyo/mybatis-mapper2sql',

tests/test.xml

@@ -78,6 +78,22 @@
             OR price = 200
         </trim>
     </select>
+    <select id="testTrim">
+        SELECT
+        name,
+        category,
+        price
+        FROM
+        fruits
+        <trim prefix="WHERE" prefixOverrides="AND|OR">
+            OR category = 'apple'
+            OR price = 200
+        </trim>
+        AND
+        <trim prefixOverrides="AND|OR">
+            (type = 40 OR type= 60) and yn = 1
+        </trim>
+    </select>
     <select id="testWhere">
         SELECT
         name,