spacewalk-commits October 2010

spacewalk-commits@lists.fedorahosted.org

13 participants
568 discussions

rel-eng/packages schema/spacewalk
by Jan Pazdziora 07 Oct '10

07 Oct '10

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit d6bb1c5156dc15cebce23ab387a106584573dbe8 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 7 14:40:25 2010 +0200 Automatic commit of package [spacewalk-schema] release [1.2.27-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 64c4cac..07cb58d 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.2.26-1 schema/spacewalk/ +1.2.27-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 724e556..f894872 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 1.2.26 +Version: 1.2.27 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade* %changelog +* Thu Oct 07 2010 Jan Pazdziora 1.2.27-1 +- Since the oracle/procs/lookup_config_info.sql was changed, we need to update + the SHA1 in the PostgreSQL source. + * Thu Oct 07 2010 Jan Pazdziora 1.2.26-1 - nvl removal for Oracle is not necessary, reverting (lzap+git(a)redhat.com) - upgrade script for 2a3a755ed052a0c3435a00d1e6c1c6c9c3ecc470

1 0

schema/spacewalk
by Jan Pazdziora 07 Oct '10

07 Oct '10

schema/spacewalk/postgres/procs/lookup_config_info.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 91e9f907986469155871a35b648e8074866a7978 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 7 14:40:05 2010 +0200 Since the oracle/procs/lookup_config_info.sql was changed, we need to update the SHA1 in the PostgreSQL source. diff --git a/schema/spacewalk/postgres/procs/lookup_config_info.sql b/schema/spacewalk/postgres/procs/lookup_config_info.sql index 23cfe13..f2abea3 100644 --- a/schema/spacewalk/postgres/procs/lookup_config_info.sql +++ b/schema/spacewalk/postgres/procs/lookup_config_info.sql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 a16dfd9a7caabf77b2070468ed52c815d9e466a9 +-- oracle equivalent source sha1 743053c977e5e5deb79cc02068ad3a0e2e4c1e52 -- -- Copyright (c) 2008--2010 Red Hat, Inc. --

1 0

Changes to 'refs/tags/spacewalk-backend-1.2.19-1'
by Jan Pazdziora 07 Oct '10

07 Oct '10

Tag 'spacewalk-backend-1.2.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-07 12:32 +0000 Tagging package [spacewalk-backend] version [1.2.19-1] in directory [backend/]. Changes since spacewalk-java-1.2.55-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-backend] release [1.2.19-1]. --- backend/spacewalk-backend.spec | 12 +++++++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 07 Oct '10

07 Oct '10

backend/spacewalk-backend.spec | 12 +++++++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 5bafc76fa39bb5973b3bb9cdfe8339637bce4915 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 7 14:32:24 2010 +0200 Automatic commit of package [spacewalk-backend] release [1.2.19-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index a4e4099..2a9e110 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -10,7 +10,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.18 +Version: 1.2.19 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -686,6 +686,16 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Thu Oct 07 2010 Jan Pazdziora 1.2.19-1 +- We cannot insert empty string and depend on the database to convert it to + null for "is null" to work -- this will fail on PostgreSQL. +- Fix the logic of the adjusted_port. +- Load the appropriate backend and initialize it (rhnPackageUpload.py). +- The AUTONOMOUS_TRANSACTION does not seem to be needed, plus it is not + supported in PostgreSQL; removing. +- fixing stray comma (jsherril(a)redhat.com) +- log_debug is not used in sql_base.py, removing the import. + * Mon Oct 04 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.18-1 - replaced local copy of compile.py with standard compileall module - removed a lot of dead code diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index e0a0f86..c923714 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.2.18-1 backend/ +1.2.19-1 backend/

1 0

Changes to 'refs/tags/spacewalk-java-1.2.55-1'
by Jan Pazdziora 07 Oct '10

07 Oct '10

Tag 'spacewalk-java-1.2.55-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-07 12:32 +0000 Tagging package [spacewalk-java] version [1.2.55-1] in directory [java/]. Changes since spacewalk-java-1.2.54-1: Jan Pazdziora (8): Use the global function evr_t_as_vre_simple in package_ids_in_set instead of method .as_vre_simple; this works on PostgreSQL as well. Need to make the select a subselect, to be able to use the column alias in order by. Use current_timestamp instead of the Oracle-specific sysdate in schedule_pkg_for_delete_from_set. The AUTONOMOUS_TRANSACTION does not seem to be needed, plus it is not supported in PostgreSQL; removing. Load the appropriate backend and initialize it (rhnPackageUpload.py). Fix the logic of the adjusted_port. We cannot insert empty string and depend on the database to convert it to null for "is null" to work -- this will fail on PostgreSQL. Automatic commit of package [spacewalk-java] release [1.2.55-1]. Lukas Zapletal (3): Replace Oracle outer join syntax with ANSI syntax for Channel.findCustomBaseChannels Removed unnecessary rhn.jar Ant dependency in a unit test PostgreSQL NVL2 function (CASE WHERE) typo fix. --- backend/server/importlib/backend.py | 3 - backend/server/rhnPackageUpload.py | 11 +++++- backend/server/rhnSQL/driver_postgresql.py | 5 +-- backend/server/rhnSession.py | 16 ++-------- java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 - java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 6 ++- java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 9 ++--- java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java | 5 +-- java/spacewalk-java.spec | 15 ++++++++- rel-eng/packages/spacewalk-java | 2 - 10 files changed, 43 insertions(+), 31 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 07 Oct '10

07 Oct '10

java/spacewalk-java.spec | 15 ++++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) New commits: commit a0a028fc3f34e09491cfd05783ac88a055671394 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 7 14:32:01 2010 +0200 Automatic commit of package [spacewalk-java] release [1.2.55-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index be1117c..6299c91 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.54 +Version: 1.2.55 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -338,6 +338,19 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Oct 07 2010 Jan Pazdziora 1.2.55-1 +- Use current_timestamp instead of the Oracle-specific sysdate in + schedule_pkg_for_delete_from_set. +- PostgreSQL NVL2 function (CASE WHERE) typo fix. (lzap+git(a)redhat.com) +- Removed unnecessary rhn.jar Ant dependency in a unit test + (lzap+git(a)redhat.com) +- Replace Oracle outer join syntax with ANSI syntax for + Channel.findCustomBaseChannels (lzap+git(a)redhat.com) +- Need to make the select a subselect, to be able to use the column alias in + order by. +- Use the global function evr_t_as_vre_simple in package_ids_in_set instead of + method .as_vre_simple; this works on PostgreSQL as well. + * Thu Oct 07 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.54-1 - 640520 - removing default/rhn_taskomatic.conf file (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 9822cfa..3c3ccb1 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.2.54-1 java/ +1.2.55-1 java/

1 0

backend/server
by Jan Pazdziora 07 Oct '10

07 Oct '10

backend/server/importlib/backend.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit c0a09dba3dd76b3bb18dd83733897d8b71bf92c4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 7 14:31:23 2010 +0200 We cannot insert empty string and depend on the database to convert it to null for "is null" to work -- this will fail on PostgreSQL. diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py index c013a27..d36300b 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -95,8 +95,7 @@ class Backend: for name, version in capabilityHash.keys(): ver = version if version is None or version == '': - # Oracle inserts nulls as empty strings better - ver = '' + ver = None if not nullStatement: nullStatement = self.dbmodule.prepare(sqlNull) nullStatement.execute(name=name)

1 0

4 commits - backend/server java/code
by Jan Pazdziora 07 Oct '10

07 Oct '10

backend/server/rhnPackageUpload.py | 11 +++++- backend/server/rhnSQL/driver_postgresql.py | 5 +-- backend/server/rhnSession.py | 16 ++-------- java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 2 - 4 files changed, 16 insertions(+), 18 deletions(-) New commits: commit 04f725cf90e6c3842ffc0386320ed515804c7863 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Oct 6 15:05:28 2010 +0200 Fix the logic of the adjusted_port. Addressing PythonHeaderParserHandler server.apacheServer::HeaderParserHandler: UnboundLocalError: local variable 'adjusted_port' referenced before assignment diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index c6a3311..509c0e2 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -136,8 +136,9 @@ class Database(sql_base.Database): def is_connected_to(self, backend, host, port, username, password, database): - if not port: - adjusted_port = -1 + adjusted_port = -1 + if port: + adjusted_port = port return (backend == POSTGRESQL) and (self.host == host) and \ (self.port == adjusted_port) and (self.username == username) \ and (self.password == password) and (self.database == database) commit 893df6d2b534677a9a8772d9e676ab18d045adcb Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Oct 6 15:55:35 2010 +0200 Load the appropriate backend and initialize it (rhnPackageUpload.py). diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py index 61f40bb..9355d84 100644 --- a/backend/server/rhnPackageUpload.py +++ b/backend/server/rhnPackageUpload.py @@ -23,12 +23,12 @@ from spacewalk.common.checksum import getFileChecksum from spacewalk.common.rhn_rpm import get_header_byte_range from server import rhnSQL -from server.importlib import importLib, userAuth, mpmSource, backendOracle, \ +from server.importlib import importLib, userAuth, mpmSource, \ packageImport, errataCache from server.rhnLib import get_package_path, \ get_package_path_without_package_name from server.rhnServer import server_packages - +from server.rhnSQL.const import ORACLE, POSTGRESQL def source_match(v1, v2): """ returns true if both parameters are true, false otherwise """ @@ -161,7 +161,12 @@ def push_package(header, payload_stream, checksum_type, checksum, org_id=None, f batch = importLib.Collection() batch.append(pkg) - backend = backendOracle.OracleBackend() + if CFG.DB_BACKEND == ORACLE: + from server.importlib.backendOracle import OracleBackend + backend = OracleBackend() + elif CFG.DB_BACKEND == POSTGRESQL: + from server.importlib.backendOracle import PostgresqlBackend + backend = PostgresqlBackend() backend.init() if force: commit ed9f60844bedff8d54027f23371f631a8ffdff0f Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Oct 6 14:40:43 2010 +0200 The AUTONOMOUS_TRANSACTION does not seem to be needed, plus it is not supported in PostgreSQL; removing. diff --git a/backend/server/rhnSession.py b/backend/server/rhnSession.py index 1e70d31..1042cba 100644 --- a/backend/server/rhnSession.py +++ b/backend/server/rhnSession.py @@ -113,14 +113,10 @@ class Session: # Old session - clean it up h = rhnSQL.prepare(""" - DECLARE - PRAGMA AUTONOMOUS_TRANSACTION; - BEGIN - delete from pxtSessions where id = :session_id; - commit; - END; + delete from pxtSessions where id = :session_id """) h.execute(session_id=self.session_id) + rhnSQL.commit(); raise ExpiredSessionError("Session not found") @@ -129,16 +125,12 @@ class Session: expires = int(time.time()) + self.duration h = rhnSQL.prepare(""" - DECLARE - PRAGMA AUTONOMOUS_TRANSACTION; - BEGIN insert into PXTSessions (id, web_user_id, expires, value) - values (:id, :web_user_id, :expires, :value); - commit; - END; + values (:id, :web_user_id, :expires, :value) """) h.execute(id=self.session_id, web_user_id=self.uid, expires=expires, value='RHNAPP') + rhnSQL.commit(); return self def load(session_string): commit 85d435ff2c86739f3e1e6c2bfb12447639e48a17 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 7 13:13:37 2010 +0200 Use current_timestamp instead of the Oracle-specific sysdate in schedule_pkg_for_delete_from_set. 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 fa6e7b0..7dc868b 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 @@ -1440,7 +1440,7 @@ SELECT P.id, PE.epoch, PE.version, PE.release <write-mode name="schedule_pkg_for_delete_from_set"> <query params="set_label"> INSERT INTO rhnPackageFileDeleteQueue (path, created) - (SELECT p.path, sysdate + (SELECT p.path, current_timestamp FROM rhnPackage p, rhnSet s WHERE p.id = s.element AND s.label = :set_label

1 0

3 commits - java/code
by Lukas Zapletal 07 Oct '10

07 Oct '10

java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +- java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 9 ++++----- java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java | 5 +++-- 3 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 85a99f55b6e6623e6322cbed5c5bf606a1c6310d Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Thu Oct 7 12:57:53 2010 +0200 PostgreSQL NVL2 function (CASE WHERE) typo fix. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml index 59248c5..8c44a84 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml @@ -1256,7 +1256,7 @@ END; SELECT DISTINCT c1.id as id, (select name from rhnChannel C2 where c1.parent_channel = c2.id) parent, c1.name as name, - CASE WHEN (SELECT 1 FROM rhnRegTokenChannels WHERE token_id = 2 AND channel_id = c1.id) + CASE WHEN (SELECT 1 FROM rhnRegTokenChannels WHERE :token_id = 2 AND channel_id = c1.id) IS NOT NULL THEN 'selected' ELSE '' END s FROM rhnChannel c1 inner join rhnUserChannel UC on UC.channel_id = C1.id AND c1.parent_channel IS NOT NULL commit 97e9eeb31748abb41791388210ce2b59e44aaf74 Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Thu Oct 7 12:48:01 2010 +0200 Removed unnecessary rhn.jar Ant dependency in a unit test diff --git a/java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java b/java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java index d4b5a7b..5f8e9a1 100644 --- a/java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java @@ -31,9 +31,9 @@ import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; -import org.apache.tools.ant.filters.StringInputStream; import org.hibernate.Session; +import java.io.ByteArrayInputStream; import java.util.Date; public class ConfigurationFactoryTest extends RhnBaseTestCase { @@ -234,7 +234,8 @@ public class ConfigurationFactoryTest extends RhnBaseTestCase { public void testCreateNewRevisionFromStream() throws Exception { String startData = "this is some original data"; - StringInputStream stream = new StringInputStream(startData); + StringBuffer StringBuffer1 = new StringBuffer(startData); + ByteArrayInputStream stream = new ByteArrayInputStream(StringBuffer1.toString().getBytes("UTF-8")); ConfigRevision cr = ConfigTestUtils.createConfigRevision(user.getOrg()); ConfigRevision cr2 = ConfigurationFactory.createNewRevisionFromStream( user, stream, new Long(startData.length()), cr.getConfigFile()); commit 36230f84d8b35bf4764820389e109f2998e04c21 Author: Lukas Zapletal <lzap+git(a)redhat.com> Date: Thu Oct 7 11:20:12 2010 +0200 Replace Oracle outer join syntax with ANSI syntax for Channel.findCustomBaseChannels See 3920241d797a7def82f97ea13ef28c0784059382 for the exception log. diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml index 8909b13..80c2b9d 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml @@ -143,11 +143,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <sql-query name="Channel.findCustomBaseChannels"> <![CDATA[SELECT {c.*} - FROM rhnChannel {c}, - rhnUserChannel uc, - rhnChannelCloned c_1_ - WHERE c.id = uc.channel_id - AND c.id = c_1_.id (+) + FROM rhnUserChannel uc, + rhnChannel {c} left outer join rhnChannelCloned c_1_ + ON c.id = c_1_.id + WHERE c.id = uc.channel_id AND uc.user_id = :user_id AND c.org_id is not null AND uc.role = 'subscribe'

1 0

2 commits - java/code
by Jan Pazdziora 07 Oct '10

07 Oct '10

java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 7c754a2ee91ab182808dba4fc718767c92cd5f3d Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 7 11:31:32 2010 +0200 Need to make the select a subselect, to be able to use the column alias in order by. Addressing org.postgresql.util.PSQLException: ERROR: column "nvrea" does not exist at org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:1525) at org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:1309) at org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:188) at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:452) at org.postgresql.jdbc2.AbstractJdbc2Statement.executeWithFlags(AbstractJdbc2Statement.java:354) at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:347) at com.mchange.v2.c3p0.impl.NewProxyPreparedStatement.execute(NewProxyPreparedStatement.java:651) at com.redhat.rhn.common.db.NamedPreparedStatement.execute(NamedPreparedStatement.java:139) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:454) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:431) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:335) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:340) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:280) at com.redhat.rhn.common.db.datasource.SelectMode.execute(SelectMode.java:105) at com.redhat.rhn.manager.rhnpackage.PackageManager.packageIdsInSet(PackageManager.java:507) at com.redhat.rhn.frontend.action.rhnpackage.CustomPackagesDeleteConfirmAction.execute(CustomPackagesDeleteConfirmAction.java:66) 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 5342302..fa6e7b0 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 @@ -490,6 +490,7 @@ ORDER BY UPPER(NVRE) <mode name="package_ids_in_set" class="com.redhat.rhn.frontend.dto.PackageOverview"> <query params="set_label, user_id"> + select * from ( SELECT P.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS NVREA FROM rhnPackage P, rhnPackageName PN, @@ -502,6 +503,7 @@ ORDER BY UPPER(NVRE) AND P.name_id = PN.id AND P.evr_id = PE.id AND PA.id = P.package_arch_id + ) x ORDER BY UPPER(NVREA) </query> <elaborator name="package_details" /> commit add2a44a2493b877b1a2f869a0d958c706def207 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 7 11:14:59 2010 +0200 Use the global function evr_t_as_vre_simple in package_ids_in_set instead of method .as_vre_simple; this works on PostgreSQL as well. Addressing org.postgresql.util.PSQLException: ERROR: cross-database references are not implemented: pe.evr.as_vre_simple at org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:1525) at org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:1309) at org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:188) at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:452) at org.postgresql.jdbc2.AbstractJdbc2Statement.executeWithFlags(AbstractJdbc2Statement.java:354) at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:347) at com.mchange.v2.c3p0.impl.NewProxyPreparedStatement.execute(NewProxyPreparedStatement.java:651) at com.redhat.rhn.common.db.NamedPreparedStatement.execute(NamedPreparedStatement.java:139) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:454) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:431) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:335) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:340) at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:280) at com.redhat.rhn.common.db.datasource.SelectMode.execute(SelectMode.java:105) at com.redhat.rhn.manager.rhnpackage.PackageManager.packageIdsInSet(PackageManager.java:507) at com.redhat.rhn.frontend.action.rhnpackage.CustomPackagesDeleteConfirmAction.execute(CustomPackagesDeleteConfirmAction.java:66) 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 b77a9f3..5342302 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 @@ -490,7 +490,7 @@ ORDER BY UPPER(NVRE) <mode name="package_ids_in_set" class="com.redhat.rhn.frontend.dto.PackageOverview"> <query params="set_label, user_id"> - SELECT P.id AS ID, PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label AS NVREA + SELECT P.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS NVREA FROM rhnPackage P, rhnPackageName PN, rhnPackageEVR PE,

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2010