web/modules/rhn/RHN/DB/Channel.pm | 6 +-
web/modules/rhn/RHN/DB/ConfigRevision.pm | 10 ++-
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 6 +-
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 4 -
web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml | 36 ++++++++----
web/modules/rhn/RHN/DB/Errata.pm | 39 +++++++++-----
web/modules/rhn/RHN/DB/ErrataEditor.pm | 4 -
web/modules/rhn/RHN/DB/KSTree.pm | 6 +-
web/modules/rhn/RHN/DB/Package.pm | 14 +++--
web/modules/sniglets/Sniglets/Packages.pm | 3 -
10 files changed, 82 insertions(+), 46 deletions(-)
New commits:
commit 223bfbc08b4eb604df6aecced0f4f60d7a74cc0e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 18 16:31:42 2009 +0100
fixed ORA-00904: "P"."MD5SUM": invalid identifier
Execution of /var/www/html/network/software/packages/change_log.pxt
failed at Wed Nov 18 15:58:45 2009: RHN::Exception: DBD::Oracle::db
prepare failed: ORA-00904: "P"."MD5SUM": invalid identifier (DBD
ERROR:
error possibly near <*> indicator at char 233 in 'SELECT P.id, P.org_id,
P.name_id, P.evr_id, P.package_arch_id, P.package_group, P.rpm_version,
P.description, P.summary, P.package_size, P.payload_size, P.build_host,
TO_CHAR(P.build_time , 'YYYY-MM-DD HH24:MI:SS'), P.source_rpm_id,
<*>P.md5sum,
P.vendor, P.payload_format, P.compat, P.path, P.header_sig, P.copyright,
P.cookie, TO_CHAR(P.last_modified , 'YYYY-MM-DD HH24:MI:SS'), PA.id,
PA.name, PA.label, PA.arch_type_id, PN.id, PN.name, PEVR.id, PEVR.epoch,
PEVR.version, PEVR.release, PG.id, PG.name, SRPM.id, SRPM.name\nFROM
rhnPackage P, rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PEVR,
rhnPackageGroup PG, rhnSourceRPM SRPM\nWHERE P.PACKAGE_ARCH_ID = PA.ID
AND P.NAME_ID = PN.ID AND P.EVR_ID = PEVR.ID AND P.PACKAGE_GROUP =
PG.ID(+) AND P.SOURCE_RPM_ID = SRPM.ID(+) AND P.ID = :p1') [for
Statement "SELECT P.id, P.org_id, P.name_id, P.evr_id,
P.package_arch_id, P.package_group, P.rpm_version, P.description,
P.summary, P.package_size, P.payload_size, P.build_host,
TO_CHAR(P.build_time , 'YYYY-MM-DD HH24:MI:SS'), P.source_rpm_id,
P.md5sum, P.vendor, P.payload_format, P.compat, P.path, P.header_sig,
P.copyright, P.cookie, TO_CHAR(P.last_modified , 'YYYY-MM-DD
HH24:MI:SS'), PA.id, PA.name, PA.label, PA.arch_type_id, PN.id, PN.name,
PEVR.id, PEVR.epoch, PEVR.version, PEVR.release, PG.id, PG.name,
SRPM.id, SRPM.name\nFROM rhnPackage P, rhnPackageArch PA, rhnPackageName
PN, rhnPackageEVR PEVR, rhnPackageGroup PG, rhnSourceRPM SRPM\nWHERE
P.PACKAGE_ARCH_ID = PA.ID AND P.NAME_ID = PN.ID AND P.EVR_ID = PEVR.ID
AND P.PACKAGE_GROUP = PG.ID(+) AND P.SOURCE_RPM_ID = SRPM.ID(+) AND P.ID
= ?"]\n RHN::DB /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm 234
RHN::Exception::DB::throw\n RHN::DB::Package
/usr/lib/perl5/vendor_perl/5.8.8/RHN/DB/Package.pm 547
RHN::DB::handle_error\n RHN::Package
/usr/lib/perl5/vendor_perl/5.8.8/RHN/Package.pm 31
RHN::DB::Package::lookup\n Sniglets::Packages
/usr/lib/perl5/vendor_perl/5.8.8/Sniglets/Packages.pm 329
RHN::Package::lookup\n PXT::Parser
/usr/lib/perl5/vendor_perl/5.8.8/PXT/Parser.pm 171
Sniglets::Packages::package_details\n PXT::Parser
/usr/lib/perl5/vendor_perl/5.8.8/PXT/Parser.pm 83
PXT::Parser::expand_tag\n PXT::ApacheHandler
/usr/lib/perl5/vendor_perl/5.8.8/PXT/ApacheHandler.pm 633
PXT::Parser::expand_tags\n PXT::ApacheHandler
/usr/lib/perl5/vendor_perl/5.8.8/PXT/ApacheHandler.pm 124
PXT::ApacheHandler::pxt_parse_data\n PXT::ApacheHandler
/usr/lib/perl5/vendor_perl/5.8.8/PXT/ApacheHandler.pm 124 (eval)\n main
-e 0 PXT::ApacheHandler::handler\n main -e 0 (eval)\n\nOffending Query:
SELECT P.id, P.org_id, P.name_id, P.evr_id, P.package_arch_id,
P.package_group, P.rpm_version, P.description, P.summary,
P.package_size, P.payload_size, P.build_host, TO_CHAR(P.build_time ,
'YYYY-MM-DD HH24:MI:SS'), P.source_rpm_id, P.md5sum, P.vendor,
P.payload_format, P.compat, P.path, P.header_sig, P.copyright, P.cookie,
TO_CHAR(P.last_modified , 'YYYY-MM-DD HH24:MI:SS'), PA.id, PA.name,
PA.label, PA.arch_type_id, PN.id, PN.name, PEVR.id, PEVR.epoch,
PEVR.version, PEVR.release, PG.id, PG.name, SRPM.id, SRPM.name\nFROM
rhnPackage P, rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PEVR,
rhnPackageGroup PG, rhnSourceRPM SRPM\nWHERE P.PACKAGE_ARCH_ID = PA.ID
AND P.NAME_ID = PN.ID AND P.EVR_ID = PEVR.ID AND P.PACKAGE_GROUP =
PG.ID(+) AND P.SOURCE_RPM_ID = SRPM.ID(+) AND P.ID = ?
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index b126a21..382b6e1 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -33,13 +33,14 @@ use RHN::Package::SolarisPatchSet;
my @pkg_fields = qw/
id org_id name_id evr_id package_arch_id package_group rpm_version description
summary package_size payload_size build_host build_time:longdate source_rpm_id
- md5sum vendor payload_format compat path header_sig copyright cookie
last_modified:longdate
+ vendor payload_format compat path header_sig copyright cookie
last_modified:longdate
/;
my @arch_fields = qw { id name label arch_type_id};
my @name_fields = qw { id name };
my @evr_fields = qw { id epoch version release };
my @group_fields = qw { id name };
my @srpm_fields = qw { id name };
+my @csum_fields = qw { id checksum };
my $p = new
RHN::DB::TableClass("rhnPackage","P","",@pkg_fields);
my $a = new
RHN::DB::TableClass("rhnPackageArch","PA","arch",@arch_fields);
@@ -47,14 +48,16 @@ my $n = new RHN::DB::TableClass("rhnPackageName",
"PN", "package_name", @name_fi
my $evr = new RHN::DB::TableClass("rhnPackageEVR", "PEVR",
"package_evr", @evr_fields);
my $pg = new RHN::DB::TableClass("rhnPackageGroup", "PG",
"package_group", @group_fields);
my $srpm = new RHN::DB::TableClass("rhnSourceRPM", "SRPM",
"s_rpm", @srpm_fields);
+my $csum = new RHN::DB::TableClass("rhnChecksum", "Csum",
"checksum", @csum_fields);
-my $tc = $p->create_join([ $a, $n, $evr, $pg, $srpm ],{ "rhnPackage" =>
{
+my $tc = $p->create_join([ $a, $n, $evr, $pg, $srpm, $csum ],{ "rhnPackage"
=> {
"rhnPackage" => [ "ID", "ID" ],
"rhnPackageArch" => ["PACKAGE_ARCH_ID", "ID"
],
"rhnPackageName" => ["NAME_ID", "ID"],
"rhnPackageEVR" => ["EVR_ID", "ID"],
"rhnPackageGroup" => ["PACKAGE_GROUP", "ID"],
- "rhnSourceRPM" => ["SOURCE_RPM_ID", "ID"]
+ "rhnSourceRPM" => ["SOURCE_RPM_ID", "ID"],
+ "rhnChecksum" => ["CHECKSUM_ID", "ID"],
}
},
{ rhnSourceRPM => "(+)",
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index 7ce66c1..ad777ae 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -344,7 +344,8 @@ sub package_details {
$pxt->pnotes(package_name => $package->nvre);
$subst{"package_$_"} = PXT::Utils->escapeHTML($package->$_() ||
'') || $no_data
- foreach qw/id arch_name arch_label arch_type_label arch_type_name package_group_name
rpm_version build_host build_time md5sum vendor copyright/;
+ foreach qw/id arch_name arch_label arch_type_label arch_type_name
+ package_group_name rpm_version build_host build_time vendor copyright/;
my ($relative_path, $size) = $package->source_rpm_path;
commit 77af04e4ac94a8b7bb9f436ebacf7ee8cc7e3a00
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 18 15:46:31 2009 +0100
fixed another bunch of perl queries for sha256 schema
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index d0029fe..5edfcad 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1128,7 +1128,7 @@ SELECT DISTINCT C.label,
PE.release,
E.advisory_name,
C.name,
- P.md5sum OUTDATED_PACKAGE_MD5SUM,
+ Csum.checksum OUTDATED_PACKAGE_MD5SUM,
P.path
FROM rhnPackageArch PA,
rhnChannel C,
@@ -1141,7 +1141,8 @@ SELECT DISTINCT C.label,
rhnChannelErrata CE,
rhnPackage P2,
rhnPackage P,
- rhnErrataPackage EP
+ rhnErrataPackage EP,
+ rhnChecksum Csum
WHERE EP.errata_id = ?
AND EP.package_id = P.id
AND P.name_id = P2.name_id
@@ -1157,6 +1158,7 @@ SELECT DISTINCT C.label,
AND P2.evr_id = PE.id
AND P2.package_arch_id = PA.id
AND CE2.channel_id = C.id
+ AND P.checksum_id = Csum.id
EOQ
$sth = $dbh->prepare($query);
diff --git a/web/modules/rhn/RHN/DB/ConfigRevision.pm
b/web/modules/rhn/RHN/DB/ConfigRevision.pm
index 3575fb7..0f84dc5 100644
--- a/web/modules/rhn/RHN/DB/ConfigRevision.pm
+++ b/web/modules/rhn/RHN/DB/ConfigRevision.pm
@@ -49,7 +49,7 @@ SELECT
CFN.path,
CC.org_id,
CC.id config_channel_id,
- CCon.md5sum,
+ Csum.checksum md5sum,
CCon.file_size,
(SELECT CFt.latest_config_revision_id FROM rhnConfigFile CFt WHERE CFT.id =
CR.config_file_id) LATEST_ID,
CCon.is_binary,
@@ -60,7 +60,8 @@ SELECT
rhnConfigChannel CC,
rhnConfigFile CF,
rhnConfigRevision CR,
- rhnConfigFileType CFT
+ rhnConfigFileType CFT,
+ rhnChecksum Csum
WHERE CR.id = :id
AND CI.id = CR.config_info_id
AND CF.id = CR.config_file_id
@@ -68,6 +69,7 @@ SELECT
AND CCon.id = CR.config_content_id
AND CC.id = CF.config_channel_id
AND CFT.id = CR.config_file_type_id
+ AND CCon.checksum_id = Csum.id
EOS
my $sth = $dbh->prepare($query);
$sth->execute_h(id => $params{id});
@@ -100,9 +102,9 @@ sub create_config_contents {
my $sth;
$sth = $dbh->prepare(<<EOS);
INSERT INTO rhnConfigContent
- (id, md5sum, file_size, contents)
+ (id, checksum_id, file_size, contents)
VALUES
- (rhn_confcontent_id_seq.nextval, :md5sum, :file_size, :contents)
+ (rhn_confcontent_id_seq.nextval, lookup_checksum('md5', :md5sum), :file_size,
:contents)
RETURNING id INTO :ccid
EOS
diff --git a/web/modules/rhn/RHN/DB/Errata.pm b/web/modules/rhn/RHN/DB/Errata.pm
index 19b6fdb..39642c2 100644
--- a/web/modules/rhn/RHN/DB/Errata.pm
+++ b/web/modules/rhn/RHN/DB/Errata.pm
@@ -159,7 +159,7 @@ sub files {
$query = <<EOQ;
SELECT DISTINCT
EF.id AS ID,
- EF.md5sum AS MD5SUM,
+ Csum.checksum AS MD5SUM,
EF.filename AS FILENAME,
EFP.package_id AS PACKAGE_ID,
P1.path AS RHN_PACKAGE_PATH,
@@ -206,7 +206,8 @@ SELECT MAX(E.advisory_name)
rhnChannel C,
rhnErrataFileChannel EFC,
rhnErrataFileType EFT,
- rhnErrataFile EF
+ rhnErrataFile EF,
+ rhnChecksum Csum
WHERE EF.errata_id = ?
AND EF.type = EFT.id
AND EF.id = EFC.errata_file_id (+)
@@ -222,6 +223,7 @@ SELECT MAX(E.advisory_name)
AND P1.source_rpm_id = PS1.source_rpm_id (+)
AND P1.package_arch_id = PA.id (+)
AND EFPS.package_id = PS2.id (+)
+ AND EF.checksum_id = Csum.id
ORDER BY UPPER(Prod.name), UPPER(PA.name), UPPER(EF.filename)
EOQ
@@ -768,7 +770,7 @@ sub packages_in_errata {
PE.evr.version,
PE.evr.release,
C.name,
- P.md5sum,
+ Csum.checksum md5sum,
P.path,
PE.evr.epoch,
PA.label,
@@ -780,7 +782,8 @@ sub packages_in_errata {
rhnChannel C,
rhnChannelErrata CE,
rhnChannelPackage CP,
- rhnErrataPackage EP
+ rhnErrataPackage EP,
+ rhnChecksum Csum
WHERE EP.errata_id = ?
AND CE.errata_id = ?
AND EP.package_id = CP.package_id
@@ -790,6 +793,7 @@ sub packages_in_errata {
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND P.package_arch_id = PA.id
+ AND P.checksum_id = Csum.id
EOS
$sth = $dbh->prepare($query);
@@ -817,13 +821,16 @@ sub source_rpms {
my $sth;
$query = <<EOS;
- SELECT PS.id, P.id, PS.id, C.label, 'src', PS.path, NULL, NULL,
'SRPMs', P.md5sum, PS.md5sum
+ SELECT PS.id, P.id, PS.id, C.label, 'src', PS.path, NULL, NULL,
'SRPMs',
+ CPsum.checksum md5sum, CPSsum.checksum md5sum
FROM rhnChannel C,
rhnPackageSource PS,
rhnPackage P,
rhnChannelPackage CP,
rhnChannelErrata CE,
rhnErrataPackage EP
+ rhnChecksum CPsum,
+ rhnChecksum CPSsum
WHERE EP.errata_id = ?
AND CE.errata_id = ?
AND EP.package_id = CP.package_id
@@ -831,6 +838,8 @@ sub source_rpms {
AND CE.channel_id = C.id
AND EP.package_id = P.id
AND P.source_rpm_id = PS.source_rpm_id
+ AND P.checksum_id = CPsum.id
+ AND PS.checksum_id = CPSsum.id
EOS
@@ -857,14 +866,14 @@ sub public_packages_overview {
my $sth;
$query = <<EOQ;
-SELECT P2.id, P2.md5sum, C.name, PN.name, PE.evr.version, PE.evr.release, PE.evr.epoch,
P2.path, PA.name, C.label, CFM.channel_family_id,
+SELECT P2.id, Csum.checksum md5sum, C.name, PN.name, PE.evr.version, PE.evr.release,
PE.evr.epoch, P2.path, PA.name, C.label, CFM.channel_family_id,
(
SELECT CFP2.channel_family_id
FROM rhnChannelFamilyPermissions CFP2
WHERE CFP2.org_id IS NULL
AND CFP2.channel_family_id = CFM.channel_family_id
) PUBLIC_PACKAGE
- FROM rhnChannelFamily CF, rhnChannelFamilyMembers CFM, rhnPackageArch PA,
rhnPackageName PN, rhnPackageEVR PE, rhnPackage P2, rhnPackage P, rhnChannel C,
rhnChannelPackage CP, rhnChannelErrata CE, rhnErrataPackage EP
+ FROM rhnChannelFamily CF, rhnChannelFamilyMembers CFM, rhnPackageArch PA,
rhnPackageName PN, rhnPackageEVR PE, rhnPackage P2, rhnPackage P, rhnChannel C,
rhnChannelPackage CP, rhnChannelErrata CE, rhnErrataPackage EP, rhnChecksum Csum
WHERE EP.errata_id = ?
AND CE.errata_id = ?
AND EP.package_id = CP.package_id
@@ -879,6 +888,7 @@ SELECT P2.id, P2.md5sum, C.name, PN.name, PE.evr.version,
PE.evr.release, PE.ev
AND C.id = CFM.channel_id
AND CFM.channel_family_id = CF.id
AND CF.org_id IS NULL
+ AND P2.checksum_id = Csum.id
EOQ
$sth = $dbh->prepare($query);
@@ -906,18 +916,20 @@ sub rhn_files_overview {
$query = <<EOQ;
SELECT DISTINCT EFP.package_id,
- EF.md5sum,
+ Csum.checksum md5sum,
EF.filename AS FILENAME,
C.name AS CHANNEL_NAME
FROM rhnChannel C,
rhnErrataFilePackage EFP,
rhnErrataFileChannel EFC,
- rhnErrataFile EF
+ rhnErrataFile EF,
+ rhnChecksum Csum
WHERE EF.errata_id = :errata_id
AND EF.id = EFC.errata_file_id (+)
AND EF.id = EFP.errata_file_id (+)
AND EFC.channel_id IN (SELECT AC.channel_id FROM rhnAvailableChannels AC WHERE
AC.org_id = :org_id)
AND EFC.channel_id = C.id
+ AND EF.checksum_id = Csum.id
ORDER BY C.name, EF.filename DESC
EOQ
@@ -1486,15 +1498,16 @@ EOQ
my $ep_table = $self->table_map('rhnErrataPackage');
$query = <<EOQ;
-SELECT rhn_erratafile_id_seq.nextval AS ID, EFT.id AS TYPE_ID, P.md5sum, P.path, P.id AS
PACKAGE_ID,
+SELECT rhn_erratafile_id_seq.nextval AS ID, EFT.id AS TYPE_ID, Csum.checksum md5sum,
P.path, P.id AS PACKAGE_ID,
PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label AS
NVREA
- FROM rhnErrataFileType EFT, rhnPackage P, $ep_table EP, rhnPackageName PN,
rhnPackageEVR PE, rhnPackageArch PA
+ FROM rhnErrataFileType EFT, rhnPackage P, $ep_table EP, rhnPackageName PN,
rhnPackageEVR PE, rhnPackageArch PA, rhnChecksum Csum
WHERE EFT.label = 'RPM'
AND P.id = EP.package_id
AND EP.errata_id = :eid
AND P.evr_id = PE.id
AND P.name_id = PN.id
AND P.package_arch_id = PA.id
+ AND P.checksum_id = Csum.id
EOQ
$sth = $dbh->prepare($query);
@@ -1503,8 +1516,8 @@ EOQ
my $ef_insert_query = <<EOQ;
INSERT
INTO $ef_table
- (id, errata_id, type, md5sum, filename)
-VALUES (:id, :eid, :type, :md5sum, :filename)
+ (id, errata_id, type, checksum_id, filename)
+VALUES (:id, :eid, :type, lookup_checksum('md5', :md5sum), :filename)
EOQ
my $ef_insert_sth = $dbh->prepare($ef_insert_query);
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm
b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 35f852e..f0833f3 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -397,8 +397,8 @@ EOQ
$query =<<EOQ;
INSERT
INTO rhnErrataFileTmp
- (id, errata_id, type, md5sum, filename)
- (SELECT rhn_erratafile_id_seq.nextval, :new_eid, EF.type, EF.md5sum, EF.filename
+ (id, errata_id, type, checksum_id, filename)
+ (SELECT rhn_erratafile_id_seq.nextval, :new_eid, EF.type, EF.checksum_id,
EF.filename
FROM rhnErrataFile EF
WHERE EF.errata_id = :old_eid)
EOQ
diff --git a/web/modules/rhn/RHN/DB/KSTree.pm b/web/modules/rhn/RHN/DB/KSTree.pm
index 3f5017d..0c75646 100644
--- a/web/modules/rhn/RHN/DB/KSTree.pm
+++ b/web/modules/rhn/RHN/DB/KSTree.pm
@@ -89,7 +89,7 @@ EOQ
return unless ($row);
$self->$_($row->{uc $_}) for qw/id label base_path channel_id boot_image org_id
tree_type tree_type_name tree_type_label install_type install_type_label install_type_name
channel_arch_id channel_arch_label channel_arch_name/;
- $sth = $dbh->prepare("SELECT relative_filename, file_size, md5sum,
TO_CHAR(last_modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED FROM
rhnKSTreeFile WHERE kstree_id = :tree_id");
+ $sth = $dbh->prepare("SELECT relative_filename, file_size, Csum.checksum
md5sum, TO_CHAR(last_modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED FROM
rhnKSTreeFile, rhnChecksum Csum WHERE kstree_id = :tree_id AND checksum_id =
Csum.id");
$sth->execute_h(tree_id => $self->id);
$self->files( [ $sth->fullfetch_hashref ] );
@@ -194,9 +194,9 @@ sub commit_files {
for my $file (@{$self->files}) {
$sth = $dbh->prepare(<<EOQ);
INSERT INTO rhnKSTreeFile
- (kstree_id, relative_filename, md5sum, last_modified, file_size)
+ (kstree_id, relative_filename, checksum_id, last_modified, file_size)
VALUES
- (:tree_id, :relative_filename, :md5sum, TO_DATE(:last_modified, 'YYYY-MM-DD
HH24:MI:SS'), :file_size)
+ (:tree_id, :relative_filename, lookup_checksum('md5', :md5sum),
TO_DATE(:last_modified, 'YYYY-MM-DD HH24:MI:SS'), :file_size)
EOQ
$sth->execute_h(tree_id => $self->id, map { $_ => $file->{+uc $_} }
qw/relative_filename md5sum last_modified file_size/)
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 8b9c003..b126a21 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -329,10 +329,11 @@ sub file_list {
my $sth;
$query = <<EOQ;
-SELECT C.name, F.file_size, F.md5, F.file_mode
- FROM rhnPackageFile F, rhnPackageCapability C
+SELECT C.name, F.file_size, Csum.checksum md5, F.file_mode
+ FROM rhnPackageFile F, rhnPackageCapability C, rhnChecksum Csum
WHERE F.package_id = ?
AND F.capability_id = C.id
+ AND F.checksum_id = Csum.id
ORDER BY UPPER(C.name)
EOQ
commit 33ee571867c04f630a78705f49406bd3d21b2a2d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 18 14:55:43 2009 +0100
fixed perl queries for sha256 schema
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index 821dcfb..c660586 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -104,13 +104,15 @@ ORDER BY created DESC
<query params="pid">
SELECT C.name,
F.file_size,
- F.md5,
+ Cs.checksum md5,
F.file_mode,
F.linkto,
TO_CHAR(F.mtime, 'YYYY-MM-DD HH24:MI:SS') AS MTIME
- FROM rhnPackageFile F, rhnPackageCapability C
+ FROM rhnPackageFile F, rhnPackageCapability C,
+ rhnChecksum Cs
WHERE F.package_id = :pid
AND F.capability_id = C.id
+ AND CS.id = F.checksum_id
ORDER BY UPPER(C.name)
</query>
</mode>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index 19ce8d3..723cd77 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -1752,7 +1752,7 @@ SELECT NEWEST.package_id AS id, NEWEST.channel_id
<query params="sid, action_id">
SELECT SAVR.mode_differs,
SAVR.size_differs,
- SAVR.md5_differs,
+ SAVR.checksum_differs md5_differs,
SAVR.uid_differs,
SAVR.gid_differs,
SAVR.mtime_differs,
@@ -1777,7 +1777,7 @@ SELECT SAVR.mode_differs,
UNION
SELECT 'N' AS mode_differs,
'N' AS size_differs,
- 'N' AS md5_differs,
+ 'N' AS checksum_differs md5_differs,
'N' AS uid_differs,
'N' AS gid_differs,
'N' AS mtime_differs,
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
index dd3e921..9af09c7 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
@@ -115,14 +115,16 @@ ORDER BY CFN.path
<mode name="configfile_revisions">
<query params="crid">
SELECT CR.id,
- CCon.md5sum,
+ Csum.checksum md5sum,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id =
CR.id), 'Y', 'N') LATEST,
TO_CHAR(CCon.created, 'YYYY-MM-DD HH24:MI:SS') AS CREATED
- FROM rhnConfigContent CCon, rhnConfigRevision CR, rhnConfigFile CF
+ FROM rhnConfigContent CCon, rhnConfigRevision CR, rhnConfigFile CF,
+ rhnChecksum Csum
WHERE CCon.id = CR.config_content_id
AND CF.id = (SELECT config_file_id FROM rhnConfigRevision WHERE id = :crid)
AND CF.id = CR.config_file_id
+ AND CCon.checksum_id = Csum.id
ORDER BY CR.revision DESC
</query>
</mode>
@@ -130,7 +132,7 @@ ORDER BY CR.revision DESC
<mode name="configfiles_for_system">
<query params="sid">
SELECT CR.id AS ID,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.path,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id =
CR.id), 'Y', 'N') LATEST,
@@ -150,7 +152,8 @@ SELECT CR.id AS ID,
rhnConfigFile CF,
rhnConfigRevision CR,
rhnServerConfigChannel SCC,
- rhnConfigFileType CFT
+ rhnConfigFileType CFT,
+ rhnChecksum Csum
WHERE SCC.server_id = :sid
AND SCC.config_channel_id = CF.config_channel_id
AND CF.id = CR.config_file_id
@@ -161,6 +164,7 @@ SELECT CR.id AS ID,
AND CF.latest_config_revision_id = CR.id
AND CCT.label in ('normal', 'local_override')
AND CR.config_file_type_id = CFT.id
+ AND CCon.checksum_id = Csum.id
ORDER BY CCT.priority, SCC.position
</query>
<elaborator params="sid" multiple="t">
@@ -197,7 +201,7 @@ ORDER BY SCC.position
<mode name="configfiles_for_system_diff">
<query params="sid">
SELECT CR.id AS ID,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.path,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id =
CR.id), 'Y', 'N') LATEST,
@@ -217,7 +221,8 @@ SELECT CR.id AS ID,
rhnConfigFile CF,
rhnConfigRevision CR,
rhnServerConfigChannel SCC,
- rhnConfigFileType CFT
+ rhnConfigFileType CFT,
+ rhnChecksum Csum
WHERE SCC.server_id = :sid
AND SCC.config_channel_id = CF.config_channel_id
AND CF.id = CR.config_file_id
@@ -229,6 +234,7 @@ SELECT CR.id AS ID,
AND CCT.label in ('normal', 'local_override')
AND CR.config_file_type_id = CFT.id
AND NOT CFT.label = 'directory'
+ AND CCon.checksum_id = Csum.id
ORDER BY CCT.priority, SCC.position
</query>
<elaborator params="sid" multiple="t">
@@ -266,7 +272,7 @@ ORDER BY SCC.position
<query params="user_id">
SELECT SCC.server_id,
CR.id AS ID,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.path,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id =
CR.id), 'Y', 'N') LATEST,
@@ -284,7 +290,8 @@ SELECT SCC.server_id,
rhnConfigFileName CFN,
rhnConfigFile CF,
rhnConfigRevision CR,
- rhnServerConfigChannel SCC
+ rhnServerConfigChannel SCC,
+ rhnChecksum Csum
WHERE SCC.server_id IN (
SELECT DISTINCT S.id
FROM rhnServer S,
@@ -311,6 +318,7 @@ SELECT SCC.server_id,
WHERE label = 'selected_configfiles_ssm'
AND USER_ID = :user_id
)
+ AND CCon.checksum_id = Csum.id
ORDER BY SCC.server_id, CCT.priority, SCC.position
</query>
</mode>
@@ -460,7 +468,7 @@ SELECT CFN.id, count(DISTINCT SCC.server_id) AS system_count
<mode name="selected_configfiles">
<query params="set_label, user_id">
SELECT CR.id,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.path,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id =
CR.id), 'Y', 'N') LATEST,
@@ -474,7 +482,8 @@ SELECT CR.id,
rhnConfigFile CF,
rhnConfigContent CCon,
rhnConfigRevision CR,
- rhnSet S
+ rhnSet S,
+ rhnChecksum Csum
WHERE S.user_id = :user_id
AND S.label = :set_label
AND S.element = CR.id
@@ -484,6 +493,7 @@ SELECT CR.id,
AND CCon.id = CR.config_content_id
AND CCT.label IN ('normal', 'local_override')
AND CFN.id = CF.config_file_name_id
+ AND CCon.checksum_id = Csum.id
ORDER BY CFN.path
</query>
</mode>
@@ -509,7 +519,7 @@ ORDER BY CFN.path
<query params="ss_id">
SELECT DISTINCT
CR.id,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.id AS CONFIG_FILE_NAME_ID,
CFN.path,
CR.revision,
@@ -522,12 +532,14 @@ SELECT DISTINCT
rhnConfigFileName CFN,
rhnConfigFile CF,
rhnConfigRevision CR,
- rhnSnapshotConfigRevision SCR
+ rhnSnapshotConfigRevision SCR,
+ rhnChecksum Csum
WHERE SCR.snapshot_id = :ss_id
AND SCR.config_revision_id = CR.id
AND CR.config_content_id = CCon.id
AND CR.config_file_id = CF.id
AND CF.config_file_name_id = CFN.id
+ AND CCon.checksum_id = Csum.id
ORDER BY CFN.path
</query>
</mode>