rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/TinyURL.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit cdb99697cc33387e74d43d67c2cd9a438be8b679
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 09:36:23 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.18-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index fb4f5ec..d627a92 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.17-1 web/
+1.5.18-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index d14ff08..061be2c 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.17
+Version: 1.5.18
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Jul 21 2011 Jan Pazdziora 1.5.18-1
+- Sysdate replaced with current_timestamp (msuchy(a)redhat.com)
+
* Wed Jul 20 2011 Jan Pazdziora 1.5.17-1
- Dropping the nightly from the Spacewalk WebUI version string.
commit 12eef78f928be9b6e88e701815d43cd8bd0c8cae
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jul 19 15:41:40 2011 +0200
Sysdate replaced with current_timestamp
In situations WHERE col < sysdate we can replace this with
current_timestamp. This function exists in both Oracle and PostgreSQL
and since there is no arithmetics in this statement the comparsion (or
any other operator) works well.
Under Oracle we use DATE type and in PostgreSQL we use TIMESTAMP WITH
TIMEZONE.
(cherry picked from commit a90759c165d70ba9fe8e40347c4b872a96dc3a9d)
diff --git a/web/modules/rhn/RHN/DB/TinyURL.pm b/web/modules/rhn/RHN/DB/TinyURL.pm
index bf77071..785ae69 100644
--- a/web/modules/rhn/RHN/DB/TinyURL.pm
+++ b/web/modules/rhn/RHN/DB/TinyURL.pm
@@ -35,7 +35,7 @@ sub lookup {
my $sth = $dbh->prepare(<<EOS);
SELECT url FROM rhnTinyURL
WHERE token = :token
- AND expires > sysdate
+ AND expires > current_timestamp
AND enabled = 'Y'
EOS
$sth->execute_h(token => $token);