[evolvis-commits] r13492: Semi-automated db_query_params() transition for simple cases
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 02:39:59 CET 2011
Author: mirabilos
Date: 2011-02-28 02:39:59 +0100 (Mon, 28 Feb 2011)
New Revision: 13492
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/auth_unix.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/calculate_user_metric.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/create_home_dirs.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/create_scm_repos.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/daily_task_email.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/db_project_sums.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/homedirs.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/massmail.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/project_weekly_metric-backfill.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/rating_stats.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/vacuum.php
Log:
Semi-automated db_query_params() transition for simple cases
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/auth_unix.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/auth_unix.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/auth_unix.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -83,7 +83,9 @@
//
// Get the users from the database
//
- $res = db_query ("SELECT user_name,unix_pw,unix_uid,unix_gid,realname,shell FROM users WHERE unix_status='A'::bpchar");
+ $res = db_query_params ('SELECT user_name,unix_pw,unix_uid,unix_gid,realname,shell FROM users WHERE unix_status=$1',
+ array('A')) ;
+
$user_names = &util_result_column_to_array ($res, "user_name");
$user_pws = &util_result_column_to_array ($res, "unix_pw");
$user_ids = &util_result_column_to_array ($res, "unix_uid");
@@ -170,7 +172,9 @@
//
// Get the groups from the database
//
- $res = db_query ("SELECT unix_group_name,group_id FROM groups WHERE status='A'::bpchar AND use_scm=1");
+ $res = db_query_params ('SELECT unix_group_name,group_id FROM groups WHERE status=$1 AND use_scm=1',
+ array('A')) ;
+
$group_names = &util_result_column_to_array ($res, "unix_group_name");
$group_ids = &util_result_column_to_array ($res, "group_id");
//
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/calculate_user_metric.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/calculate_user_metric.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/calculate_user_metric.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -68,26 +68,35 @@
db_begin();
-db_query("DELETE FROM user_metric0");
+db_query_params ('DELETE FROM user_metric0',
+ array()) ;
+
$err .= db_error();
if ($sys_database_type != 'mysql') {
- db_query("select setval('user_metric0_pk_seq',1)");
+ db_query_params ('select setval($1,1)',
+ array('user_metric0_pk_seq')) ;
+
$err .= db_error();
}
-db_query("INSERT INTO user_metric0
+db_query_params ('INSERT INTO user_metric0
(user_id,times_ranked,avg_raters_importance,avg_rating,metric,percentile,importance_factor)
SELECT user_id,5,1.25,3,0,0,1.25
FROM user_group
WHERE
-user_group.group_id='$sys_peer_rating_group'
-AND user_group.admin_flags='A';");
+user_group.group_id=$1
+AND user_group.admin_flags=$2;',
+ array($sys_peer_rating_group,
+ 'A')) ;
+
$err .= db_error();
-db_query("UPDATE user_metric0 SET ranking=ranking-1");
+db_query_params ('UPDATE user_metric0 SET ranking=ranking-1',
+ array()) ;
+
if ($sys_database_type == 'mysql') {
$sql="
SELECT count(*) FROM user_metric0 INTO @total;
@@ -321,12 +330,18 @@
$ts_day = date('d', $t);
db_begin();
-db_query("DELETE FROM user_metric_history WHERE month='$ts_month' AND day='$ts_day'");
-db_query("
+db_query_params ('DELETE FROM user_metric_history WHERE month=$1 AND day=$2',
+ array($ts_month,
+ $ts_day)) ;
+
+db_query_params ('
INSERT INTO user_metric_history
- SELECT '$ts_month','$ts_day',user_id,ranking,metric
+ SELECT $1,$2,user_id,ranking,metric
FROM user_metric
-");
+',
+ array($ts_month,
+ $ts_day)) ;
+
$err .= db_error();
cron_entry(1,$err);
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/create_home_dirs.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/create_home_dirs.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/create_home_dirs.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -54,13 +54,20 @@
//
// Get the users from the gforge database
//
-$res = db_query ("SELECT distinct users.user_name FROM users,user_group,groups WHERE users.user_id=user_group.user_id AND user_group.group_id=groups.group_id AND groups.status='A' AND user_group.cvs_flags='1' AND users.unix_status='A'");
+$res = db_query_params ('SELECT distinct users.user_name FROM users,user_group,groups WHERE users.user_id=user_group.user_id AND user_group.group_id=groups.group_id AND groups.status=$1 AND user_group.cvs_flags=$2 AND users.unix_status=$3',
+ array('A',
+ '1',
+ 'A')) ;
+
$users = &util_result_column_to_array ($res, 'user_name');
//
// Get the groups from the gforge database
//
-$res = db_query ("SELECT unix_group_name FROM groups WHERE status='A' AND type_id='1'");
+$res = db_query_params ('SELECT unix_group_name FROM groups WHERE status=$1 AND type_id=$2',
+ array('A',
+ '1')) ;
+
$groups = &util_result_column_to_array ($res, 'unix_group_name');
//
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/create_scm_repos.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/create_scm_repos.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/create_scm_repos.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -36,7 +36,9 @@
setup_plugin_manager () ;
-$res=db_query("SELECT group_id FROM groups WHERE status='A' AND use_scm=1 ORDER BY group_id");
+$res=db_query_params ('SELECT group_id FROM groups WHERE status=$1 AND use_scm=1 ORDER BY group_id',
+ array('A')) ;
+
if (!$res) {
$this->setError('Unable to get hosted project count: '.db_error());
return false;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/daily_task_email.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/daily_task_email.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/daily_task_email.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -32,8 +32,11 @@
//
// Set up this script to run as the site admin
//
-$res = db_query("SELECT user_id FROM user_group WHERE admin_flags='A' AND group_id='1'");
+$res = db_query_params ('SELECT user_id FROM user_group WHERE admin_flags=$1 AND group_id=$2',
+ array('A',
+ '1')) ;
+
if (!$res) {
echo db_error();
exit(1);
@@ -45,10 +48,12 @@
session_set_new($id);
// Get user id's from users who have open tasks
-$res = db_query("SELECT DISTINCT u.user_id, u.realname, u.email FROM users u, project_assigned_to pat, project_task_vw ptv
+$res = db_query_params ('SELECT DISTINCT u.user_id, u.realname, u.email FROM users u, project_assigned_to pat, project_task_vw ptv
WHERE u.user_id > 100 AND u.user_id=pat.assigned_to_id AND pat.project_task_id=ptv.project_task_id
- AND ptv.status_id=1 ORDER BY u.user_id;");
+ AND ptv.status_id=1 ORDER BY u.user_id;',
+ array()) ;
+
$now = time();
$today = date("n/j/y");
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/db_project_sums.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/db_project_sums.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/db_project_sums.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -44,20 +44,30 @@
*/
db_begin();
-db_query("LOCK TABLE forum_agg_msg_count IN ACCESS EXCLUSIVE MODE;");
-db_query("LOCK TABLE forum IN ACCESS EXCLUSIVE MODE;");
-db_query("LOCK TABLE forum_group_list IN ACCESS EXCLUSIVE MODE;");
+db_query_params ('LOCK TABLE forum_agg_msg_count IN ACCESS EXCLUSIVE MODE;',
+ array()) ;
-$res = db_query("DELETE FROM forum_agg_msg_count;");
+db_query_params ('LOCK TABLE forum IN ACCESS EXCLUSIVE MODE;',
+ array()) ;
+
+db_query_params ('LOCK TABLE forum_group_list IN ACCESS EXCLUSIVE MODE;',
+ array()) ;
+
+
+$res = db_query_params ('DELETE FROM forum_agg_msg_count;',
+ array()) ;
+
if (!$res) {
$err .= "DELETE FROM forum_agg_msg_count : ".db_error();
}
-$res = db_query("INSERT INTO forum_agg_msg_count
+$res = db_query_params ('INSERT INTO forum_agg_msg_count
SELECT fgl.group_forum_id,count(f.msg_id)
FROM forum_group_list fgl
LEFT JOIN forum f USING (group_forum_id)
-GROUP BY fgl.group_forum_id;");
+GROUP BY fgl.group_forum_id;',
+ array()) ;
+
if (!$res) {
$err .= "INSERT INTO forum_agg_msg_count : ".db_error();
}
@@ -65,7 +75,9 @@
db_commit();
if ($sys_database_type != 'mysql') {
- db_query("VACUUM ANALYZE forum_agg_msg_count;");
+ db_query_params ('VACUUM ANALYZE forum_agg_msg_count;',
+ array()) ;
+
}
/*
@@ -73,26 +85,38 @@
*/
db_begin();
-db_query("LOCK TABLE artifact_counts_agg IN ACCESS EXCLUSIVE MODE;");
-db_query("LOCK TABLE artifact IN ACCESS EXCLUSIVE MODE;");
-db_query("LOCK TABLE artifact_group_list IN ACCESS EXCLUSIVE MODE;");
+db_query_params ('LOCK TABLE artifact_counts_agg IN ACCESS EXCLUSIVE MODE;',
+ array()) ;
-$rel = db_query("DELETE FROM artifact_counts_agg;");
+db_query_params ('LOCK TABLE artifact IN ACCESS EXCLUSIVE MODE;',
+ array()) ;
+
+db_query_params ('LOCK TABLE artifact_group_list IN ACCESS EXCLUSIVE MODE;',
+ array()) ;
+
+
+$rel = db_query_params ('DELETE FROM artifact_counts_agg;',
+ array()) ;
+
$err .= db_error();
-$rel=db_query("INSERT INTO artifact_counts_agg
+$rel=db_query_params ('INSERT INTO artifact_counts_agg
SELECT agl.group_artifact_id,
(SELECT count(*) FROM artifact WHERE status_id <> 3 AND group_artifact_id=agl.group_artifact_id),
(SELECT count(*) FROM artifact WHERE status_id=1 AND group_artifact_id=agl.group_artifact_id)
FROM artifact_group_list agl
LEFT JOIN artifact a USING (group_artifact_id)
-GROUP BY agl.group_artifact_id;");
+GROUP BY agl.group_artifact_id;',
+ array()) ;
+
$err .= db_error();
db_commit();
if ($sys_database_type != 'mysql') {
- db_query("VACUUM ANALYZE artifact_counts_agg;");
+ db_query_params ('VACUUM ANALYZE artifact_counts_agg;',
+ array()) ;
+
}
/*
@@ -104,8 +128,10 @@
*/
db_begin();
-$res=db_query("DELETE FROM project_sums_agg;");
+$res=db_query_params ('DELETE FROM project_sums_agg;',
+ array()) ;
+
/*
Get counts of mailing lists
*/
@@ -182,8 +208,10 @@
$err .= db_error();
if ($sys_database_type != 'mysql') {
- db_query("VACUUM ANALYZE project_sums_agg;");
+ db_query_params ('VACUUM ANALYZE project_sums_agg;',
+ array()) ;
+
if (db_error()) {
$err .= "Error: ".db_error();
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/homedirs.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/homedirs.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/homedirs.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -169,12 +169,16 @@
fclose($fw);
}
- /*$resgroupadmin=db_query("SELECT u.user_name FROM users u,user_group ug,groups g
+ /*$resgroupadmin=db_query_params ('SELECT u.user_name FROM users u,user_group ug,groups g
WHERE u.user_id=ug.user_id
AND ug.group_id=g.group_id
- AND g.unix_group_name='$group'
- AND ug.admin_flags='A'
- AND u.status='A'");
+ AND g.unix_group_name=$1
+ AND ug.admin_flags=$2
+ AND u.status=$3',
+ array($group,
+ 'A',
+ 'A')) ;
+
if (!$resgroupadmin || db_numrows($resgroupadmin) < 1) {
//group has no members, so cannot create dir
} else {
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/massmail.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/massmail.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/massmail.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -67,11 +67,13 @@
'SFDVLPR' => "AND users.user_id=user_group.user_id AND user_group.group_id=1"
);
-$mail_res = db_query("SELECT *
+$mail_res = db_query_params ('SELECT *
FROM massmail_queue
WHERE finished_date=0
- ORDER BY queued_date");
+ ORDER BY queued_date',
+ array()) ;
+
/* If there was error, notify admins, but don't be pesky */
if (!$mail_res) {
$err .= "cannot execute query to select pending mailings: ".db_error()."\n";
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/project_weekly_metric-backfill.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/project_weekly_metric-backfill.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/project_weekly_metric-backfill.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -268,10 +268,16 @@
echo db_error();
- $rel=db_query("DROP TABLE project_counts_weekly_tmp;");
- $rel=db_query("DROP TABLE project_metric_weekly_tmp1;");
- $rel=db_query("DROP SEQUENCE project_metric_week_ranking_seq;");
+ $rel=db_query_params ('DROP TABLE project_counts_weekly_tmp;',
+ array()) ;
+ $rel=db_query_params ('DROP TABLE project_metric_weekly_tmp1;',
+ array()) ;
+
+ $rel=db_query_params ('DROP SEQUENCE project_metric_week_ranking_seq;',
+ array()) ;
+
+
}
}
?>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/rating_stats.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/rating_stats.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/rating_stats.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -32,7 +32,9 @@
db_begin();
-$rel = db_query("DELETE FROM survey_rating_aggregate;");
+$rel = db_query_params ('DELETE FROM survey_rating_aggregate;',
+ array()) ;
+
$err .= db_error();
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/vacuum.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/vacuum.php 2011-02-28 01:39:56 UTC (rev 13491)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/vacuum.php 2011-02-28 01:39:59 UTC (rev 13492)
@@ -31,13 +31,16 @@
//
// PG 7.1 and earlier
//
-//$res = db_query("VACUUM ANALYZE;");
+//$res = db_query_params ('VACUUM ANALYZE;',array()) ;
+
//
// PG 7.2 and 7.3
//
if ($sys_database_type != 'mysql') {
- $res = db_query("VACUUM FULL ANALYZE;");
+ $res = db_query_params ('VACUUM FULL ANALYZE;',
+ array()) ;
+
if (!$res) {
$err .= "Error on DB1: " . db_error();
}
More information about the evolvis-commits
mailing list