--- parser3/tests/388-sql.html	2017/12/08 00:55:21	1.4
+++ parser3/tests/388-sql.html	2020/01/18 20:52:01	1.14
@@ -1,18 +1,29 @@
 @main[]
 
+$path[^os[Release/;.libs/lib]]
+$ext[^os[dll;so]]
+
 $SQL[
-	$.drivers[^table::create{protocol	driver	client
-sqlite	../../sql/sqlite/.libs/libparser3sqlite.so	libsqlite3.so
+	$.drivers[^table::create{protocol	driver	client	connect
+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
 }]
 ]
 
-^connect[sqlite://:memory:]{
+$sql[sqlite]
+$ignore[^SQL.drivers.locate[protocol;$sql]]
+
+^connect[$SQL.drivers.connect]{
+
 	1. 2 + 2 = ^string:sql{select 2+2}
 
 
 	2. void
 
-	2.1 ^void:sql{create table pets (pet varchar, food varchar, aggressive varchar, weigth varchar)}
+	2.0 $ignore[^try-catch{ ^void:sql{drop table pets} }]
+
+	2.1 ^void:sql{create table pets (pet varchar(128), food varchar(128), aggressive varchar(128), weigth varchar(128))}
 
 	2.2 ^void:sql{insert into pets values
 		('cat', 'milk', '^taint['very']', 5),
@@ -24,6 +35,10 @@ sqlite	../../sql/sqlite/.libs/libparser3
 	2.4 ^try-catch{ ^void:sql{query}[ $.unknown[yes] ] }
 	2.5 ^try-catch{ ^void:sql{query}[ $.bind[ $.name[value] ] ] }
 
+	2.6 Multiple queries: ^try-catch{ ^void:sql{delete from pets where pet='' ^; delete from pets where pet=''} }
+	2.8 Multiple queries, data in first query: ^if($sql ne 'mysql'){ ^try-catch{ ^void:sql{select 2+2 ^; delete from pets where pet=''} } }
+	2.9 Multiple queries, data in second query: ^try-catch{ ^void:sql{delete from pets where pet='' ^; select 2+2} }
+
 
 	3. int/double
 
@@ -35,6 +50,10 @@ sqlite	../../sql/sqlite/.libs/libparser3
 	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: ^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 } }
+
 
 	4. hash
 
@@ -48,6 +67,8 @@ sqlite	../../sql/sqlite/.libs/libparser3
 
 	4.5. ^h[select * from pets; $.type[table] $.limit(1) $.offset(1) ]
 
+	4.6 ^try-catch{ ^h[select 'dup', pet from pets; $.type[string] ]}
+
 
 	5. table
 
@@ -104,3 +125,6 @@ sqlite	../../sql/sqlite/.libs/libparser3
 @s[query;options]
 	$s[^string:sql{$query}[$options]]
 	"$s"
+
+@postprocess[text]
+	$result[^taint[as-is;$text]]