--- parser3/tests/388-sql.html	2019/10/25 13:10:20	1.11
+++ parser3/tests/388-sql.html	2020/01/18 20:52:01	1.14
@@ -1,10 +1,13 @@
 @main[]
 
+$path[^os[Release/;.libs/lib]]
+$ext[^os[dll;so]]
+
 $SQL[
 	$.drivers[^table::create{protocol	driver	client	connect
-sqlite	../../sql/sqlite/.libs/libparser3sqlite.so	libsqlite3.so	sqlite://:memory:?multi_statements=1
-mysql	../../sql/mysql/.libs/libparser3mysql.so	libmariadbclient.so	mysql://@/?config_group=parser3&multi_statements=1
-pgsql	../../sql/pgsql/.libs/libparser3pgsql.so	libpq.so	pgsql://test@localhost/test
+sqlite	../../sql/sqlite/${path}parser3sqlite.$ext	^os[sqlite3.dll;libsqlite3.so]	sqlite://:memory:?multi_statements=1
+mysql	../../sql/mysql/${path}parser3mysql.$ext	^os[libmySQL.dll;libmariadbclient.so]	mysql://@/?config_group=parser3&multi_statements=1
+pgsql	../../sql/pgsql/${path}parser3pgsql.$ext	libpq.$ext	pgsql://test@localhost/test
 }]
 ]
 
@@ -47,7 +50,7 @@ $ignore[^SQL.drivers.locate[protocol;$sq
 	3.5 ^try-catch{ ^double:sql{select -2}[ $.limit(0) ] }
 	3.6 ^double:sql{select -2}[ $.limit(0) $.default[1] ]
 
-	3.7 Multiple queries, data in first query: ^if($sql ne 'mysql'){ ^try-catch{ ^int:sql{select 2+2 ^; delete from pets where pet=''} } }
+	3.7 Multiple queries, data in first query: ^try-catch{ ^int:sql{select 2+2 ^; delete from pets where pet=''} }
 	3.8 Multiple queries, data in second query: ^try-catch{ ^int:sql{delete from pets where pet='' ^; select 2+2} }
 	3.9 Multiple queries, data in both queries: ^try-catch{ ^int:sql{select 2+2 ^; select 3+3 } }
 
@@ -122,3 +125,6 @@ $ignore[^SQL.drivers.locate[protocol;$sq
 @s[query;options]
 	$s[^string:sql{$query}[$options]]
 	"$s"
+
+@postprocess[text]
+	$result[^taint[as-is;$text]]