Merge pull request #243 from kubo39/remove-deprecated-BackwardCompatPrepared

Remove deprecated BackwardCompatPrepared

Author: schveiguy

integration-tests/source/mysql/maintests.d

@@ -172,25 +172,16 @@ unittest
 		assert(prepared.getArg(0) == 6);
 		assert(prepared.getArg(1) == "ff");
 
-		// exec: bcPrepared sql
-		auto bcPrepared = cn.prepareBackwardCompatImpl(prepareSQL);
-		static assert(doSafe || is(typeof(bcPrepared) == BackwardCompatPrepared));
-		bcPrepared.setArgs(7, "gg");
-		assert(cn.exec(bcPrepared) == 1);
-		assert(bcPrepared.getArg(0) == 7);
-		assert(bcPrepared.getArg(1) == "gg");
-
 		// Check results
 		auto rows = cn.query("SELECT * FROM `execOverloads`").array();
-		assert(rows.length == 7);
+		assert(rows.length == 6);
 
 		assert(rows[0].length == 2);
 		assert(rows[1].length == 2);
 		assert(rows[2].length == 2);
 		assert(rows[3].length == 2);
 		assert(rows[4].length == 2);
 		assert(rows[5].length == 2);
-		assert(rows[6].length == 2);
 
 		assert(rows[0][0] == 1);
 		assert(rows[0][1] == "aa");
@@ -204,8 +195,6 @@ unittest
 		assert(rows[4][1] == "ee");
 		assert(rows[5][0] == 6);
 		assert(rows[5][1] == "ff");
-		assert(rows[6][0] == 7);
-		assert(rows[6][1] == "gg");
 	}
 	test!false();
 	() @safe { test!true(); } ();
@@ -276,16 +265,6 @@ unittest
 			assert(rows[0].length == 2);
 			assert(rows[0][0] == 3);
 			assert(rows[0][1] == "cc");
-
-			// BCPrepared sql
-			auto bcPrepared = cn.prepareBackwardCompatImpl(prepareSQL);
-			static assert(doSafe || is(typeof(bcPrepared) == BackwardCompatPrepared));
-			bcPrepared.setArgs(1, "aa");
-			rows = cn.query(bcPrepared).array;
-			assert(rows.length == 1);
-			assert(rows[0].length == 2);
-			assert(rows[0][0] == 1);
-			assert(rows[0][1] == "aa");
 		}
 
 		// Test queryRow
@@ -328,15 +307,6 @@ unittest
 			assert(row.length == 2);
 			assert(row[0] == 3);
 			assert(row[1] == "cc");
-
-			// BCPrepared sql
-			auto bcPrepared = cn.prepareBackwardCompatImpl(prepareSQL);
-			static assert(doSafe || is(typeof(bcPrepared) == BackwardCompatPrepared));
-			bcPrepared.setArgs(1, "aa");
-			row = cn.queryRow(bcPrepared).get;
-			assert(row.length == 2);
-			assert(row[0] == 1);
-			assert(row[1] == "aa");
 		}
 
 		// Test queryRowTuple
@@ -355,14 +325,6 @@ unittest
 			cn.queryRowTuple(prepared, i, s);
 			assert(i == 2);
 			assert(s == "bb");
-
-			// BCPrepared sql
-			auto bcPrepared = cn.prepareBackwardCompatImpl(prepareSQL);
-			static assert(doSafe || is(typeof(bcPrepared) == BackwardCompatPrepared));
-			bcPrepared.setArgs(3, "cc");
-			cn.queryRowTuple(bcPrepared, i, s);
-			assert(i == 3);
-			assert(s == "cc");
 		}
 
 		// Test queryValue
@@ -396,14 +358,6 @@ unittest
 			value = cn.queryValue(prepared, [MYVAL(3), MYVAL("cc")]).get;
 			assert(!value.valIsNull);
 			assert(value == 3);
