Expose column names in row struct

mysql-d · Oct 21, 2018 · 0273d85 · 0273d85
1 parent d28a180
commit 0273d85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/source/mysql/protocol/comms.d b/source/mysql/protocol/comms.d
@@ -636,7 +636,7 @@ body
 
 // Moved here from `struct Row.this`
 package(mysql) void ctorRow(Connection conn, ref ubyte[] packet, ResultSetHeaders rh, bool binary,
-	out Variant[] _values, out bool[] _nulls)
+	out Variant[] _values, out bool[] _nulls, out string[] names)
 in
 {
 	assert(rh.fieldCount <= uint.max);
@@ -646,7 +646,7 @@ body
 	scope(failure) conn.kill();
 
 	uint fieldCount = cast(uint)rh.fieldCount;
-	_values.length = _nulls.length = fieldCount;
+	_values.length = _nulls.length = names.length = fieldCount;
 
 	if(binary)
 	{
@@ -669,6 +669,7 @@ body
 		do
 		{
 			FieldDescription fd = rh[i];
+			names[i] = fd.name;
 			sqlValue = packet.consumeIfComplete(fd.type, binary, fd.unsigned, fd.charSet);
 			// TODO: Support chunk delegate
 			if(sqlValue.isIncomplete)

diff --git a/source/mysql/result.d b/source/mysql/result.d
@@ -37,6 +37,7 @@ private:
 	bool[]      _nulls;
 
 public:
+	string[]     names;
 
 	/++
 	A constructor to extract the column data from a row data packet.
@@ -51,7 +52,7 @@ public:
 	+/
 	this(Connection con, ref ubyte[] packet, ResultSetHeaders rh, bool binary)
 	{
-		ctorRow(con, packet, rh, binary, _values, _nulls);
+		ctorRow(con, packet, rh, binary, _values, _nulls, names);
 	}
 
 	/++