[otrs-cvs] FAQ/Kernel/System/FAQ Category.pm,1.1,1.2
"CVS commits notifications of OTRS.org" <[email protected]> Sat, 29 Jun 2013 23:52:04 +0000
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/FAQ/Kernel/System/FAQ
In directory lancelot:/tmp/cvs-serv30861/Kernel/System/FAQ
Modified Files:
Category.pm
Log Message:
Updated SQL style.
Author: cr
Index: Category.pm
===================================================================
RCS file: /home/cvs/FAQ/Kernel/System/FAQ/Category.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -2 -u -d -r1.1 -r1.2
--- Category.pm 29 Jun 2013 23:23:52 -0000 1.1
+++ Category.pm 29 Jun 2013 23:51:59 -0000 1.2
@@ -81,7 +81,8 @@
# insert record
return if !$Self->{DBObject}->Do(
- SQL => 'INSERT INTO faq_category '
- . '(name, parent_id, comments, valid_id, created, created_by, changed, changed_by) '
- . 'VALUES ( ?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)',
+ SQL => '
+ INSERT INTO faq_category (name, parent_id, comments, valid_id, created, created_by,
+ changed, changed_by)
+ VALUES ( ?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)',
Bind => [
\$Param{Name}, \$Param{ParentID}, \$Param{Comment}, \$Param{ValidID},
@@ -92,5 +93,8 @@
# get new category id
return if !$Self->{DBObject}->Prepare(
- SQL => 'SELECT id FROM faq_category WHERE name = ?',
+ SQL => '
+ SELECT id
+ FROM faq_category
+ WHERE name = ?',
Bind => [ \$Param{Name} ],
Limit => 1,
@@ -149,9 +153,8 @@
# build SQL
- my $SQL = 'SELECT COUNT(*)'
- . ' FROM faq_category'
- . ' WHERE valid_id IN ('
- . join ', ', $Self->{ValidObject}->ValidIDsGet()
- . ')';
+ my $SQL = '
+ SELECT COUNT(*)
+ FROM faq_category
+ WHERE valid_id IN (' . join ', ', $Self->{ValidObject}->ValidIDsGet() . ')';
# parent ids are given
@@ -216,5 +219,7 @@
# delete the category
return if !$Self->{DBObject}->Do(
- SQL => 'DELETE FROM faq_category WHERE id = ? ',
+ SQL => '
+ DELETE FROM faq_category
+ WHERE id = ?',
Bind => [ \$Param{CategoryID} ],
);
@@ -222,5 +227,7 @@
# delete the category groups
return if !$Self->{DBObject}->Do(
- SQL => 'DELETE FROM faq_category_group WHERE category_id = ? ',
+ SQL => '
+ DELETE FROM faq_category_group
+ WHERE category_id = ?',
Bind => [ \$Param{CategoryID} ],
);
@@ -269,9 +276,14 @@
# build sql
- my $SQL = 'SELECT id FROM faq_category WHERE ';
+ my $SQL = '
+ SELECT id
+ FROM faq_category
+ WHERE';
if ( defined $Param{Name} ) {
- $SQL .= "name = '$Param{Name}' AND parent_id = $Param{ParentID} ";
+ $SQL .= "
+ name = '$Param{Name}'
+ AND parent_id = $Param{ParentID}";
if ( defined $Param{CategoryID} ) {
- $SQL .= "AND id != $Param{CategoryID}";
+ $SQL .= " AND id != $Param{CategoryID}";
}
}
@@ -344,5 +356,8 @@
# sql
return if !$Self->{DBObject}->Prepare(
- SQL => 'SELECT id, parent_id, name, comments, valid_id FROM faq_category WHERE id = ?',
+ SQL => '
+ SELECT id, parent_id, name, comments, valid_id
+ FROM faq_category
+ WHERE id = ?',
Bind => [ \$Param{CategoryID} ],
Limit => 1,
@@ -406,5 +421,8 @@
# get groups
return if !$Self->{DBObject}->Prepare(
- SQL => 'SELECT group_id FROM faq_category_group WHERE category_id = ?',
+ SQL => '
+ SELECT group_id
+ FROM faq_category_group
+ WHERE category_id = ?',
Bind => [ \$Param{CategoryID} ],
);
@@ -474,5 +492,7 @@
# get groups
return if !$Self->{DBObject}->Prepare(
- SQL => 'SELECT group_id, category_id FROM faq_category_group',
+ SQL => '
+ SELECT group_id, category_id
+ FROM faq_category_group',
);
@@ -536,5 +556,7 @@
# build sql
- my $SQL = 'SELECT id, parent_id, name FROM faq_category';
+ my $SQL = '
+ SELECT id, parent_id, name
+ FROM faq_category';
if ($Valid) {
@@ -593,9 +615,8 @@
# sql
- my $SQL = 'SELECT id'
- . ' FROM faq_category'
- . ' WHERE valid_id IN ('
- . join ', ', $Self->{ValidObject}->ValidIDsGet()
- . ')';
+ my $SQL = '
+ SELECT id
+ FROM faq_category
+ WHERE valid_id IN (' . join ', ', $Self->{ValidObject}->ValidIDsGet() . ')';
my $Ext = '';
@@ -829,5 +850,7 @@
# build sql
- my $SQL = 'SELECT id, parent_id, name FROM faq_category';
+ my $SQL = '
+ SELECT id, parent_id, name
+ FROM faq_category';
# add where clause for valid categories
@@ -938,8 +961,9 @@
# sql
return if !$Self->{DBObject}->Do(
- SQL => 'UPDATE faq_category SET '
- . 'parent_id = ?, name = ?, '
- . 'comments = ?, valid_id = ?, changed = current_timestamp, '
- . 'changed_by = ? WHERE id = ?',
+ SQL => '
+ UPDATE faq_category
+ SET parent_id = ?, name = ?, comments = ?, valid_id = ?, changed = current_timestamp,
+ changed_by = ?
+ WHERE id = ?',
Bind => [
\$Param{ParentID}, \$Param{Name},
@@ -1072,11 +1096,12 @@
my $ValidIDsString = join ', ', $Self->{ValidObject}->ValidIDsGet();
- my $SQL = 'SELECT faq_item.id, faq_item.category_id '
- . 'FROM faq_item, faq_state_type, faq_state '
- . 'WHERE faq_state.id = faq_item.state_id '
- . 'AND faq_state.type_id = faq_state_type.id '
- . "AND faq_state_type.name != 'internal' "
- . "AND faq_item.valid_id IN ($ValidIDsString) "
- . 'AND faq_item.approved = 1';
+ my $SQL = "
+ SELECT faq_item.id, faq_item.category_id
+ FROM faq_item, faq_state_type, faq_state
+ WHERE faq_state.id = faq_item.state_id
+ AND faq_state.type_id = faq_state_type.id
+ AND faq_state_type.name != 'internal'
+ AND faq_item.valid_id IN ($ValidIDsString)
+ AND faq_item.approved = 1";
return if !$Self->{DBObject}->Prepare(
@@ -1183,12 +1208,13 @@
my $FoundArticle = 0;
- my $SQL = 'SELECT faq_item.id '
- . 'FROM faq_item, faq_state_type, faq_state '
- . 'WHERE faq_item.category_id = ? '
- . "AND faq_item.valid_id IN ($ValidIDsString) "
- . 'AND faq_state.id = faq_item.state_id '
- . 'AND faq_state.type_id = faq_state_type.id '
- . "AND faq_state_type.name = 'public' "
- . 'AND faq_item.approved = 1';
+ my $SQL = "
+ SELECT faq_item.id
+ FROM faq_item, faq_state_type, faq_state
+ WHERE faq_item.category_id = ?
+ AND faq_item.valid_id IN ($ValidIDsString)
+ AND faq_state.id = faq_item.state_id
+ AND faq_state.type_id = faq_state_type.id
+ AND faq_state_type.name = 'public'
+ AND faq_item.approved = 1";
ID:
@@ -1748,5 +1774,7 @@
# delete old groups
return if !$Self->{DBObject}->Do(
- SQL => 'DELETE FROM faq_category_group WHERE category_id = ?',
+ SQL => '
+ DELETE FROM faq_category_group
+ WHERE category_id = ?',
Bind => [ \$Param{CategoryID} ],
);
@@ -1759,8 +1787,9 @@
$GroupID = $Self->{DBObject}->Quote( $GroupID, 'Integer' );
- my $SQL = "INSERT INTO faq_category_group " .
- " (category_id, group_id, changed, changed_by, created, created_by) VALUES" .
- " ($Param{CategoryID}, $GroupID, current_timestamp, $Param{UserID}, " .
- " current_timestamp, $Param{UserID})";
+ my $SQL = "
+ INSERT INTO faq_category_group (category_id, group_id, changed, changed_by, created,
+ created_by)
+ VALUES ($Param{CategoryID}, $GroupID, current_timestamp, $Param{UserID},
+ current_timestamp, $Param{UserID})";
# write attachment to db
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log