Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -N -r1.103.2.9 -r1.103.2.10
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	14 Oct 2016 11:29:36 -0000	1.103.2.9
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	14 Oct 2016 19:22:11 -0000	1.103.2.10
@@ -306,7 +306,8 @@
   # foreach based on "dbi_rows + results avlists"
   #
   ::xo::db::DBI instproc foreach {{-dbn ""} {-bind ""} qn sql body} {
-    if {$sql eq ""} {set sql [my get_sql $qn]}
+    #if {$sql eq ""} {set sql [my get_sql $qn]}
+    if {$sql eq ""} {set qn [uplevel [list [self] qn $qn]]}
     if {$bind ne ""} {set bindOpt [list -bind $bind]} {set bindOpt ""}
     set avlists [my uplevel [list dbi_rows -result avlists {*}$bindOpt -- $sql]]
     foreach avlist $avlists {
@@ -463,8 +464,9 @@
   }
 
   ::xo::db::DB instproc foreach {{-dbn ""} {-bind ""} qn sql body} {
-    if {$sql eq ""} {set sql [my get_sql $qn]}
+    #if {$sql eq ""} {set sql [my get_sql $qn]}
     if {$bind ne ""} {set bindOpt [list -bind $bind]} {set bindOpt ""}
+    set qn [uplevel [list [self] qn $qn]]
     uplevel [list ::db_foreach -dbn $dbn $qn $sql $body {*}$bindOpt]
   }