Merge lp:~roger-booth/mysql-proxy/laminator into lp:mysql-proxy

[Roger Booth]

[Roger Booth (roger-booth)]

This branch contains a fix for bug #36151.
It includes a version of parser.lua that produces the correct output for the test case recently added to the bug report.

Thanks,
Roger Booth

[Roger Booth (roger-booth)]

Link to MySQL bug report: http://bugs.mysql.com/bug.php?id=36151

Unmerged revisions

945. By Roger Booth on 2010-01-11

Fix for Proxy parser.lua MySQL Bug #36151

=== modified file 'lib/proxy/parser.lua'
--- lib/proxy/parser.lua	2008-10-30 20:40:25 +0000
+++ lib/proxy/parser.lua	2010-01-12 04:03:11 +0000
@@ -38,6 +38,7 @@
 	local next_is_tblname = false
 	local in_braces = 0
 	local db_name = nil
+	local ddl_type = nil
 
 	local tables = {}
 
@@ -129,10 +130,14 @@
 			elseif ddl_type == "TABLE" then
 				if in_tablelist and 
 				   token["token_name"] == "TK_LITERAL" then
-					tables[tablename_expand(token.text)] = (sql_stmt == "SELECT" and "read" or "write")
+				   if not db_name and tokens[i + 1] and tokens[i + 1].token_name == "TK_DOT" then
+					db_name = token.text
+					else
+						tables[tablename_expand(token.text, db_name)] = (sql_stmt == "SELECT" and "read" or "write")
+						db_name = nil
+					end
 				else
 					in_tablelist = false
-
 					break
 				end
 			end
@@ -140,8 +145,14 @@
 			-- INSERT INTO ...
 			if in_tablelist then
 				if token["token_name"] == "TK_LITERAL" then
-					tables[tablename_expand(token.text)] = (sql_stmt == "SELECT" and "read" or "write")
+					if not db_name and tokens[i + 1] and tokens[i + 1].token_name == "TK_DOT" then
+						db_name = token.text
+					else
+						tables[tablename_expand(token.text, db_name)] = (sql_stmt == "SELECT" and "read" or "write")
+						db_name = nil
+					end
 				elseif token["token_name"] == "TK_SQL_INTO" then
+				elseif token["token_name"] == "TK_DOT" then
 				else
 					in_tablelist = false
 				end
@@ -150,10 +161,14 @@
 			-- UPDATE <tbl> SET ..
 			if in_tablelist then
 				if token["token_name"] == "TK_LITERAL" then
-					tables[tablename_expand(token.text)] = (sql_stmt == "SELECT" and "read" or "write")
+					if not db_name and tokens[i + 1] and tokens[i + 1].token_name == "TK_DOT" then
+						db_name = token.text
+					else
+						tables[tablename_expand(token.text, db_name)] = (sql_stmt == "SELECT" and "read" or "write")
+						db_name = nil
+					end
 				elseif token["token_name"] == "TK_SQL_SET" then
 					in_tablelist = false
-
 					break
 				end
 			end