summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-01-03 16:29:51 +0000
committerTed Trask <ttrask01@yahoo.com>2012-01-03 16:29:51 +0000
commited757db9c4f5957e800271f7936e065be6cb45fd (patch)
tree399535bd80ce034659ef8946ae5c2c03082ccb1e
parent682f6095c2b5841862d4736d998e6a3b194c9736 (diff)
downloadacf-weblog-ed757db9c4f5957e800271f7936e065be6cb45fd.tar.bz2
acf-weblog-ed757db9c4f5957e800271f7936e065be6cb45fd.tar.xz
Fixed escape function to not escape \
-rw-r--r--weblog-model.lua9
1 files changed, 4 insertions, 5 deletions
diff --git a/weblog-model.lua b/weblog-model.lua
index e6989a4..9aa31f8 100644
--- a/weblog-model.lua
+++ b/weblog-model.lua
@@ -62,8 +62,7 @@ end
local escape = function(sql, length)
sql = sql or ""
if length then sql = string.sub(sql, 1, length) end
- sql = string.gsub(sql, "'", "''")
- return string.gsub(sql, "\\", "\\\\")
+ return string.gsub(sql, "'", "''")
end
-- List the postgres databases on this system
@@ -397,7 +396,7 @@ end
local testdatabaseentry = function(datatype, value)
local success = true
local errtxt
- local sql = "CREATE TEMP TABLE testing ( test "..escape(datatype).." DEFAULT '"..escape(value).."' ) ON COMMIT DROP"
+ local sql = "CREATE TEMP TABLE testing ( test "..datatype.." DEFAULT '"..escape(value).."' ) ON COMMIT DROP"
local res, err = pcall(function()
assert (con:execute(sql))
end)
@@ -413,9 +412,9 @@ local convertdatabaseentry = function(datatype, value)
local errtxt
local result = value
local res, err = pcall(function()
- local sql = "CREATE TEMP TABLE testing ( test "..escape(datatype).." )"
+ local sql = "CREATE TEMP TABLE testing ( test "..datatype.." )"
assert (con:execute(sql))
- sql = "INSERT INTO testing VALUES ('"..value.."')"
+ sql = "INSERT INTO testing VALUES ('"..escape(value).."')"
assert (con:execute(sql))
sql = "SELECT * FROM testing"
local cur = assert (con:execute(sql))