-
-			// BCPrepared sql
-			auto bcPrepared = cn.prepareBackwardCompatImpl(prepareSQL);
-			static assert(doSafe || is(typeof(bcPrepared) == BackwardCompatPrepared));
-			bcPrepared.setArgs(1, "aa");
-			value = cn.queryValue(bcPrepared).get;
-			assert(!value.valIsNull);
-			assert(value == 1);
 		}
 	}
 	test!false();

source/mysql/connection.d

@@ -8,6 +8,6 @@ version moved to this location.
 
 $(SAFE_MIGRATION)
 +/
-module mysql.connection;
 
+module mysql.connection;
 public import mysql.unsafe.connection;

source/mysql/unsafe/commands.d

@@ -91,15 +91,6 @@ ulong exec(Connection conn, ref Prepared prepared, Variant[] args) @system
 	return exec(conn, prepared);
 }
 
-///ditto
-ulong exec(Connection conn, ref BackwardCompatPrepared prepared) @system
-{
-	auto p = prepared.prepared;
-	auto result = exec(conn, p);
-	prepared._prepared = p;
-	return result;
-}
-
 ///ditto
 ulong exec(Connection conn, ref Prepared prepared) @system
 {
@@ -224,15 +215,6 @@ UnsafeResultRange query(Connection conn, ref Prepared prepared, Variant[] args)
 	return query(conn, prepared);
 }
 
-///ditto
-UnsafeResultRange query(Connection conn, ref BackwardCompatPrepared prepared) @system
-{
-	auto p = prepared.prepared;
-	auto result = query(conn, p);
-	prepared._prepared = p;
-	return result;
-}
-
 /++
 Execute an SQL SELECT command or prepared statement where you only want the
 first `mysql.result.UnsafeRow`, if any.
@@ -335,15 +317,6 @@ Nullable!UnsafeRow queryRow(Connection conn, ref Prepared prepared, Variant[] ar
 	return queryRow(conn, prepared);
 }
 
-///ditto
-Nullable!UnsafeRow queryRow(Connection conn, ref BackwardCompatPrepared prepared) @system
-{
-	auto p = prepared.prepared;
-	auto result = queryRow(conn, p);
-	prepared._prepared = p;
-	return result;
-}
-
 /++
 Execute an SQL SELECT command or prepared statement where you only want the
 first `mysql.result.UnsafeRow`, and place result values into a set of D variables.
@@ -383,14 +356,6 @@ void queryRowTuple(T...)(Connection conn, ref Prepared prepared, ref T 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;
-	queryRowTuple(conn, p, args);
-	prepared._prepared = p;
-}
-
 
 /++
 Execute an SQL SELECT command or prepared statement and return a single value:
@@ -501,11 +466,3 @@ Nullable!Variant queryValue(Connection conn, ref Prepared prepared, Variant[] ar
 	prepared.setArgs(args);
 	return queryValue(conn, prepared);
 }
-///ditto
-Nullable!Variant queryValue(Connection conn, ref BackwardCompatPrepared prepared) @system
-{
-	auto p = prepared.prepared;
-	auto result = queryValue(conn, p);
-	prepared._prepared = p;
-	return result;
-}

source/mysql/unsafe/connection.d

@@ -44,129 +44,3 @@ UnsafePrepared prepareProcedure(Connection conn, string name, int numArgs) @safe
 {
 	return CS.prepareProcedure(conn, name, numArgs).unsafe;
 }
