fix(db): Changes query for postgres compatibility on table_exists

sailorproject · Nov 14, 2015 · 85cc1f5 · 85cc1f5
1 parent 403bac8
commit 85cc1f5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/sailor/db/luasql_common.lua b/src/sailor/db/luasql_common.lua
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
--- luasql_common.lua, v0.5: DB module for connecting and querying through LuaSQL
+-- luasql_common.lua, v0.5.1: DB module for connecting and querying through LuaSQL
 -- This file is a part of Sailor project
 -- Copyright (c) 2014 Etiene Dalcol <dalcol@etiene.net>
 -- License: MIT
@@ -197,7 +197,7 @@ function db.table_exists(table_name)
 	table_name = db.escape(table_name)
 	local query
  	if conf.driver == 'postgres' then 
- 		query = "SELECT to_regclass('public."..table_name.."');" 	
+ 		query = "SELECT relname FROM pg_class WHERE relname = '"..table_name.."';" 	
 	elseif conf.driver == 'sqlite3' then
     	query = "SELECT name FROM sqlite_master WHERE type='table' AND name='"..table_name.."';"
  	else

diff --git a/src/sailor/db/resty_mysql.lua b/src/sailor/db/resty_mysql.lua
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
--- resty_mysql.lua, v0.3: DB module for connecting and querying through MySQL on openresty servers
+-- resty_mysql.lua, v0.3.1: DB module for connecting and querying through MySQL on openresty servers
 -- This file is a part of Sailor project
 -- Copyright (c) 2014 Etiene Dalcol <dalcol@etiene.net>
 -- License: MIT
@@ -172,10 +172,12 @@ function db.get_columns(table_name)
 
 	local query = "SELECT column_name, column_key FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '"..table_name.."';"
 	local res = db.query(query)
-	for k,v in pairs(res.column_key) do
-		if v == 'PRI' then key = k end
+	local helper = require "tests.helper"
+	for _,v in ipairs(res) do
+		if v.column_key == 'PRI' then key = v.column_name end
+		columns[#columns+1] = v.column_name
 	end
-	columns = res.column_name
+
 
 	return columns, key
 end

diff --git a/test/dev-app/tests/functional/autogen.lua b/test/dev-app/tests/functional/autogen.lua
@@ -33,7 +33,6 @@ describe("Testing #Autogen", function()
   	local path = 'models/category.lua'
   	os.remove(path)
     local res = test.request('autogen',{post={table_name ='category'}})
-    print(res.body)
     assert.truthy(res.body:match('Model generated with success'))
     assert.truthy(lfs.attributes(path))
   end)