From: <bla...@us...> - 2004-02-03 21:34:04
|
Update of /cvsroot/ngetsuite/ngetsuite/ngetsuite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18240 Modified Files: db.rb Log Message: use ? quoting for insert and update Index: db.rb =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/db.rb,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** db.rb 2 Feb 2004 02:41:57 -0000 1.21 --- db.rb 3 Feb 2004 21:31:32 -0000 1.22 *************** *** 259,264 **** end ! def exec_request(req) ! Db.dbh.do req end --- 259,268 ---- end ! def exec_request(req, values = nil) ! if values ! Db.dbh.do(req, *values) ! else ! Db.dbh.do(req) ! end end *************** *** 266,270 **** check_missing_values table = Db.get_table(self.class) ! req = "insert into `#{table}` (" req += fields_list_to_s(only_mandatory, true) --- 270,274 ---- check_missing_values table = Db.get_table(self.class) ! values = Array.new req = "insert into `#{table}` (" req += fields_list_to_s(only_mandatory, true) *************** *** 274,283 **** value = method('_'+name).call next if not value ! "'#{field.todb(value)}'" }.compact.join ', ' req += ')' debug 'DB: ' + req ! exec_request req end --- 278,288 ---- value = method('_'+name).call next if not value ! values << field.todb(value) ! " ? " }.compact.join ', ' req += ')' debug 'DB: ' + req ! exec_request(req, values) end *************** *** 304,318 **** check_missing_values table = Db.get_table(self.class) ! req = "update #{table} set " req += fields(self.class).map{ |name,field| v = method('_'+name).call next if not v ! value = field.todb(v) ! "`#{name}`='#{value}'" }.compact.join ', ' req += ' where ' + ids_constraint ! exec_request req end --- 309,323 ---- check_missing_values table = Db.get_table(self.class) ! values = Array.new req = "update #{table} set " req += fields(self.class).map{ |name,field| v = method('_'+name).call next if not v ! values << field.todb(v) ! "`#{name}`= ? " }.compact.join ', ' req += ' where ' + ids_constraint ! exec_request(req, values) end |