Changeset: b3f51c7a5e5d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3f51c7a5e5d
Modified Files:
        testing/Mfilter.py
Branch: Mar2018
Log Message:

Improve filter for COPY INTO from file.
Now also works with non-binary imports.


diffs (12 lines):

diff --git a/testing/Mfilter.py b/testing/Mfilter.py
--- a/testing/Mfilter.py
+++ b/testing/Mfilter.py
@@ -94,7 +94,7 @@ norm_in  = re.compile('(?:'+')|(?:'.join
     r'^(\[.*POLYGON.*\(59\.0{16} 18\.0{16}, )(59\.0{16} 13\.0{16})(, 67\.0{16} 
13\.0{16}, )(67\.0{16} 18\.0{16})(, 59\.0{16} 18\.0{16}\).*)',   # 10: 5
     # test geom/BugTracker/Tests/X_crash.SF-1971632.* might produce different 
error messages, depending on evaluation order
     r'^(ERROR = !MALException:geom.wkbGetCoordinate:Geometry ")(.*)(" not a 
Point)\n',                                                          # 11: 3
-    r"^(QUERY = COPY BINARY INTO)( .*);\n",                     # 12: 3
+    r"^(QUERY = COPY\b.* INTO .* FROM  *(?:\( *)?)('.*')(.*)\n", # 12: 3
 ])+')',  re.MULTILINE)
 norm_hint = '# the original non-normalized output was: '
 norm_out = (
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to