From: Waqas Hussain <waqas20@gmail.com>
Date: Sun, 26 Jul 2009 13:12:32 +0000 (+0500)
Subject: ejabberdsql2prosody: Fix typo, and improve the warning message
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=32a5206c288189c4d2d827ec6723d3bbb08a9d11;hp=fb208a58fac9bb8d0808c7765395fe88e646cfca;p=prosody.git

ejabberdsql2prosody: Fix typo, and improve the warning message
---

diff --git a/tools/ejabberdsql2prosody.lua b/tools/ejabberdsql2prosody.lua
index 6ff8cf19..ddbe3ee2 100644
--- a/tools/ejabberdsql2prosody.lua
+++ b/tools/ejabberdsql2prosody.lua
@@ -178,14 +178,14 @@ local t = parseFile(arg);
 for name, data in pairs(t) do
 	local m = map[name];
 	if m then
+		if #data > 0 and #data[1] ~= #m then
+			print("[warning] expected "..#m.." columns for table `"..name.."`, found "..#data[1]);
+		end
 		for i=1,#data do
 			local row = data[i];
-			for j=1,#row do
-				local n = m[j];
-				if n then
-					row[n] = row[j];
-					row[j] = nil;
-				else print("[warning] expected "..#n.." columns for table `"..name.."`, found "..#row); break; end
+			for j=1,#m do
+				row[m[j]] = row[j];
+				row[j] = nil;
 			end
 		end
 	end