Changes to 'refs/tags/spacewalk-backend-1.2.50-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.2.50-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-11-01 17:06 +0000
Tagging package [spacewalk-backend] version [1.2.50-1] in directory [backend/].
Changes since spacewalk-java-1.2.81-1:
Jan Pazdziora (4):
Use current_timestamp instead of sysdate.
Use current_timestamp instead of SYSDATE.
Use current_timestamp instead of SYSDATE.
Automatic commit of package [spacewalk-backend] release [1.2.50-1].
Justin Sherrill (3):
fixing wsgiHandler to look in new location for apacheServer
fixing ISE on package deletion due to RHNSAT.RHN_PFDQUEUE_PATH_UQ violation
fixing package upload, to pass in checksums
---
backend/server/action/script.py | 4 -
backend/server/handlers/app/packages.py | 8 +-
backend/server/handlers/xmlrpc/queue.py | 2
backend/server/rhnAction.py | 2
backend/spacewalk-backend.spec | 12 +++
backend/wsgi/wsgiHandler.py | 4 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 36 ++++++----
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 1
rel-eng/packages/spacewalk-backend | 2
9 files changed, 47 insertions(+), 24 deletions(-)
---
13 years, 6 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit ef407d46658906fb917b469bf0d9318de9fdc030
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 1 18:06:47 2010 +0100
Automatic commit of package [spacewalk-backend] release [1.2.50-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2df050c..9833176 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.2.49
+Version: 1.2.50
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -669,6 +669,16 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Nov 01 2010 Jan Pazdziora 1.2.50-1
+- Use current_timestamp instead of SYSDATE.
+- fixing package upload, to pass in checksums (jsherril(a)redhat.com)
+- fixing wsgiHandler to look in new location for apacheServer
+ (jsherril(a)redhat.com)
+- Use current_timestamp with numtodsinterval instead of sysdate.
+- Fixing decimal2intfloat -- the function is passed str, not decimal.Decimal;
+ we just try to convert to int or float.
+- The conversion should take place both for remote and local connections.
+
* Mon Nov 01 2010 Jan Pazdziora 1.2.49-1
- Use _buildExternalValue to properly sanitize Unicode strings.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 5a8211a..6b7c262 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.49-1 backend/
+1.2.50-1 backend/
13 years, 6 months
3 commits - backend/server
by Jan Pazdziora
backend/server/action/script.py | 4 ++--
backend/server/handlers/xmlrpc/queue.py | 2 +-
backend/server/rhnAction.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 77e8a6479776506799dc2e8153dec2254a97c98a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 1 17:30:09 2010 +0100
Use current_timestamp instead of SYSDATE.
diff --git a/backend/server/rhnAction.py b/backend/server/rhnAction.py
index 4717c3e..1ddff24 100644
--- a/backend/server/rhnAction.py
+++ b/backend/server/rhnAction.py
@@ -83,7 +83,7 @@ def update_server_action(server_id, action_id, status, result_code=None,
set status = :status,
result_code = :result_code,
result_msg = :result_message,
- completion_time = SYSDATE
+ completion_time = current_timestamp
where action_id = :action_id
and server_id = :server_id
""")
commit 11a2c21cb9e669f4d8c31319699a2c82370eed1f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 1 16:45:34 2010 +0100
Use current_timestamp instead of SYSDATE.
diff --git a/backend/server/handlers/xmlrpc/queue.py b/backend/server/handlers/xmlrpc/queue.py
index 89c9150..0cd8d0c 100644
--- a/backend/server/handlers/xmlrpc/queue.py
+++ b/backend/server/handlers/xmlrpc/queue.py
@@ -354,7 +354,7 @@ class Queue(rhnHandler):
h = rhnSQL.prepare("""
update rhnServerAction
set status = 1,
- pickup_time = SYSDATE,
+ pickup_time = current_timestamp,
remaining_tries = :tries - 1
where action_id = :action_id
and server_id = :server_id
commit d061b78eaa9881c906cf2b9640f993b52b7f35fd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 1 16:44:37 2010 +0100
Use current_timestamp instead of sysdate.
diff --git a/backend/server/action/script.py b/backend/server/action/script.py
index b87e67c..bf51896 100644
--- a/backend/server/action/script.py
+++ b/backend/server/action/script.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2010 Red Hat, Inc.
#
# This software is licensed to you under the GNU General Public License,
# version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -23,7 +23,7 @@ __rhnexport__ = ['run']
_query_action_script = rhnSQL.Statement("""
select script, username, groupname, timeout,
- TO_CHAR(sysdate, 'YYYY-MM-DD HH24:MI:SS') as now
+ TO_CHAR(current_timestamp, 'YYYY-MM-DD HH24:MI:SS') as now
from rhnActionScript
where action_id = :action_id
""")
13 years, 6 months
3 commits - backend/server backend/wsgi java/code
by Justin Sherrill
backend/server/handlers/app/packages.py | 8 +-
backend/wsgi/wsgiHandler.py | 4 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 36 ++++++----
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 1
4 files changed, 31 insertions(+), 18 deletions(-)
New commits:
commit 182ac7bda4d4c078f98634daa201a6552159602d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 1 12:22:13 2010 -0400
fixing package upload, to pass in checksums
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index da66d81..e4f0301 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -34,6 +34,7 @@ from spacewalk.server.importlib.packageUpload import uploadPackages, listChannel
from spacewalk.server.importlib.userAuth import UserAuth
from spacewalk.server.importlib.errataCache import schedule_errata_cache_update
from spacewalk.common.checksum import getFileChecksum
+from spacewalk.server.rhnSQL.const import ORACLE, POSTGRESQL
#12/22/05 wregglej 173287
#I made a decent number of changes to this file to implement session authentication.
@@ -259,7 +260,6 @@ class Packages(RPC_Base):
log_debug(3)
channels = info.get('channels', [])
force = info.get('force', 0)
-
org_id, force = rhnPackageUpload.authenticate_session(session_string,
channels=channels, force=force)
return self._uploadPackage(channels, org_id, force, info)
@@ -275,11 +275,13 @@ class Packages(RPC_Base):
header, payload_stream, header_start, header_end = \
rhnPackageUpload.load_package(package_stream)
- relative_path = rhnPackageUpload.relative_path_from_header(
- header, org_id=org_id)
checksum_type = header.checksum_type()
checksum = getFileChecksum(header.checksum_type(), file=payload_stream)
+
+ relative_path = rhnPackageUpload.relative_path_from_header(
+ header, org_id=org_id,checksum=checksum, checksum_type=checksum_type)
+
package_dict, diff_level = rhnPackageUpload.push_package(
header, payload_stream, checksum_type, checksum, org_id=org_id, force=force,
header_start=header_start, header_end=header_end,
commit e1fa0f14a32509f8f806b097e89ac4c9b24e71e7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 1 12:17:11 2010 -0400
fixing ISE on package deletion due to RHNSAT.RHN_PFDQUEUE_PATH_UQ violation
also added user id checking during set queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 2e60759..6705862 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -178,12 +178,13 @@ WHERE id IN
<!-- Deletes references from a channel to a package for all packages in the given RhnSet.
The set must contain the package ID in the "element" of the set. -->
<write-mode name="cleanup_package_channels_from_set">
- <query params="set_label">
+ <query params="set_label, uid">
DELETE FROM rhnChannelPackage
WHERE package_id IN (
SELECT s.element
FROM rhnSet s
WHERE s.label = :set_label
+ AND S.user_id = :uid
)
</query>
</write-mode>
@@ -1459,12 +1460,15 @@ SELECT P.id, PE.epoch, PE.version, PE.release
<!-- Schedules the deletion of all packages found in the given RhnSet. The set must
contain the package ID in the "element" of the set. -->
<write-mode name="schedule_pkg_for_delete_from_set">
- <query params="set_label">
- INSERT INTO rhnPackageFileDeleteQueue (path, created)
- (SELECT p.path, current_timestamp
+ <query params="set_label, uid">
+ INSERT INTO rhnPackageFileDeleteQueue (path)
+ (SELECT distinct(p.path)
FROM rhnPackage p, rhnSet s
WHERE p.id = s.element
AND s.label = :set_label
+ AND S.user_id = :uid
+ AND not exists
+ (select path from rhnPackageFileDeleteQueue Q where Q.path = p.path)
)
</query>
</write-mode>
@@ -1472,12 +1476,13 @@ SELECT P.id, PE.epoch, PE.version, PE.release
<!-- Deletes packages found in the given RhnSet. The set must contain the package ID in
the "element" of the set. -->
<write-mode name="delete_packages_from_set">
- <query params="set_label">
+ <query params="set_label, uid">
DELETE FROM rhnPackage p
WHERE p.id IN (
SELECT s.element
FROM rhnSet s
WHERE s.label = :set_label
+ AND S.user_id = :uid
)
</query>
</write-mode>
@@ -1781,34 +1786,37 @@ SELECT distinct P.id AS ID,
<!-- Runs the cache cleanup for all packages in an RhnSet. The package ID must be in
"element" of the set. -->
<write-mode name="cleanup_needed_package_cache_from_set">
- <query params="set_label">
+ <query params="set_label, uid">
DELETE FROM rhnServerNeededCache r
WHERE r.package_id IN
(SELECT element
FROM rhnSet s
- WHERE s.label = :set_label)
+ WHERE s.label = :set_label
+ AND S.user_id = :uid)
</query>
</write-mode>
<write-mode name="cleanup_package_files_from_set">
- <query params="set_label">
+ <query params="set_label, uid">
DELETE FROM rhnPackageFile r
WHERE r.package_id IN
(SELECT element
FROM rhnSet s
- WHERE s.label = :set_label)
+ WHERE s.label = :set_label
+ AND S.user_id = :uid)
</query>
</write-mode>
<write-mode name="cleanup_package_changelog_from_set">
- <query params="set_label">
+ <query params="set_label, uid">
DELETE FROM rhnPackageChangeLogRec r
WHERE r.package_id IN
(SELECT element
FROM rhnSet s
- WHERE s.label = :set_label)
+ WHERE s.label = :set_label
+ AND S.user_id = :uid)
</query>
</write-mode>
@@ -1872,13 +1880,14 @@ ORDER BY P.package_arch_id DESC
<!-- Deletes sources of all packages found in the given RhnSet. The set must
contain the package ID in the "element" of the set. -->
<write-mode name="delete_package_sources_from_set">
- <query params="set_label">
+ <query params="set_label, uid">
DELETE FROM rhnPackageSource ps
WHERE ps.source_rpm_id IN (
SELECT p.source_rpm_id
FROM rhnPackage p, rhnSet s
WHERE p.id = s.element
AND s.label = :set_label
+ AND S.user_id = :uid
)
</query>
@@ -1887,11 +1896,12 @@ ORDER BY P.package_arch_id DESC
<!-- Returns the set of channels that any of the packages in the given set belong to.
The set must contain the package ID in the "element" of the set. -->
<mode name="determine_channels_for_packages_in_set">
- <query params="set_label">
+ <query params="set_label, uid">
SELECT DISTINCT cp.channel_id
FROM rhnChannelPackage cp, rhnSet s
WHERE cp.package_id = s.element
AND s.label = :set_label
+ AND S.user_id = :uid
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
index ed72ab3..8c99b4f 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -1159,6 +1159,7 @@ public class PackageManager extends BaseManager {
WriteMode mode;
Map<String, Object> params = new HashMap<String, Object>();
params.put("set_label", set.getLabel());
+ params.put("uid", user.getId());
// First, capture all of the channels that have one or more of the packages
// to delete (we'll need this later)
commit ab86740a73da2a319b1e416c95df80f2432d3092
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 1 09:43:21 2010 -0400
fixing wsgiHandler to look in new location for apacheServer
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index b722f2b..6e2ae25 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -14,12 +14,12 @@
#
#
-
+import os
from wsgi import wsgiRequest
from spacewalk.common import log_debug
-def handle(environ, start_response, server, component_type, type="server.apacheServer"):
+def handle(environ, start_response, server, component_type, type="spacewalk.server.apacheServer"):
#wsgi seems to capitalize incoming headers and add HTTP- to the front :/
# so we strip out the first 5 letters, and transform it into what we want.
replacements = {'_':'-', 'Rhn':'RHN', 'Md5Sum':'MD5sum', 'Xml':'XML'}
13 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.2.81-1'
by Tomas Lestach
Tag 'spacewalk-java-1.2.81-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-11-01 16:00 +0000
Tagging package [spacewalk-java] version [1.2.81-1] in directory [java/].
Changes since spacewalk-schema-1.2.61-1:
Jan Pazdziora (4):
Use ANSI syntax for outer join.
The sequence_nextval method returns sequence value both on Oracle and PostgreSQL.
Only do Oracle LOB handling for Oracle database backend.
The sequence_nextval method returns sequence value both on Oracle and PostgreSQL.
Tomas Lestach (3):
checkstyle fix
updating logging of SessionCleanup task
Automatic commit of package [spacewalk-java] release [1.2.81-1].
---
java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java | 11 +++++++---
java/code/src/com/redhat/rhn/taskomatic/task/TimeSeriesCleanUp.java | 2 -
java/spacewalk-java.spec | 6 ++++-
rel-eng/packages/spacewalk-java | 2 -
web/modules/rhn/RHN/DB.pm | 10 +++++----
web/modules/rhn/RHN/DB/Scheduler.pm | 4 +--
web/modules/rhn/RHN/DB/Server.pm | 5 +---
7 files changed, 25 insertions(+), 15 deletions(-)
---
13 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 5f53218fe876c0dc5653fd699b3f6d30a73dc235
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 1 17:00:28 2010 +0100
Automatic commit of package [spacewalk-java] release [1.2.81-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 657af3a..727c2cc 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.80
+Version: 1.2.81
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -358,6 +358,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 01 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.81-1
+- updating logging of SessionCleanup task (tlestach(a)redhat.com)
+- checkstyle fix (tlestach(a)redhat.com)
+
* Mon Nov 01 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.80-1
- adding new TimeSeriesCleanUp taskomatic task (tlestach(a)redhat.com)
- Fixing system_available_packages -- the order by got lost in previous
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 46218d6..e178742 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.80-1 java/
+1.2.81-1 java/
13 years, 6 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java | 11 +++++++---
java/code/src/com/redhat/rhn/taskomatic/task/TimeSeriesCleanUp.java | 2 -
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 1a2a3deb8191191b4ad9b1c7a78ea02070af65f3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 1 16:58:57 2010 +0100
updating logging of SessionCleanup task
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java b/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
index b832cf1..e507e77 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
@@ -66,7 +66,7 @@ public class SessionCleanup extends RhnJavaJob {
long bound = (System.currentTimeMillis() / 1000) - (2 * window);
- log.info("session_cleanup: starting delete of stale sessions");
+ log.debug("session_cleanup: starting delete of stale sessions");
if (log.isDebugEnabled()) {
log.debug("Batch size is " + String.valueOf(batchSize));
log.debug("Commit interval is " + String.valueOf(commitInterval));
@@ -93,8 +93,13 @@ public class SessionCleanup extends RhnJavaJob {
TaskConstants.TASK_QUERY_SESSION_CLEANUP + " returned");
}
//retrieves and logs number of sessions deleted
- log.debug("session: cleanup " + row.get("sessions_deleted") +
- " stale sessions deleted\n");
+ Long sessionsDeleted = (Long) row.get("sessions_deleted");
+ if (sessionsDeleted > 0) {
+ log.info(row.get("sessions_deleted") + " stale session(s) deleted\n");
+ }
+ else {
+ log.debug("No stale sessions deleted\n");
+ }
}
}
commit eb45349ff86484c280e7d622281331cfc684c958
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 1 16:54:44 2010 +0100
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/TimeSeriesCleanUp.java b/java/code/src/com/redhat/rhn/taskomatic/task/TimeSeriesCleanUp.java
index 39d0d6e..58a579f 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/TimeSeriesCleanUp.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/TimeSeriesCleanUp.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2010 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
13 years, 6 months
4 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB.pm | 10 ++++++----
web/modules/rhn/RHN/DB/Scheduler.pm | 4 ++--
web/modules/rhn/RHN/DB/Server.pm | 5 ++---
3 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 779504fd4d968d23f9485a1ee639f0ef7f5c17c6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 1 16:29:46 2010 +0100
The sequence_nextval method returns sequence value both on Oracle and PostgreSQL.
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 90324d0..75a2ba2 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -1558,7 +1558,7 @@ EOQ
INSERT
INTO rhnActionScript
(id, action_id, script, username, groupname, timeout)
-VALUES (rhn_actscript_id_seq.nextval, :aid, :script, :username, :groupname, :timeout)
+VALUES (sequence_nextval('rhn_actscript_id_seq'), :aid, :script, :username, :groupname, :timeout)
EOQ
$sth->execute_h(aid => $action_id,
commit 88d41f0080ec4d55e5552e0aa33625e28e1e9546
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 1 16:28:36 2010 +0100
Only do Oracle LOB handling for Oracle database backend.
diff --git a/web/modules/rhn/RHN/DB.pm b/web/modules/rhn/RHN/DB.pm
index d293adb..3f46b39 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.pm
@@ -541,10 +541,12 @@ sub execute_h {
use Scalar::Util qw/blessed/;
if (ref $v and blessed($v) and $v->isa("RHN::DB::Type::BLOB")) {
- eval 'use DBD::Oracle ()' or die $@;
- $attr->{ora_type} = DBD::Oracle::ORA_BLOB();
- if (defined $v->{ora_field}) {
- $attr->{ora_field} = $v->{ora_field};
+ if ($self->{Database}->{Driver}->{Name} eq 'Oracle') {
+ eval 'use DBD::Oracle ()' or die $@;
+ $attr->{ora_type} = DBD::Oracle::ORA_BLOB();
+ if (defined $v->{ora_field}) {
+ $attr->{ora_field} = $v->{ora_field};
+ }
}
$v = $v->{value};
}
commit 30f56a745e880a3430ca193413560f81c8426f05
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 1 16:16:53 2010 +0100
The sequence_nextval method returns sequence value both on Oracle and PostgreSQL.
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index a89716f..90324d0 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -92,7 +92,7 @@ sub make_base_action {
my $dbh = $transaction || RHN::DB->connect;
my $sth = $dbh->prepare(<<EOQ);
-SELECT rhn_event_id_seq.nextval,
+SELECT sequence_nextval('rhn_event_id_seq'),
rAT.id,
rAS.id
FROM rhnActionType rAT,
commit 2673f556333a97c4acc8285419495f507b7102e8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 1 16:04:18 2010 +0100
Use ANSI syntax for outer join.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index e1d7880..6a24c57 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -2830,10 +2830,9 @@ SELECT VI.id,
VI.host_system_id,
VI.UUID,
S.name AS HOST_SYSTEM_NAME
- FROM rhnVirtualInstance VI,
- rhnServer S
+ FROM rhnVirtualInstance VI left outer join rhnServer S
+ on VI.host_system_id = S.id
WHERE VI.virtual_system_id = :sid
- AND VI.host_system_id = S.id (+)
EOQ
$sth->execute_h(sid => $self->id());
13 years, 6 months
Changes to 'refs/tags/spacewalk-schema-1.2.61-1'
by Tomas Lestach
Tag 'spacewalk-schema-1.2.61-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-11-01 15:39 +0000
Tagging package [spacewalk-schema] version [1.2.61-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.2.80-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-schema] release [1.2.61-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.2.80-1'
by Tomas Lestach
Tag 'spacewalk-java-1.2.80-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-11-01 15:39 +0000
Tagging package [spacewalk-java] version [1.2.80-1] in directory [java/].
Changes since spacewalk-schema-1.2.60-1:
Jan Pazdziora (5):
As the table rhnPaidErrataTempCache is no more, we do not need to have check for temporary tables.
The conversion should take place both for remote and local connections.
Fixing decimal2intfloat -- the function is passed str, not decimal.Decimal; we just try to convert to int or float.
Use current_timestamp with numtodsinterval instead of sysdate.
Fixing system_available_packages -- the order by got lost in previous commits, and the name_upper is still there.
Tomas Lestach (2):
adding new TimeSeriesCleanUp taskomatic task
Automatic commit of package [spacewalk-java] release [1.2.80-1].
---
backend/server/handlers/xmlrpc/queue.py | 4
backend/server/rhnSQL/driver_postgresql.py | 29 ++---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 12 ++
java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java | 3
java/code/src/com/redhat/rhn/taskomatic/task/TimeSeriesCleanUp.java | 50 ++++++++++
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/data/rhnTaskoBunch.sql | 3
schema/spacewalk/common/data/rhnTaskoTask.sql | 3
schema/spacewalk/oracle/data/rhnTaskoSchedule.sql | 5 +
schema/spacewalk/oracle/data/rhnTaskoTemplate.sql | 7 +
schema/spacewalk/postgres/data/rhnTaskoSchedule.sql | 6 +
schema/spacewalk/postgres/data/rhnTaskoTemplate.sql | 8 +
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/020-rhnTaskoBunch_data.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/021-rhnTaskoTask_data.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/022-rhnTaskoTemplate_data.sql | 7 +
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/023-rhnTaskoSchedule_data.sql | 5 +
utils/spacewalk-dump-schema | 1
19 files changed, 138 insertions(+), 24 deletions(-)
---
13 years, 6 months