Index: openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs-oracle.xql,v
diff -u -N -r1.2 -r1.2.26.1
--- openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs-oracle.xql	29 Aug 2003 15:22:21 -0000	1.2
+++ openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs-oracle.xql	1 Sep 2020 14:18:41 -0000	1.2.26.1
@@ -3,15 +3,6 @@
 <queryset>
     <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-    <fullquery name="auth::test::get_admin_user_id.select_user_id">
-        <querytext>
-            select q.user_id from
-            (select user_id
-            from users
-            where acs_permission.permission_p(:context_root_id, user_id, 'admin') = 't') q where rownum = 1
-        </querytext>
-    </fullquery>
-
     <fullquery name="auth::test::get_password_vars.select_vars">
         <querytext>
             select q.* from
Index: openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.1.26.1
--- openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs-postgresql.xql	27 Aug 2003 11:50:48 -0000	1.1
+++ openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs-postgresql.xql	1 Sep 2020 14:18:41 -0000	1.1.26.1
@@ -3,16 +3,6 @@
 <queryset>
     <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-    <fullquery name="auth::test::get_admin_user_id.select_user_id">
-        <querytext>
-            select user_id
-            from users
-            where acs_permission__permission_p(:context_root_id, user_id, 'admin') = 't'
-            limit 1  
-        </querytext>
-    </fullquery>
-
-
     <fullquery name="auth::test::get_password_vars.select_vars">
         <querytext>
             select u.user_id,
Index: openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl,v
diff -u -N -r1.53.2.10 -r1.53.2.11
--- openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl	3 Jul 2020 07:53:44 -0000	1.53.2.10
+++ openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl	1 Sep 2020 14:18:41 -0000	1.53.2.11
@@ -19,7 +19,11 @@
 } {
     set context_root_id [acs_magic_object security_context_root]
 
-    return [db_string select_user_id {}]
+    return [db_string select_user_id {
+        select min(user_id)
+          from users
+        where acs_permission.permission_p(:context_root_id, user_id, 'admin')
+    }]
 }
 
 ad_proc -private auth::test::get_password_vars {