-
-/++
-This function is provided ONLY as a temporary aid in upgrading to mysql-native v2.0.0.
-
-See `BackwardCompatPrepared` for more info.
-+/
-deprecated("This is provided ONLY as a temporary aid in upgrading to mysql-native v2.0.0. You should migrate from this to the Prepared-compatible exec/query overloads in 'mysql.commands'.")
-BackwardCompatPrepared prepareBackwardCompat(Connection conn, const(char[]) sql)
-{
-	return prepareBackwardCompatImpl(conn, sql);
-}
-
-/// Allow mysql-native tests to get around the deprecation message
-package(mysql) BackwardCompatPrepared prepareBackwardCompatImpl(Connection conn, const(char[]) sql)
-{
-	return BackwardCompatPrepared(conn, prepare(conn, sql));
-}
-
-/++
-This is a wrapper over `mysql.unsafe.prepared.Prepared`, provided ONLY as a
-temporary aid in upgrading to mysql-native v2.0.0 and its
-new connection-independent model of prepared statements. See the
-$(LINK2 https://github.com/mysql-d/mysql-native/blob/master/MIGRATING_TO_V2.md, migration guide)
-for more info.
-
-In most cases, this layer shouldn't even be needed. But if you have many
-lines of code making calls to exec/query the same prepared statement,
-then this may be helpful.
-
-To use this temporary compatability layer, change instances of:
-
----
-auto stmt = conn.prepare(...);
----
-
-to this:
-
----
-auto stmt = conn.prepareBackwardCompat(...);
----
-
-And then your prepared statement should work as before.
-
-BUT DO NOT LEAVE IT LIKE THIS! Ultimately, you should update
-your prepared statement code to the mysql-native v2.0.0 API, by changing
-instances of:
-
----
-stmt.exec()
-stmt.query()
-stmt.queryRow()
-stmt.queryRowTuple(outputArgs...)
-stmt.queryValue()
----
-
-to this:
-
----
-conn.exec(stmt)
-conn.query(stmt)
-conn.queryRow(stmt)
-conn.queryRowTuple(stmt, outputArgs...)
-conn.queryValue(stmt)
----
-
-Both of the above syntaxes can be used with a `BackwardCompatPrepared`
-(the `Connection` passed directly to `mysql.commands.exec`/`mysql.commands.query`
-will override the one embedded associated with your `BackwardCompatPrepared`).
-
-Once all of your code is updated, you can change `prepareBackwardCompat`
-back to `prepare` again, and your upgrade will be complete.
-+/
-struct BackwardCompatPrepared
-{
-	import std.variant;
-	import mysql.unsafe.result;
-	import std.typecons;
-
-	private Connection _conn;
-	Prepared _prepared;
-
-	/// Access underlying `Prepared`
-	@property Prepared prepared() @safe { return _prepared; }
-
-	alias _prepared this;
-
-	/++
-	This function is provided ONLY as a temporary aid in upgrading to mysql-native v2.0.0.
-
-	See `BackwardCompatPrepared` for more info.
-	+/
-	deprecated("Change 'preparedStmt.exec()' to 'conn.exec(preparedStmt)'")
-	ulong exec() @system
-	{
-		return .exec(_conn, _prepared);
-	}
-
-	///ditto
-	deprecated("Change 'preparedStmt.query()' to 'conn.query(preparedStmt)'")
-	ResultRange query() @system
-	{
-		return .query(_conn, _prepared);
-	}
-
-	///ditto
-	deprecated("Change 'preparedStmt.queryRow()' to 'conn.queryRow(preparedStmt)'")
-	Nullable!Row queryRow() @system
-	{
-		return .queryRow(_conn, _prepared);
-	}
-
-	///ditto
-	deprecated("Change 'preparedStmt.queryRowTuple(outArgs...)' to 'conn.queryRowTuple(preparedStmt, outArgs...)'")
-	void queryRowTuple(T...)(ref T args) if(T.length == 0 || !is(T[0] : Connection))
-	{
-		return .queryRowTuple(_conn, _prepared, args);
-	}
-
-	///ditto
-	deprecated("Change 'preparedStmt.queryValue()' to 'conn.queryValue(preparedStmt)'")
-	Nullable!Variant queryValue() @system
-	{
-		return .queryValue(_conn, _prepared);
-	}
-}
-