More model<->db functions

Now find is find_by_id and we have a new find that receives a where_string.
And find_all now can receive a where_string too.

controllers/site.lua

@@ -9,40 +9,44 @@ function site.index(page)
 
 
     --Testing models
-    local User = sailor.model("user")
+    --[[local User = sailor.model("user")
     local u = User:new()
 
-    u.name = "jorge"
+    u.name = "francisco"
     u.password = "blah"
 
     if(u:save()) then
     	page:write("saved! "..u.id.."<br/>")
     end
 
+    local u2 = User:find("name = 'francisco'")
+    if u2 then
+    	page:write(u2.id.." - "..u2.name.."<br/>")
+    end
 
 
     local users = User:find_all()
 	for _, user in pairs(users) do 
         page:write(user.id.." - "..user.name.."<br/>")
     end
-
+   
     u.name = "roberto"
      if(u:save()) then
     	page:write("saved! "..u.id.."<br/>")
     end
 
-      local users = User:find_all()
+    local users = User:find_all()
 	for _, user in pairs(users) do 
         page:write(user.id.." - "..user.name.."<br/>")
     end
 
 
-    --[[page:write("Finding user with id 1:<br/>")
-    local some_user = User:find(1)
+    page:write("Finding user with id 1:<br/>")
+    local some_user = User:find_by_id(1)
     page:write(some_user.id.." - "..some_user.name.."<br/>")
 
     page:write("Finding user with id 47:<br/>")
-    local some_user = User:find(47)
+    local some_user = User:find_by_id(47)
     page:write(some_user.id.." - "..some_user.name.."<br/>")
 	]]
 

src/model.lua

@@ -84,8 +84,7 @@ function model:update()
 	return (db.query(query) ~= 0)
 end
 
-function model:find(id)
-	local cur = db.query("select * from "..self.db.table.." where "..self.db.key.."='"..id.."';")
+function model:fetch_object(cur)
 	local row = cur:fetch ({}, "a")
 	cur:close()
 	if row then
@@ -96,9 +95,24 @@ function model:find(id)
 	end
 end
 
-function model:find_all()
+function model:find_by_id(id)
+	local cur = db.query("select * from "..self.db.table.." where "..self.db.key.."='"..id.."';")
+	return self:fetch_object(cur)
+end
+
+function model:find(where_string)
+	local cur = db.query("select * from "..self.db.table.." where "..where_string..";")
+	return self:fetch_object(cur)
+end
+
+function model:find_all(where_string)
 	local key = self.db.key
-	local cur = db.query("select * from "..self.db.table..";")
+	if where_string then
+		where_string = " where "..where_string
+	else
+		where_string = ''
+	end
+	local cur = db.query("select * from "..self.db.table..where_string..";")
 	local res = {}
 	local row = cur:fetch ({}, "a")
 	while row do