Final fixups to get it to pass tests.

Author: schveiguy

dub.sdl

@@ -5,7 +5,7 @@ copyright   "Copyright (c) 2011-2019 Steve Teale, James W. Oliphant, Simen Endsj
 authors     "Steve Teale" "James W. Oliphant" "Simen Endsjø" "Sönke Ludwig" "Sergey Shamov" "Nick Sabalausky"
 
 dependency "vibe-core" version="~>1.7.0" optional=true
-dependency "taggedalgebraic" version="~>0.11.7"
+dependency "taggedalgebraic" version="~>0.11.8"
 
 sourcePaths "source/"
 importPaths "source/"
@@ -53,7 +53,7 @@ configuration "unittest-vibe-ut" {
 	buildOptions "unittests"
 
 	dependency "vibe-core" version="~>1.7.0" optional=false
-	
+
 	dependency "unit-threaded" version="~>0.7.45"
 
 	debugVersions "MYSQLN_TESTS"

dub.selections.json

@@ -8,7 +8,7 @@
 		"memutils": "0.4.13",
 		"openssl": "1.1.4+1.0.1g",
 		"stdx-allocator": "2.77.5",
-		"taggedalgebraic": "0.11.7",
+		"taggedalgebraic": "0.11.8",
 		"unit-threaded": "0.7.55",
 		"vibe-core": "1.7.0"
 	}

dub.selections.vibecore-1.0.0.json

@@ -4,7 +4,7 @@
 		"eventcore": "0.8.48",
 		"libasync": "0.8.4",
 		"memutils": "0.4.13",
-		"taggedalgebraic": "0.11.6",
+		"taggedalgebraic": "0.11.8",
 		"unit-threaded": "0.7.45",
 		"vibe-core": "1.0.0"
 	}

examples/homePage/dub.selections.json

@@ -8,7 +8,7 @@
 		"memutils": "0.4.13",
 		"openssl": "1.1.4+1.0.1g",
 		"stdx-allocator": "2.77.5",
-		"taggedalgebraic": "0.11.6",
+		"taggedalgebraic": "0.11.8",
 		"unit-threaded": "0.7.45",
 		"vibe-core": "1.7.0"
 	}

examples/homePage/dub.selections.vibecore-1.0.0.json

@@ -4,7 +4,7 @@
 		"eventcore": "0.8.48",
 		"libasync": "0.8.4",
 		"memutils": "0.4.13",
-		"taggedalgebraic": "0.11.6",
+		"taggedalgebraic": "0.11.8",
 		"unit-threaded": "0.7.45",
 		"vibe-core": "1.0.0"
 	}

examples/homePage/example.d

@@ -18,8 +18,8 @@ void main(string[] args)
 	// Query
 	ResultRange range = conn.query("SELECT * FROM `tablename`");
 	Row row = range.front;
-	Variant id = row[0];
-	Variant name = row[1];
+	auto id = row[0];
+	auto name = row[1];
 	assert(id == 1);
 	assert(name == "Ann");
 
@@ -32,7 +32,7 @@ void main(string[] args)
 		"SELECT * FROM `tablename` WHERE `name`=? OR `name`=?",
 		"Bob", "Bobby");
 	bobs.close(); // Skip them
-	
+
 	Row[] rs = conn.query( // Same SQL as above, but only prepared once and is reused!
 		"SELECT * FROM `tablename` WHERE `name`=? OR `name`=?",
 		"Bob", "Ann").array; // Get ALL the rows at once

source/mysql/protocol/comms.d

@@ -341,12 +341,13 @@ package struct ProtocolPrepared
 				case BlobRef:
 					isRef = true; goto case;
 				case Blob:
+				case CBlob:
 					if (ext == SQLType.INFER_FROM_D_TYPE)
 						types[ct++] = SQLType.TINYBLOB;
 					else
 						types[ct++] = cast(ubyte) ext;
 					types[ct++] = SIGNED;
-					const ubyte[] uba = isRef? *v.kget!BlobRef : v.kget!Blob;
+					const ubyte[] uba = isRef? *v.kget!BlobRef : (ts == Blob ? v.kget!Blob : v.kget!CBlob);
 					ubyte[] packed = packLCS(uba);
 					reAlloc(packed.length);
 					vals[vcl..vcl+packed.length] = packed[];

source/mysql/result.d

@@ -68,7 +68,7 @@ public:
 	Params: i = the zero based index of the column whose value is required.
 	Returns: A Variant holding the column value.
 	+/
-	inout(MySQLVal) opIndex(size_t i) inout
+	ref inout(MySQLVal) opIndex(size_t i) inout
 	{
 		enforce!MYX(_nulls.length > 0, format("Cannot get column index %d. There are no columns", i));
 		enforce!MYX(i < _nulls.length, format("Cannot get column index %d. The last available index is %d", i, _nulls.length-1));
@@ -189,7 +189,7 @@ struct UnsafeRow
 	Row safe;
 	alias safe this;
 	deprecated("Variant support is deprecated. Please switch to using MySQLVal")
-	Variant opIndex(size_t idx) const {
+	Variant opIndex(size_t idx) {
 		return safe[idx].asVariant;
 	}
 }

source/mysql/test/regression.d

@@ -101,7 +101,7 @@ unittest
 	auto results = cn.query(stmt).array;
 	assert(results.length == 1);
 	auto pText = results[0][0].peek!string();
-	auto pBlob = results[0][1].peek!(const(ubyte)[])();
+	auto pBlob = results[0][1].peek!(ubyte[])();
 	assert(pText);
 	assert(pBlob);
 	assert(*pText == "hello");

source/mysql/types.d

@@ -39,7 +39,8 @@ union _MYTYPE
 	// blobs are const because of the indirection. In this case, it's not
 	// important because nobody is going to use MySQLVal to maintain their
 	// ubyte array.
-	const(ubyte)[] Blob;
+	ubyte[] Blob;
+	const(ubyte)[] CBlob;
 
 	typeof(null) Null;
 	bool Bit;
@@ -193,7 +194,7 @@ TypeInfo type(MySQLVal val) @safe pure nothrow
 }
 
 /// ditto
-T *peek(T)(MySQLVal val)
+T *peek(T)(ref MySQLVal val)
 {
 	// use exact type.
 	import taggedalgebraic.taggedalgebraic : get;