summaryrefslogtreecommitdiffstats
path: root/kamailio-model.lua
diff options
context:
space:
mode:
Diffstat (limited to 'kamailio-model.lua')
-rw-r--r--kamailio-model.lua6
1 files changed, 0 insertions, 6 deletions
diff --git a/kamailio-model.lua b/kamailio-model.lua
index bee2cb8..fb31f30 100644
--- a/kamailio-model.lua
+++ b/kamailio-model.lua
@@ -103,15 +103,9 @@ end
local listtables = function()
local result = {}
if DBENGINE == "PGSQL" then
-<<<<<<< HEAD
local tab = getselectresponse("SELECT tablename, schemaname FROM pg_tables WHERE tablename !~* 'pg_*' ORDER BY schemaname, tablename ASC")
for i,t in ipairs(tab) do
result[#result+1] = {schema=t.schemaname, table=t.tablename}
-=======
- local tab = getselectresponse("SELECT tablename FROM pg_tables WHERE tablename !~* 'pg_*' ORDER BY tablename ASC")
- for i,t in ipairs(tab) do
- result[#result+1] = t.tablename
->>>>>>> e19ee215667692e70cb4788dca4151e23aa73b96
end
else
-- untested