FIX: DB usage (mysql, posgresql). #143

sailorproject · Mar 17, 2018 · f64044b · f64044b
1 parent 4fff854
commit f64044b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/rockspecs/sailor-current-1.rockspec b/rockspecs/sailor-current-1.rockspec
@@ -6,7 +6,7 @@ source = {
 description = {
    summary = "A Lua MVC Framework",
    detailed = [[
-      Sailor is a web framework written in Lua that follows the MVC design pattern.
+      Sailor! is a web framework written in Lua that follows the MVC design pattern.
    ]],
    homepage = "http://sailorproject.org",
    license = "MIT"

diff --git a/src/sailor/blank-app/conf/conf.lua b/src/sailor/blank-app/conf/conf.lua
@@ -18,11 +18,12 @@ local conf = {
 
 	db = {
 		development = { -- current environment
-			driver = 'mysql',
+			driver = '', -- mysql, postgres or sqlite3
 			host = '',
-			user = '',
-			pass = '',
-			dbname = ''
+			port = '', -- optional
+			user = '', -- no need with sqlite3
+			pass = '', -- no need with sqlite3
+			dbname = '' -- filename.db for sqlite3
 		}
 	},
 

diff --git a/src/sailor/db/luasql_common.lua b/src/sailor/db/luasql_common.lua
@@ -40,7 +40,7 @@ end
 function db.connect()
 	if db.transaction then return end
 	db.env = assert (luasql[conf.driver]())
-	db.con = assert (db.env:connect(conf.dbname,conf.user,conf.pass,conf.host))
+	db.con = assert (db.env:connect(conf.dbname,conf.user,conf.pass,conf.host, conf.port))
 end
 
 -- Closes the connection of the instance