Merge pull request #268 from schveiguy/fixUnsafeArgs

Fix unsafe args

Author: schveiguy

source/mysql/impl/prepared.d

@@ -337,7 +337,15 @@ struct UnsafePrepared
 	void setArgs(T...)(T args)
 		if(T.length == 0 || (!is(T[0] == Variant[]) && !is(T[0] == MySQLVal[])))
 	{
-		_safe.setArgs(args);
+		// translate any variants to non-variants
+		import std.meta;
+		auto translateArg(alias arg)() {
+			static if(is(typeof(arg) == Variant))
+				return _toVal(arg);
+			else
+				return arg;
+		}
+		_safe.setArgs(staticMap!(translateArg, args));
 	}
 
 	/// ditto

source/mysql/safe/commands.d

@@ -58,6 +58,30 @@ struct ColumnSpecialization
 ///ditto
 alias CSN = ColumnSpecialization;
 
+// Common implementation for `queryRowTuple` overloads.
+package(mysql) void queryRowTupleImpl(T...)(Connection conn, ExecQueryImplInfo info, ref T args)
+{
+	ulong ra;
+	enforce!MYXNoResultRecieved(execQueryImpl(conn, info, ra));
+
+	auto rr = conn.getNextRow();
+	/+if (!rr._valid)   // The result set was empty - not a crime.
+		return;+/
+	enforce!MYX(rr._values.length == args.length, "Result column count does not match the target tuple.");
+	foreach (size_t i, dummy; args)
+	{
+		import taggedalgebraic.taggedalgebraic : get, hasType;
+		enforce!MYX(rr._values[i].hasType!(T[i]),
+			"Tuple "~to!string(i)~" type and column type are not compatible.");
+		// use taggedalgebraic get to avoid extra calls.
+		args[i] = get!(T[i])(rr._values[i]);
+	}
+	// If there were more rows, flush them away
+	// Question: Should I check in purgeResult and throw if there were - it's very inefficient to
+	// allow sloppy SQL that does not ensure just one row!
+	conn.purgeResult();
+}
+
 @safe:
 
 /++
@@ -446,30 +470,6 @@ void queryRowTuple(T...)(Connection conn, ref Prepared prepared, ref T args)
 	prepared._lastInsertID = conn.lastInsertID; // Conceivably, this might be needed when multi-statements are enabled.
 }
 
-/// Common implementation for `queryRowTuple` overloads.
-package(mysql) void queryRowTupleImpl(T...)(Connection conn, ExecQueryImplInfo info, ref T args)
-{
-	ulong ra;
-	enforce!MYXNoResultRecieved(execQueryImpl(conn, info, ra));
-
-	auto rr = conn.getNextRow();
-	/+if (!rr._valid)   // The result set was empty - not a crime.
-		return;+/
-	enforce!MYX(rr._values.length == args.length, "Result column count does not match the target tuple.");
-	foreach (size_t i, dummy; args)
-	{
-		import taggedalgebraic.taggedalgebraic : get, hasType;
-		enforce!MYX(rr._values[i].hasType!(T[i]),
-			"Tuple "~to!string(i)~" type and column type are not compatible.");
-		// use taggedalgebraic get to avoid extra calls.
-		args[i] = get!(T[i])(rr._values[i]);
-	}
-	// If there were more rows, flush them away
-	// Question: Should I check in purgeResult and throw if there were - it's very inefficient to
-	// allow sloppy SQL that does not ensure just one row!
-	conn.purgeResult();
-}
-
 /++
 Execute an SQL SELECT command or prepared statement and return a single value:
 the first column of the first row received.

source/mysql/unsafe/commands.d

@@ -193,7 +193,9 @@ UnsafeResultRange query(Connection conn, const(char[]) sql, ColumnSpecialization
 UnsafeResultRange query(T...)(Connection conn, const(char[]) sql, T args)
 	if(T.length > 0 && !is(T[0] == Variant[]) && !is(T[0] == MySQLVal[]) && !is(T[0] == ColumnSpecialization) && !is(T[0] == ColumnSpecialization[]))
 {
-	return SC.query(conn, sql, args).unsafe;
+	auto prepared = conn.prepare(sql);
+	prepared.setArgs(args);
+	return query(conn, prepared);
 }
 ///ditto
 UnsafeResultRange query(Connection conn, const(char[]) sql, Variant[] args) @system
@@ -303,7 +305,9 @@ Nullable!UnsafeRow queryRow(Connection conn, const(char[]) sql, ColumnSpecializa
 Nullable!UnsafeRow queryRow(T...)(Connection conn, const(char[]) sql, T args)
 	if(T.length > 0 && !is(T[0] == Variant[]) && !is(T[0] == MySQLVal[]) && !is(T[0] == ColumnSpecialization) && !is(T[0] == ColumnSpecialization[]))
 {
-	return SC.queryRow(conn, sql, args).unsafe;
+	auto prepared = conn.prepare(sql);
+	prepared.setArgs(args);
+	return queryRow(conn, prepared);
 }
 ///ditto
 Nullable!UnsafeRow queryRow(Connection conn, const(char[]) sql, Variant[] args) @system
@@ -368,20 +372,22 @@ args = The variables, taken by reference, to receive the values.
 +/
 void queryRowTuple(T...)(Connection conn, const(char[]) sql, ref T args)
 {
-	return SC.queryRowTuple(conn, sql, args);
+	return SC.queryRowTupleImpl(conn, ExecQueryImplInfo(false, sql), args);
 }
 
 ///ditto
 void queryRowTuple(T...)(Connection conn, ref Prepared prepared, ref T args)
 {
-	SC.queryRowTuple(conn, prepared.safeForExec, args);
+	auto preparedInfo = conn.registerIfNeeded(prepared.sql);
+	SC.queryRowTupleImpl(conn, prepared.safe.getExecQueryImplInfo(preparedInfo.statementId), args);
+	prepared.safe._lastInsertID = conn.lastInsertID; // Conceivably, this might be needed when multi-statements are enabled.
 }
 
 ///ditto
 void queryRowTuple(T...)(Connection conn, ref BackwardCompatPrepared prepared, ref T args) @system
 {
 	auto p = prepared.prepared;
-	SC.queryRowTuple(conn, p.safeForExec, args);
+	queryRowTuple(conn, p, args);
 	prepared._prepared = p;
 }
 
@@ -465,8 +471,11 @@ Nullable!Variant queryValue(Connection conn, const(char[]) sql, ColumnSpecializa
 Nullable!Variant queryValue(T...)(Connection conn, const(char[]) sql, T args)
 	if(T.length > 0 && !is(T[0] == Variant[]) && !is(T[0] == MySQLVal[]) && !is(T[0] == ColumnSpecialization) && !is(T[0] == ColumnSpecialization[]))
 {
-	return SC.queryValue(conn, sql, args).asVariant;
+	auto prepared = conn.prepare(sql);
+	prepared.setArgs(args);
+	return queryValue(conn, prepared);
 }
+
 ///ditto
 Nullable!Variant queryValue(Connection conn, const(char[]) sql, Variant[] args) @system
 {