Index: openacs-4/packages/acs-tcl/lib/page-error.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/page-error.tcl,v diff -u -N -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/acs-tcl/lib/page-error.tcl 18 Sep 2015 07:33:47 -0000 1.10.2.2 +++ openacs-4/packages/acs-tcl/lib/page-error.tcl 2 Jan 2016 00:46:27 -0000 1.10.2.3 @@ -18,10 +18,10 @@ set return_url $prev_url if {$user_id eq 0} { - set user_name "[_ acs-tcl.Public_User]" + set user_name [_ acs-tcl.Public_User] set public_userm_email [parameter::get -package_id [ad_acs_kernel_id] -parameter HostAdministrator -default ""] } else { - db_1row get_user_info { *SQL* } + db_1row get_user_info {} set public_userm_email $user_email } @@ -103,7 +103,7 @@ -user_id $user_id bug_tracker::bugs_exist_p_set_true -package_id $bt_package_id - db_dml insert_auto_bug { *SQL* } + db_dml insert_auto_bug {} } else { #Comment on the Existing Bug even if the user dont want to add @@ -113,7 +113,7 @@ set bug_id $exist_bug if {$bug_number eq ""} { - db_dml increase_reported_times { *SQL* } + db_dml increase_reported_times {} } # Get the bug data Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v diff -u -N -r1.88.2.5 -r1.88.2.6 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 30 Nov 2015 12:57:42 -0000 1.88.2.5 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 2 Jan 2016 00:46:27 -0000 1.88.2.6 @@ -643,7 +643,7 @@ yourfilename.tcl:

-    db_exec_plsql delete_note { }
+ db_exec_plsql delete_note {}

yourfilename-oracle.xql:
Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v diff -u -N -r1.36.2.3 -r1.36.2.4 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 20 Oct 2015 08:01:04 -0000 1.36.2.3 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 2 Jan 2016 00:46:27 -0000 1.36.2.4 @@ -247,18 +247,9 @@ } } - db_dml update_tarball {update cr_revisions - set content = empty_blob() - where revision_id = :revision_id - returning content into :1} -blob_files [list $tmpfile] + db_dml update_tarball {} -blob_files [list $tmpfile] - db_dml update_content_length { - update apm_package_versions - set content_length = (select dbms_lob.getlength(content) - from cr_revisons - where revision_id = :revision_id) - where version_id = :version_id - } + db_dml update_content_length {} file delete $tmpfile } Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -N -r1.109.2.8 -r1.109.2.9 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 20 Oct 2015 08:01:04 -0000 1.109.2.8 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 2 Jan 2016 00:46:27 -0000 1.109.2.9 @@ -1185,14 +1185,7 @@ # Remove package from APM tables apm_callback_and_log $callback "

  • Deleting $package_key..." - db_exec_plsql apm_package_delete { - begin - apm_package_type.drop_type( - package_key => :package_key, - cascade_p => 't' - ); - end; - } + db_exec_plsql apm_package_delete {} } # Source SQL drop scripts @@ -1231,11 +1224,7 @@ } { Deletes a version from the database. } { - db_exec_plsql apm_version_delete { - begin - apm_package_version.del(version_id => :version_id); - end; - } + db_exec_plsql apm_version_delete {} } ad_proc -public apm_package_version_count {package_key} { @@ -1528,11 +1517,7 @@ } # Mark $version_id as the only installed version of the package. - db_dml version_mark_installed { - update apm_package_versions - set installed_p = decode(version_id, :version_id, 't', 'f') - where package_key = :package_key - } + db_dml version_mark_installed {} } ns_log Debug "apm_package_install_spec: Done updating .info file." } @@ -1544,13 +1529,7 @@ Enables a version of a package (disabling any other version of the package). @param version_id The id of the version to be enabled. } { - db_exec_plsql apm_package_version_enable { - begin - apm_package_version.enable( - version_id => :version_id - ); - end; - } + db_exec_plsql apm_package_version_enable {} apm_callback_and_log $callback "

    Package enabled." } @@ -1560,13 +1539,7 @@ @param version_id The id of the version to be disabled. } { - db_exec_plsql apm_package_version_disable { - begin - apm_package_version.disable( - version_id => :version_id - ); - end; - } + db_exec_plsql apm_package_version_disable {} apm_callback_and_log $callback "

    Package disabled." } @@ -1658,12 +1631,7 @@ @return 1 if a version of the indicated package_key of version lower than version_name \ is already installed in the system, 0 otherwise. } { - return [db_string apm_package_upgrade_p { - select apm_package_version.version_name_greater(:version_name, version_name) upgrade_p - from apm_package_versions - where package_key = :package_key - and version_id = apm_package.highest_version (:package_key) - } -default 0] + return [db_string apm_package_upgrade_p {} -default 0] } ad_proc -private apm_package_upgrade_from { package_key version_name } { @@ -1672,13 +1640,7 @@ @return the version of the package currently installed, which we're upgrading from, if it's different from the version_name passed in. If this is not an upgrade, returns the empty string. } { - return [db_string apm_package_upgrade_from { - select version_name - from apm_package_versions - where package_key = :package_key - and version_id = apm_package.highest_version(:package_key) - and version_name != :version_name - } -default ""] + return [db_string apm_package_upgrade_from {} -default ""] } @@ -1687,12 +1649,7 @@ Upgrade a package to a locally maintained later version. } { - db_exec_plsql apm_version_upgrade { - begin - apm_package_version.upgrade(version_id => :version_id); - end; - - } + db_exec_plsql apm_version_upgrade {} } ad_proc -private apm_upgrade_for_version_p {path initial_version_name final_version_name} { @@ -1702,15 +1659,7 @@ } { ns_log Debug "apm_upgrade_for_version_p: upgrade_p $path, $initial_version_name $final_version_name" - return [db_exec_plsql apm_upgrade_for_version_p { - begin - :1 := apm_package_version.upgrade_p( - path => :path, - initial_version_name => :initial_version_name, - final_version_name => :final_version_name - ); - end; - }] + return [db_exec_plsql apm_upgrade_for_version_p {}] } ad_proc -private apm_order_upgrade_scripts {upgrade_script_names} { Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -N -r1.95.2.4 -r1.95.2.5 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 20 Oct 2015 08:01:04 -0000 1.95.2.4 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 2 Jan 2016 00:46:28 -0000 1.95.2.5 @@ -948,13 +948,7 @@ Return the highest version of the indicated package. @return the version_id of the highest installed version of a package. } { - return [db_exec_plsql apm_highest_version { - begin - :1 := apm_package.highest_version ( - package_key => :package_key - ); - end; - }] + return [db_exec_plsql apm_highest_version {}] } ad_proc -public apm_highest_version_name {package_key} { @@ -968,13 +962,7 @@ @return The number of instances of the indicated package. } { - return [db_exec_plsql apm_num_instances { - begin - :1 := apm_package.num_instances( - package_key => :package_key - ); - end; - }] + return [db_exec_plsql apm_num_instances {}] } @@ -1057,8 +1045,7 @@ } # Update the cache. - db_foreach apm_parameter_cache_update { - } { + db_foreach apm_parameter_cache_update {} { ad_parameter_cache -set $attr_value $package_id $parameter_name } return $parameter_id @@ -1114,13 +1101,7 @@ Removes a dependency from the system. } { - db_exec_plsql dependency_remove { - begin - apm_package_version.remove_dependency( - dependency_id => :dependency_id - ); - end; - } + db_exec_plsql dependency_remove {} } ad_proc -public apm_interface_add { @@ -1139,30 +1120,15 @@ set interface_id [db_null] } - return [db_exec_plsql interface_add { - begin - :1 := apm_package_version.add_interface( - interface_id => :interface_id, - version_id => :version_id, - interface_uri => :interface_uri, - interface_version => :interface_version - ); - end; - }] + return [db_exec_plsql interface_add {}] } ad_proc -public apm_interface_remove {interface_id} { Removes a interface from the system. } { - db_exec_plsql interface_remove { - begin - apm_package_version.remove_interface( - interface_id => :interface_id - ); - end; - } + db_exec_plsql interface_remove {} } ad_proc -public apm_version_get { @@ -1305,7 +1271,7 @@ } ad_proc -private apm_package_url_from_id_mem {package_id} { - return [db_string apm_package_url_from_id {*SQL*} -default {}] + return [db_string apm_package_url_from_id {} -default {}] } # Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl,v diff -u -N -r1.62.2.1 -r1.62.2.2 --- openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl 10 Sep 2015 08:21:56 -0000 1.62.2.1 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl 2 Jan 2016 00:46:28 -0000 1.62.2.2 @@ -13,7 +13,7 @@ namespace eval acs_user {} ad_proc -private cc_lookup_screen_name_user { screen_name } { - return [db_string user_select {*SQL*} -default {}] + return [db_string user_select {} -default {}] } ad_proc cc_screen_name_user { screen_name } { @@ -28,13 +28,13 @@ ad_proc -private cc_lookup_email_user { email } { Return the user_id of a user given the email. Returns the empty string if no such user exists. } { - return [db_string user_select {*SQL*} -default {}] + return [db_string user_select {} -default {}] } ad_proc -public cc_email_from_party { party_id } { @return The email address of the indicated party. } { - return [db_string email_from_party {*SQL*} -default {}] + return [db_string email_from_party {} -default {}] } ad_proc cc_email_user { email } { @@ -47,7 +47,7 @@ } ad_proc -private cc_lookup_name_group { name } { - return [db_string group_select {*SQL*} -default {}] + return [db_string group_select {} -default {}] } ad_proc cc_name_to_group { name } { @@ -268,7 +268,7 @@ } { Change the membership state of a user. } { - set rel_id [db_string select_rel_id {*SQL*} -default {}] + set rel_id [db_string select_rel_id {} -default {}] if {$rel_id eq ""} { return @@ -444,7 +444,7 @@ @author Peter Marklund } { - db_1row select_user_info {*SQL*} -column_array row + db_1row select_user_info {} -column_array row return [array get row] } @@ -455,7 +455,7 @@ @author Peter Marklund } { - db_1row select_user_info {*SQL*} -column_array row + db_1row select_user_info {} -column_array row return [array get row] } @@ -553,7 +553,7 @@ Returns the user_id from a screen_name, or empty string if no user found. Searches all users, including banned, deleted, unapproved, etc. } { - return [db_string select_user_id_by_screen_name {*SQL*} -default {}] + return [db_string select_user_id_by_screen_name {} -default {}] } @@ -649,7 +649,7 @@ @return party_id } { - # return [db_string select_party_id {*SQL*} -default ""] + # return [db_string select_party_id {} -default ""] # The following query is identical in the result as the one above # It just takes into account that some applications (like contacts) make email not unique Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -N -r1.118.2.7 -r1.118.2.8 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 16 Nov 2015 13:10:29 -0000 1.118.2.7 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 2 Jan 2016 00:46:28 -0000 1.118.2.8 @@ -1666,7 +1666,7 @@ } ad_proc -private rp_lookup_node_from_host { host } { - return [db_string node_id { *SQL* } -default ""] + return [db_string node_id {} -default ""] } Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v diff -u -N -r1.78.2.5 -r1.78.2.6 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 20 Oct 2015 08:01:05 -0000 1.78.2.5 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 2 Jan 2016 00:46:28 -0000 1.78.2.6 @@ -471,13 +471,7 @@ the user login either via permanent cookies at session creation time or when they login by entering their password. } { - db_dml update_last_visit { - update users - set second_to_last_visit = last_visit, - last_visit = sysdate, - n_sessions = n_sessions + 1 - where user_id = :user_id - } + db_dml update_last_visit {} db_release_unused_handles } @@ -1195,13 +1189,7 @@ # this is called directly from security-init.tcl, # so it runs during the install before the data model has been loaded if { [db_table_exists secret_tokens] } { - db_foreach get_secret_tokens { - select * from ( - select token_id, token - from secret_tokens - sample(15) - ) where rownum < :num_tokens - } { + db_foreach get_secret_tokens {} { ns_cache set secret_tokens $token_id $token } }