@@ -370,13 +370,12 @@ object DB { } private def runPreparedStatement[T](st : PreparedStatement)(f : (PreparedStatement) => T) : T = { - Helpers.calcTime{ - queryTimeout.foreach(to => st.setQueryTimeout(to)) - try { - (st, f(st)) - } finally { - st.close - }} match {case (time, (query, res)) => runLogger(query, time); res} + queryTimeout.foreach(to => st.setQueryTimeout(to)) + try { + f(st) + } finally { + st.close + } } /** lift-mapper/src/main/scala/net/liftweb/mapper/DB.scala @@ -486,14 +486,14 @@ object DBLog { paramMap += args(0).asInstanceOf[Int] -> "NULL" } - case "setObject" if args.length == 2 => { + case "setObject" if (args.length >= 2 && args.length < 4) => { chain(method, args) paramMap += args(0).asInstanceOf[Int] -> args(1) } - case "setObject" if args.length >= 3 => { + case "setObject" if args.length == 4 => { chain(method, args) - paramMap += args(0).asInstanceOf[Int] -> "%s (scale %d)".format(args(1), args(2)) + paramMap += args(0).asInstanceOf[Int] -> "%s (scale %d)".format(args(1), args(3)) } case "setString" => { lift-mapper/src/main/scala/net/liftweb/mapper/LoggingStatementWrappers.scala e828a367a83cce4cfd2f33a80da19a5ea20b228f Derek Chen-Becker github@chen-becker.org http://github.com/dpp/liftweb/commit/fb891eade651d35dd4607f54fac109f60ab921f8 fb891eade651d35dd4607f54fac109f60ab921f8 2009-10-22T07:28:43-07:00 2009-10-20T09:07:13-07:00 Fixed double logging of Mapper SQL Removed the extra logging from DB.runPreparedStatement, since it should really be done on the things that use the PreparedStatement. Also fixed a minor formatting bug in setObject. d5aa816c47712bcfdf7c6c543953028ab62de780 Derek Chen-Becker github@chen-becker.org