backend/satellite_tools/satCerts.py |
25 +-
backend/satellite_tools/satsync.py |
20 +-
backend/satellite_tools/test/test-store_rhnCryptoKey.py |
1
backend/server/action/packages.py |
5
backend/server/action_extra_data/script.py |
7
backend/server/apacheHandler.py |
1
backend/server/handlers/app/channel.py |
30 +--
backend/server/handlers/app/test/test_channel.py |
24 +-
backend/server/handlers/xmlrpc/queue.py |
10 -
backend/server/handlers/xmlrpc/registration.py |
7
backend/server/importlib/test/test_backendOracle.py |
2
backend/server/rhnAction.py |
15 -
backend/server/rhnDependency.py |
10 -
backend/server/rhnMapping.py |
3
backend/server/rhnSQL/sql_row.py |
3
backend/server/rhnSQL/sql_table.py |
9 -
backend/server/rhnServer/server_hardware.py |
8
backend/server/rhnServer/server_kickstart.py |
40 +---
backend/server/rhnServer/server_lib.py |
13 -
backend/server/rhnServer/server_solarispatches.py |
8
backend/server/rhnServer/server_token.py |
24 +-
backend/server/rhnUser.py |
16 -
backend/server/test/TestServer.py |
4
backend/server/test/misc_functions.py |
4
backend/server/test/test-cx_Oracle-memleak.py |
1
backend/server/test/test_dcoracle2.py |
2
backend/server/test/test_leak.py |
2
backend/server/test/test_leak2.py |
2
backend/server/test/test_leak3.py |
2
backend/server/test/test_leak4.py |
1
backend/server/test/unit-test/cx_create_table.py |
1
backend/server/test/unit-test/misc_functions.py |
6
backend/server/test/unit-test/rhnSQL/test_1.py |
10 -
backend/server/test/unit-test/rhnSQL/test_executemany.py |
5
backend/server/test/unit-test/rhnSQL/test_lob.py |
9 -
backend/server/test/unit-test/test_rhnServerGroup.py |
1
backend/test/suites/dbtests.py |
28 +--
backend/test/suites/rhnsqltests.py |
12 -
documentation/db-schema/spacewalk-0.1/sql_sources/view/rhnhistoryview.sql |
2
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml |
17 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml |
79 ---------
java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml |
21 --
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml |
86 +---------
java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml |
12 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml |
31 ---
java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml |
10 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml |
19 --
java/code/src/com/redhat/rhn/common/db/datasource/xml/database_queries.xml |
1
java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_elaborators.xml |
4
java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_setbuilder.xml |
3
java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_elaborators.xml |
3
java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_setbuilder.xml |
6
java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml |
5
java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml |
10 -
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml |
27 +--
java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml |
7
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml |
2
java/code/src/com/redhat/rhn/domain/kickstart/KickstartGuestInstallLog.hbm.xml |
2
java/code/src/com/redhat/rhn/domain/org/OrgImpl.hbm.xml |
12 -
java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupImpl.hbm.xml |
2
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml |
1
java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml |
8
java/code/src/com/redhat/rhn/domain/rhnpackage/profile/Profile.hbm.xml |
2
java/code/src/com/redhat/rhn/domain/server/ServerGroup.hbm.xml |
23 --
java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.hbm.xml |
2
java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml |
8
java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.hbm.xml |
1
java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml |
3
java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml |
5
java/scripts/java-map-hibernate-table.pl |
3
monitoring/NOCpulsePlugins/Oracle/BlockingSessions.pm |
2
monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm |
2
monitoring/NPalert/NotificationDB.pm |
59 +++---
monitoring/NPalert/test/TestAlertDB.pm |
2
monitoring/PerlModules/CPAN/DBD-Pg-0.95/Pg.pm |
9 -
monitoring/PerlModules/CPAN/DBD-Pg-0.95/test.pl |
16 -
monitoring/PerlModules/NP/NOT-USED/ReleaseDB/ReleaseDB.pm |
26 +--
monitoring/PerlModules/NP/NOT-USED/ReleaseDB/test/TestRelease.pm |
2
monitoring/PerlModules/NP/NOT-USED/TroubleTicket/TroubleTicket.pm |
1
monitoring/PerlModules/NP/OracleDB/CF_DB.pm |
16 -
monitoring/PerlModules/NP/OracleDB/OracleDB.pm |
3
monitoring/PerlModules/NP/Probe/DataSource/test/TestOracle.pm |
8
monitoring/PerlModules/NP/Probe/DataSource/test/TestSQLServer.pm |
4
monitoring/PerlModules/NP/Probe/Utils/gencmdsql.pl |
1
monitoring/SputLite/html/cgi-bin/create_commands.cgi |
1
monitoring/nocpulse-db-perl/Database.pm |
8
monitoring/status_log_acceptor/AcceptStatusLog.pm |
8
scripts/ncsu-rhntools/rhnstats/rhndb.py |
21 +-
scripts/ncsu-rhntools/rhnstats/schema.py |
1
spacewalk/setup/bin/spacewalk-setup |
6
spacewalk/setup/lib/Spacewalk/Setup.pm |
15 -
web/modules/dobby/Dobby/DB.pm |
3
web/modules/dobby/Dobby/Reporting.pm |
6
web/modules/pxt/PXT/Utils.pm |
4
web/modules/rhn/RHN/DB/Action.pm |
20 +-
web/modules/rhn/RHN/DB/AppInstall/Session.pm |
11 -
web/modules/rhn/RHN/DB/ConfigChannel.pm |
15 -
web/modules/rhn/RHN/DB/ConfigRevision.pm |
13 -
web/modules/rhn/RHN/DB/ContactMethod.pm |
8
web/modules/rhn/RHN/DB/CustomInfoKey.pm |
6
web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml |
13 -
web/modules/rhn/RHN/DB/DataSource/xml/ConfigChannel_queries.xml |
13 -
web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml |
10 -
web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml |
3
web/modules/rhn/RHN/DB/DataSource/xml/errata_search_setbuilder.xml |
3
web/modules/rhn/RHN/DB/DataSource/xml/package_search_setbuilder.xml |
6
web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml |
21 --
web/modules/rhn/RHN/DB/DataSource/xml/profile_queries.xml |
5
web/modules/rhn/RHN/DB/DataSource/xml/scout_queries.xml |
7
web/modules/rhn/RHN/DB/EmailAddress.pm |
12 -
web/modules/rhn/RHN/DB/Feedback.pm |
26 +--
web/modules/rhn/RHN/DB/Grail.pm |
6
web/modules/rhn/RHN/DB/Inspector.pm |
4
web/modules/rhn/RHN/DB/KSTree.pm |
16 -
web/modules/rhn/RHN/DB/MonitoringConfigMacro.pm |
6
web/modules/rhn/RHN/DB/Product.pm |
3
web/modules/rhn/RHN/DB/Profile.pm |
21 --
web/modules/rhn/RHN/DB/SatCluster.pm |
4
web/modules/rhn/RHN/DB/SatInstall.pm |
23 +-
web/modules/rhn/RHN/DB/ServerActions.pm |
3
web/modules/rhn/RHN/DB/ServerGroup.pm |
29 ---
web/modules/rhn/RHN/DB/Set.pm |
31 +--
web/modules/rhn/RHN/DB/TinyURL.pm |
3
web/modules/rhn/RHN/DB/UserActions.pm |
6
124 files changed, 383 insertions(+), 976 deletions(-)
New commits:
commit f7146a0a668568f84b426c75bdbddf3ca1efc5cc
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Mar 31 15:36:37 2009 -0300
Remove straggling tagged queries.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index 215f173..09e32d8 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -87,7 +87,6 @@ ORDER BY E.update_date DESC, E.id
<mode name="relevant_to_system_by_types"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="user_id, sid">
-<!-- PGPORT_0: UNTAGGED -->
SELECT DISTINCT E.id, E.update_date,
E.synopsis AS ADVISORY_SYNOPSIS,
E.advisory_name AS ADVISORY_NAME,
@@ -109,7 +108,6 @@ ORDER BY E.update_date DESC, E.id
<query name="relevant_elab" params="sid" >
-<!-- PGPORT_0: UNTAGGED -->
SELECT DISTINCT AEU.errata_id AS id,
AST.name AS status,
SA.action_id
@@ -337,7 +335,6 @@ ORDER BY update_date DESC
<mode name="relevant_to_channel_by_type">
<query params="cid, type">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT
E.advisory_name AS advisory,
TO_CHAR(E.issue_date, 'YYYY-MM-DD HH24:MI:SS') AS issue_date,
commit 74b842d607d52f65b1569bf6fdf929becffe514d
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Mar 31 15:35:31 2009 -0300
Revert "PGPORT 3rd set tagged queries"
This reverts commit e8a2c0466e2809583445005f9584b2b787641324.
Conflicts:
backend/server/action/packages.py
backend/server/rhnServer/server_kickstart.py
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 18e5043..e7dff9e 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -828,8 +828,8 @@ Please contact your RHN representative""" %
(generation, sat_cert.generation))
h.close()
self._diff_packages()
-#PGPORT_2:AS KEYWORD
- _query_compare_packages = rhnSQL.Statement("""
+
+ _query_compare_packages = """
select p.id, p.md5sum, p.path, p.package_size,
TO_CHAR(p.last_modified, 'YYYYMMDDHH24MISS') last_modified
from rhnPackage p
@@ -838,13 +838,18 @@ Please contact your RHN representative""" %
(generation, sat_cert.generation))
and p.package_arch_id = lookup_package_arch(:arch)
and (p.org_id = :org_id or
(p.org_id is null and :org_id is null))
- """)
+ and p.md5sum =: md5sum
+ """
# XXX the "is null" condition will have to change in multiorg satellites
def _diff_packages(self):
package_collection = sync_handlers.ShortPackageCollection()
+ nvrea_keys = ['name', 'epoch', 'version', \
+ 'release', 'arch', 'md5sum']
h = rhnSQL.prepare(self._query_compare_packages)
+
missing_channel_packages = {}
missing_fs_packages = {}
+
for channel_label, upids in self._uq_channel_packages.items():
log(1, "Diffing package metadata (what's missing locally?): %s"
%
channel_label)
@@ -866,7 +871,7 @@ Please contact your RHN representative""" %
(generation, sat_cert.generation))
package = package_collection.get_package(pid, p_timestamp)
assert package is not None
nevra = {}
- for t in ['name', 'epoch', 'version',
'release', 'arch']:
+ for t in nvrea_keys:
nevra[t] = package[t] or ""
if OPTIONS.orgid is not None:
@@ -1233,7 +1238,7 @@ Please contact your RHN representative""" %
(generation, sat_cert.generation))
continue
uq_kickstarts[kt] = None
uq_cks.append(kt)
-#PGPORT_2:AS KEYWORD
+
_query_get_kickstarts = rhnSQL.Statement("""
select TO_CHAR(last_modified, 'YYYYMMDDHH24MISS') last_modified
from rhnKickstartableTree
@@ -1462,7 +1467,7 @@ Please contact your RHN representative""" %
(generation, sat_cert.generation))
mp.append(eid)
return missing_errata
-#PGPORT_2:AS KEYWORD
+
_query_get_db_errata = rhnSQL.Statement("""
select e.id, e.advisory_name,
TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified
@@ -1942,7 +1947,6 @@ def _provisioningCapableYN():
"""
try:
-#PGPORT_1:No Change
h = rhnSQL.prepare("""\
SELECT 1
FROM web_contact WC,
@@ -2271,7 +2275,7 @@ def processCommandline():
if actionDict['no-rpms']:
actionDict['rpms'] = 0
-
+
#if actionDict['no-srpms']:
# actionDict['srpms'] = 0
diff --git a/backend/satellite_tools/test/test-store_rhnCryptoKey.py
b/backend/satellite_tools/test/test-store_rhnCryptoKey.py
index 778eaee..c0a48e1 100644
--- a/backend/satellite_tools/test/test-store_rhnCryptoKey.py
+++ b/backend/satellite_tools/test/test-store_rhnCryptoKey.py
@@ -45,7 +45,6 @@ def deleteCertRow():
if row:
rhn_cryptokey_id = int(row['id'])
print 'found a cert, nuking it! id:', rhn_cryptokey_id
-# PGPORT_1:NO Change
h = rhnSQL.prepare('delete rhnCryptoKey where id=:rhn_cryptokey_id')
h.execute(rhn_cryptokey_id=rhn_cryptokey_id)
rhnSQL.commit()
diff --git a/backend/server/action/packages.py b/backend/server/action/packages.py
index 743f110..1d872cc 100644
--- a/backend/server/action/packages.py
+++ b/backend/server/action/packages.py
@@ -28,7 +28,7 @@ __rhnexport__ = ['update',
'refresh_list',
'runTransaction',
'verify']
-# PGPORT_2:AS KEYWORD
+
_query_action_verify_packages = rhnSQL.Statement("""
select distinct
pn.name name,
@@ -129,7 +129,6 @@ def runTransaction(server_id, action_id):
log_debug(3, server_id, action_id)
# Fetch package_delta_id
-# PGPORT_1:NO Change
h = rhnSQL.prepare("""
select package_delta_id
from rhnActionPackageDelta
@@ -144,7 +143,6 @@ def runTransaction(server_id, action_id):
package_delta_id = row['package_delta_id']
# Fetch packages
-# PGPORT_2:AS KEYWORD
h = rhnSQL.prepare("""
select tro.label operation, pn.name, pe.version, pe.release, pe.epoch,
pa.label package_arch
@@ -196,7 +194,6 @@ def runTransaction(server_id, action_id):
return { 'packages' : result }
# SQL statements -- used by update()
-# PGPORT_2:AS KEYWORD
_packageStatement_update = """
select distinct
pn.name name,
diff --git a/backend/server/apacheHandler.py b/backend/server/apacheHandler.py
index 8286d3d..ae15436 100644
--- a/backend/server/apacheHandler.py
+++ b/backend/server/apacheHandler.py
@@ -143,7 +143,6 @@ class apacheHandler(apacheSession):
# code gets executed, as the rhnFault error messages use the
# templates
# If send_message_to_all, we don't have DB connectivity though
-# PGPORT_1:NO Change
h = rhnSQL.prepare("select label, value from rhnTemplateString")
h.execute()
diff --git a/backend/server/handlers/xmlrpc/queue.py
b/backend/server/handlers/xmlrpc/queue.py
index 28992d9..f14b772 100644
--- a/backend/server/handlers/xmlrpc/queue.py
+++ b/backend/server/handlers/xmlrpc/queue.py
@@ -159,7 +159,6 @@ class Queue(rhnHandler):
return f_action_ids
def _invalidate_failed_prereq_actions(self):
-# PGPORT_2:AS KEYWORD
h = rhnSQL.prepare("""
select sa.action_id, a.prerequisite
from rhnServerAction sa, rhnAction a
@@ -185,7 +184,7 @@ class Queue(rhnHandler):
action_id, prereq_action_id = row['action_id'],
row['prerequisite']
self._invalidate_child_actions(action_id)
-# PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE), AS keyword
+
_query_queue_get = rhnSQL.Statement("""
select sa.action_id id, a.version,
sa.remaining_tries, at.label method,
@@ -305,7 +304,6 @@ class Queue(rhnHandler):
break
else: # all fine
# Update the status of the action
-# PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
h = rhnSQL.prepare("""
update rhnServerAction
set status = 1,
@@ -360,8 +358,7 @@ class Queue(rhnHandler):
log_debug(1, self.server_id, action_id, result)
# check that the action is valid
# We have a uniqueness constraint on (action_id, server_id)
-# PGPORT_2:AS KEYWORD
- h = rhnSQL.prepare("""
+ h = rhnSQL.prepare("""
select at.label action_type,
at.trigger_snapshot,
at.name
@@ -480,7 +477,6 @@ class Queue(rhnHandler):
# Authenticate the system certificate
self.auth_system(system_id)
log_debug(1, self.server_id)
-# PGPORT_2:AS KEYWORD
h = rhnSQL.prepare("""
select
count(action_id) id
@@ -514,7 +510,6 @@ class Queue(rhnHandler):
# get the names of the packages associated with each errata and
# look them up in channels subscribed to by the server and select
# the latest version
-# PGPORT_2:AS KEYWORD
sql = """
select
pn.name name,
@@ -575,7 +570,6 @@ class Queue(rhnHandler):
# - the latest packages (no EVR specified)
# XXX Should we want to schedule the install for a specific version,
# we'll have to modify this
-# PGPORT_2:AS KEYWORD
statement = """
select distinct
pkglist.name name,
diff --git a/backend/server/handlers/xmlrpc/registration.py
b/backend/server/handlers/xmlrpc/registration.py
index 514d710..8e7ca91 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -36,8 +36,6 @@ from server.rhnSQL import procedure
from server.action.utils import ChannelPackage
-
-
# verify that a hash has all the keys and those have actual values
def hash_validate(data, *keylist):
for k in keylist:
@@ -76,7 +74,6 @@ def ValidNumber(reg_num):
reg_num = RegistrationNumber(reg_num)
if not reg_num:
return -1
-# PGPORT_1:NO Change
h = rhnSQL.prepare("""
select registered_flag flag from web_product_valid_numbers
where reg_number = :regnum
@@ -535,8 +532,6 @@ class Registration(rhnHandler):
# Return the server certificate file down to the client.
return system_certificate
-
-
# Registers a new system to an org specified by a username, password, and
# optionally an org id.
@@ -617,7 +612,6 @@ class Registration(rhnHandler):
failures = []
unknowns = []
-
# Build our return values.
attempted_channels = []
successful_channels = []
@@ -675,7 +669,6 @@ class Registration(rhnHandler):
'universal_activation_key' : universal_activation_key
}
-
# Registers a new system to an org specified by an activation key.
#
diff --git a/backend/server/importlib/test/test_backendOracle.py
b/backend/server/importlib/test/test_backendOracle.py
index b86f936..1ca87b4 100644
--- a/backend/server/importlib/test/test_backendOracle.py
+++ b/backend/server/importlib/test/test_backendOracle.py
@@ -18,7 +18,7 @@ utabs = {}
for k,v in tabs.iteritems():
utabs[k.upper()] = v
-#PGPORT_1:NO Change
+
rhnSQL.initDB(DB)
h = rhnSQL.prepare("""select table_name, column_name, data_type,
data_length
from user_tab_columns""")
diff --git a/backend/server/rhnServer/server_kickstart.py
b/backend/server/rhnServer/server_kickstart.py
index fcbef18..807e561 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -48,8 +48,7 @@ def update_kickstart_session(server_id, action_id, action_status,
server_id)
return ks_session_id
-# PGPORT_1:NO Change #
- _query_update_ks_session_table = rhnSQL.Statement("""
+_query_update_ks_session_table = rhnSQL.Statement("""
update rhnKickstartSession
set action_id = :action_id,
state_id = :ks_status_id,
@@ -69,12 +68,11 @@ def update_ks_session_table(ks_session_id, ks_status, next_action_id,
if ks_status == 'complete':
delete_guests(server_id)
-# PGPORT_1:NO Change #
+
_query_lookup_guests_for_host = rhnSQL.Statement("""
select virtual_system_id from rhnVirtualInstance
where host_system_id = :server_id
""")
-# PGPORT_1:NO Change #
_query_delete_virtual_instances = rhnSQL.Statement("""
delete from rhnVirtualInstance where host_system_id = :server_id
""")
@@ -115,7 +113,7 @@ def delete_guests(server_id):
rhnSQL.rollback()
- # PGPORT_1:NO Change #
+
_query_get_next_action_id = rhnSQL.Statement("""
select a.id
from rhnAction a, rhnActionType at
@@ -133,7 +131,7 @@ def get_next_action_id(action_id, next_action_type = None):
if not row:
return None
return row['id']
- # PGPORT_1:NO Change #
+
_query_lookup_kickstart_session_id = rhnSQL.Statement("""
select ks.id
from rhnKickstartSession ks
@@ -154,7 +152,7 @@ def get_kickstart_session_id(server_id, action_id):
# Nothing to do
return None
return row['id']
- # PGPORT_1:NO Change #
+
_query_lookup_kickstart_label = rhnSQL.Statement("""
select k.label
from rhnKickstartSession ks, rhnKSData k
@@ -178,17 +176,15 @@ def get_kickstart_label(server_id, action_id):
return row['label']
- # PGPORT_1:NO Change #
+
_query_insert_package_delta = rhnSQL.Statement("""
insert into rhnPackageDelta (id, label)
values (:package_delta_id, 'ks-delta-' || :package_delta_id)
""")
- # PGPORT_1:NO Change #
_query_insert_action_package_delta = rhnSQL.Statement("""
insert into rhnActionPackageDelta (action_id, package_delta_id)
values (:action_id, :package_delta_id)
""")
- # PGPORT_1:NO Change #
_query_insert_package_delta_element = rhnSQL.Statement("""
insert into rhnPackageDeltaElement
(package_delta_id, transaction_package_id)
@@ -245,7 +241,6 @@ def schedule_kickstart_sync(server_id, kickstart_session_id):
return action_id
def _get_ks_virt_type(type_id):
- # PGPORT_1:NO Change #
_query_kickstart_virt_type = rhnSQL.Statement("""
select kvt.label label
from rhnKickstartVirtualizationType kvt
@@ -329,7 +324,7 @@ def schedule_virt_pkg_install(server_id, kickstart_session_id):
action_id = None
return action_id
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL),AS KEYWORD, #
+
_query_schedule_config_files = rhnSQL.Statement("""
insert into rhnActionConfigRevision
(id, action_id, server_id, config_revision_id)
@@ -433,14 +428,13 @@ def schedule_rhncfg_install(server_id, action_id, scheduler,
new_action_id = schedule_package_install(server_id, action_id, scheduler,
packages_to_install)
return new_action_id
- # PGPORT_3:ORAFCE(NVL2),AS KEYWORD #
+
_query_lookup_subscribed_server_channels = rhnSQL.Statement("""
select sc.channel_id, NVL2(c.parent_channel, 0, 1) is_base_channel
from rhnServerChannel sc, rhnChannel c
where sc.server_id = :server_id
and sc.channel_id = c.id
""")
- # PGPORT_1:NO Change #
_query_lookup_unsubscribed_server_channels = rhnSQL.Statement("""
select c.id
from
@@ -518,7 +512,7 @@ def _subscribe_server_to_capable_channels(server_id, scheduler,
capability):
# No channels provide this capability - we're done
log_debug(4, "No channels to provide capability", capability)
return None
- # PGPORT_1:NO Change #
+
_query_channel_provides_capability = rhnSQL.Statement("""
select distinct pp.package_id, pn.name, pe.version, pe.release, pe.epoch
from rhnChannelNewestPackage cnp,
@@ -542,7 +536,7 @@ def _channel_provides_capability(channel_id, capability):
if not ret:
return ret
return ret
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
_query_insert_action_packages = rhnSQL.Statement("""
insert into rhnActionPackage
(id, action_id, name_id, evr_id, package_arch_id, parameter)
@@ -594,7 +588,7 @@ def _packages_from_cursor(cursor):
result.append((p_name, row['version'], row['release'],
row['epoch'] or ''))
return result
- # PGPORT_1:NO Change #
+
_query_lookup_pending_kickstart_sessions = rhnSQL.Statement("""
select ks.id, ks.action_id, NULL other_server_id
from rhnKickstartSessionState kss,
@@ -607,7 +601,7 @@ _query_lookup_pending_kickstart_sessions =
rhnSQL.Statement("""
and kss.label not in ('complete', 'failed')
and (:ks_session_id is null or ks.id != :ks_session_id)
""")
- # PGPORT_1:NO Change #
+
_query_terminate_pending_kickstart_sessions = rhnSQL.Statement("""
update rhnKickstartSession
set action_id = NULL,
@@ -669,7 +663,6 @@ def terminate_kickstart_sessions(server_id):
# Fetches the package profile from the kickstart session
- # PGPORT_1:NO Change #
def get_kisckstart_session_package_profile(kickstart_session_id):
h = rhnSQL.prepare("""
select pn.name, pe.version, pe.release, pe.epoch, pa.label
@@ -682,13 +675,13 @@ def get_kisckstart_session_package_profile(kickstart_session_id):
and ks.server_profile_id = spp.server_profile_id
and spp.name_id = pn.id
and spp.evr_id = pe.id
+ and spp.package_arch_id = pa.id
""")
h.execute(kickstart_session_id=kickstart_session_id)
return _packages_from_cursor(h)
def get_server_package_profile(server_id):
# XXX misa 2005-05-25 May need to look at package arches too
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""
select pn.name, pe.version, pe.release, pe.epoch, pa.label
from rhnServerPackage sp,
@@ -698,10 +691,11 @@ def get_server_package_profile(server_id):
where sp.server_id = :server_id
and sp.name_id = pn.id
and sp.evr_id = pe.id
+ and sp.package_arch_id = pa.id
""")
h.execute(server_id=server_id)
return _packages_from_cursor(h)
- # PGPORT_1:NO Change #
+
_query_get_kickstart_session_info = rhnSQL.Statement("""
select org_id, scheduler, deploy_configs, virtualization_type
from rhnKickstartSession
@@ -717,7 +711,7 @@ def get_kickstart_session_info(kickstart_session_id, server_id):
"for server %s" % (kickstart_session_id, server_id))
return row
- # PGPORT_1:NO Change #
+
_query_lookup_ks_server_profile = rhnSQL.Statement("""
select kss.server_profile_id
from rhnServerProfileType spt,
@@ -728,7 +722,6 @@ _query_lookup_ks_server_profile = rhnSQL.Statement("""
and sp.profile_type_id = spt.id
and spt.label = :profile_type_label
""")
- # PGPORT_1:NO Change #
_query_delete_server_profile = rhnSQL.Statement("""
delete from rhnServerProfile where id = :server_profile_id
""")
@@ -758,3 +751,4 @@ def cleanup_profile(server_id, action_id, ks_session_id,
action_status):
# rhnServerProfilePacakge.server_profile_id
h = rhnSQL.prepare(_query_delete_server_profile)
h.execute(server_profile_id=server_profile_id)
+
diff --git a/backend/server/rhnServer/server_token.py
b/backend/server/rhnServer/server_token.py
index 894bea6..3558121 100644
--- a/backend/server/rhnServer/server_token.py
+++ b/backend/server/rhnServer/server_token.py
@@ -43,7 +43,6 @@ def token_channels(server, server_arch, tokens_obj):
# what channels are associated with this token (filter only those
# compatible with this server)
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""
select
rtc.channel_id id, c.name, c.label, c.parent_channel
@@ -153,7 +152,7 @@ def token_channels(server, server_arch, tokens_obj):
else:
ret.append("Subscribed to channel '%s'" %
c["name"])
return ret
- # PGPORT_1:NO Change #
+
_query_token_server_groups = rhnSQL.Statement("""
select rtg.server_group_id, sg.name
from rhnRegTokenGroups rtg, rhnServerGroup sg
@@ -192,7 +191,7 @@ def token_server_groups(server_id, tokens_obj):
ret.append("Subscribed to server group '%s'" %
sg["name"])
return ret
- # PGPORT_4:QUERY_REWRITE(ANSI JOIN),REMOVE UPPER FROM ORDER BY CLAUSE #
+
_query_token_packages = rhnSQL.Statement("""
select pn.id as name_id, pa.id as arch_id, pn.name
from rhnPackageName pn, rhnPackageArch pa, rhnRegTokenPackages rtp
@@ -251,7 +250,6 @@ def token_packages(server_id, tokens_obj):
# id=1, '/etc/foo.txt', priority=1
# id=27, '/etc/foo.txt', priority=2
# id=53, '/var/tmp/baz.log', priority=2
- # PGPORT_2:AS KEYWORD #
_query_token_latest_revisions = rhnSQL.Statement("""
select cf.latest_config_revision_id revision_id,
cfn.path
@@ -271,7 +269,7 @@ _query_token_latest_revisions = rhnSQL.Statement("""
and cf.latest_config_revision_id is not null
order by cfn.path, cct.priority, scc.position
""")
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
_query_add_revision_to_action = rhnSQL.Statement("""
insert into rhnActionConfigRevision (id, action_id, server_id, config_revision_id)
values (sequence_nextval('rhn_actioncr_id_seq'), :action_id, :server_id,
:config_revision_id)
@@ -326,7 +324,7 @@ def deploy_configs_if_needed(server):
return action_id
- # PGPORT_1:NO Change #
+
_query_token_config_channels = rhnSQL.Statement("""
select rtcc.config_channel_id,
rtcc.position, cc.name
@@ -338,7 +336,6 @@ _query_token_config_channels = rhnSQL.Statement("""
""")
# XXX Same query exists in config/rhn_config_management.py
- # PGPORT_1:NO Change #
_query_set_server_config_channels = rhnSQL.Statement("""
insert into rhnServerConfigChannel (server_id, config_channel_id, position)
values (:server_id, :config_channel_id, :position)
@@ -349,7 +346,7 @@ def _get_token_config_channels(token_id):
h.execute(token_id=token_id)
return h.fetchall_dict() or []
- # PGPORT_1:NO Change #
+
_query_current_config_channels = rhnSQL.Statement("""
select server_id, config_channel_id
from rhnServerConfigChannel
@@ -435,7 +432,7 @@ def token_config_channels(server, tokens_obj):
return ret
- # PGPORT_1:NO Change #
+
_query_server_token_used = rhnSQL.Statement("""
insert into rhnServerTokenRegs (server_id, token_id)
values (:server_id, :token_id)
@@ -446,7 +443,7 @@ def server_used_token(server_id, token_id):
h.execute(server_id=server_id, token_id=token_id)
- # PGPORT_2:AS KEYWORD #
+
_query_check_token_limits = rhnSQL.Statement("""
select
rt.usage_limit max_nr,
@@ -763,7 +760,7 @@ def _validate_entitlements(token_string, rereg_ents,
base_entitlements,
# NOTE: the call to entitle will actually skip the virtualization
# entitlement, so we can leave it in the list here.
- # PGPORT_2:AS KEYWORD #
+
_query_token = rhnSQL.Statement("""
select rt.id as token_id,
sgt.label as token_type,
@@ -814,7 +811,7 @@ def fetch_token(token_string):
if not token_entry:
# Unable to find the token
log_error("Invalid token '%s'" % token)
- raise rhnFault(60, _("Could not find token '%s'") % token)
+ raise rhnFault(60, _("Could not find token '%s'") % token,
explain=0)
row = token_entry
@@ -910,7 +907,6 @@ def fetch_token(token_string):
return apply(ActivationTokens, (result, ), kwargs)
# always be sure this query has matching columns as _query_token above...
-# PGPORT_2:AS KEYWORD #
_query_org_default_token = rhnSQL.Statement("""
select rt.id as token_id,
sgt.label as token_type,
@@ -964,7 +960,7 @@ def fetch_org_token(org_id):
- # PGPORT_1:NO Change #
+
_query_disable_token = rhnSQL.Statement("""
update rhnRegToken
set disabled = 1
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index 5fe1dc4..43c459d 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -92,7 +92,7 @@ class User:
# I'll assume it's not something to happen very frequently,
# so I'll use a query for now
# - misa
- # PGPORT_1:NO Change #
+ #
h = rhnSQL.prepare("""
select ui.use_pam_authentication
from web_contact w, rhnUserInfo ui
@@ -223,7 +223,6 @@ class User:
is_admin = 0
if self.customer.real:
# get the org_id and the applicant group id for this org
- # PGPORT_1:NO Change #
org_id = self.customer["id"]
h = rhnSQL.prepare("""
select ug.id
@@ -282,7 +281,6 @@ class User:
self.contact["password"] = crypt_pwd
self.contact.create(userid)
# rhnUserInfo
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("insert into rhnUserInfo (user_id) "
"values (:user_id)")
h.execute(user_id=userid)
@@ -315,7 +313,7 @@ class User:
def get_roles(self):
user_id = self.getid()
- # PGPORT_2:AS KEYWORD #
+
h = rhnSQL.prepare("""
select ugt.label role
from rhnUserGroup ug,
@@ -410,7 +408,6 @@ def session_reload(session_string):
return u
# search for an userid
- # PGPORT_1:NO Change #
def get_user_id(username):
username = str(username)
h = rhnSQL.prepare("""
@@ -455,7 +452,6 @@ def is_user_disabled(user):
return 0
# create a reservation record
- # PGPORT_1:NO Change #
def reserve_user(username, password):
return __reserve_user_db(username, password)
@@ -489,7 +485,6 @@ def __reserve_user_db(user, password):
raise rhnFault(2001)
# now check the reserved table
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""
select r.login, r.password from rhnUserReserved r
where r.login_uc = upper(:p1)
@@ -509,7 +504,6 @@ def __reserve_user_db(user, password):
# this is not reserved either, register it
if encrypted_password:
# Encrypt the password, let the function pick the salt
- # PGPORT_1:NO Change #
password = encrypt_password(password)
h = rhnSQL.prepare("""
@@ -531,7 +525,6 @@ def __new_user_db(username, password, email, org_id, org_password):
log_debug(3, username, email, encrypted_password)
# now search it in the database
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""
select w.id, w.password, w.old_password, ui.use_pam_authentication
from web_contact w, rhnUserInfo ui
@@ -545,7 +538,6 @@ def __new_user_db(username, password, email, org_id, org_password):
if not data:
# the username is not there, check the reserved user table
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""
select login, password, password old_password from rhnUserReserved
where login_uc = upper(:username)
@@ -606,7 +598,6 @@ def __new_user_db(username, password, email, org_id, org_password):
user.set_info("email", email)
# XXX This should go away eventually
- # PGPORT_1:NO Change #
if org_id and org_password: # check out this org
h = rhnSQL.prepare("""
select id, password from web_customer
@@ -637,7 +628,6 @@ def __new_user_db(username, password, email, org_id, org_password):
# check if we need to remove the reservation
if not data.has_key("id"):
# remove reservation
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""
delete from rhnUserReserved where login_uc = upper(:username)
""")
@@ -693,7 +683,7 @@ def check_email(email):
def check_unique_email(email):
return __check_unique_email_db(email)
- # PGPORT_1:NO Change #
+
def __check_unique_email_db(email):
h = rhnSQL.prepare("""
select 1
diff --git a/backend/server/test/TestServer.py b/backend/server/test/TestServer.py
index 7dde5c2..5c6c293 100644
--- a/backend/server/test/TestServer.py
+++ b/backend/server/test/TestServer.py
@@ -92,7 +92,6 @@ class TestServer:
self.channel = misc_functions.create_channel( self.label, self.label, org_id
= self.org_id )
#Associate the channel family with the organization and set the maximum
number of members it can have
- # PGPORT_1:NO Change #
_insert_channel_family = """
INSERT INTO rhnPrivateChannelFamily( channel_family_id, org_id, max_members
)
VALUES ( :channel_family_id, :org_id, :max_members )"""
@@ -101,7 +100,6 @@ class TestServer:
rhnSQL.commit()
#Associate the channel with the server
- # PGPORT_1:NO Change #
_insert_channel = "INSERT INTO rhnServerChannel( server_id, channel_id )
VALUES ( :server_id, :channel_id )"
insert = rhnSQL.prepare( _insert_channel )
insert.execute( server_id = self.testserver.getid(), channel_id =
self.channel.get_id() )
@@ -180,7 +178,7 @@ class TestServer:
def __setattr__(self, attr, value):
return setattr( TestServer.__instance, attr, value )
- # PGPORT_1:NO Change #
+
_query_action_lookup = rhnSQL.Statement("""
select *
from rhnServerAction
diff --git a/backend/server/test/test-cx_Oracle-memleak.py
b/backend/server/test/test-cx_Oracle-memleak.py
index ee1a96d..cc9a4e8 100644
--- a/backend/server/test/test-cx_Oracle-memleak.py
+++ b/backend/server/test/test-cx_Oracle-memleak.py
@@ -42,7 +42,6 @@ def _line_value(line):
dbh = cx_Oracle.Connection(sys.argv[1])
h = dbh.cursor()
- # PGPORT_3:ORAFCE #
h.execute('select 1 from dual')
for i in range(10000):
d = h.description
diff --git a/backend/server/test/test_dcoracle2.py
b/backend/server/test/test_dcoracle2.py
index c9d8d8b..7b8c1ea 100644
--- a/backend/server/test/test_dcoracle2.py
+++ b/backend/server/test/test_dcoracle2.py
@@ -24,7 +24,7 @@ rhnSQL.initDB(sys.argv[1])
ids = [1, 2, 3]
values = [11, 22, 33]
foo = ['', '', '']
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("insert into misatest (id, val) values (:id, :val)")
try:
h.executemany(id=ids, val=values, foo=foo)
diff --git a/backend/server/test/test_leak.py b/backend/server/test/test_leak.py
index 4de01e4..3749c8a 100644
--- a/backend/server/test/test_leak.py
+++ b/backend/server/test/test_leak.py
@@ -20,7 +20,7 @@ from server import rhnSQL
print os.getpid()
rhnSQL.initDB('rhnuser/rhnuser@webdev')
- # PGPORT_3:ORAFCE() #
+
h = rhnSQL.prepare("select 1 from dual")
start = time.time()
diff --git a/backend/server/test/test_leak2.py b/backend/server/test/test_leak2.py
index 300e410..7e8fe62 100644
--- a/backend/server/test/test_leak2.py
+++ b/backend/server/test/test_leak2.py
@@ -20,7 +20,7 @@ from DCOracle import Connect
print os.getpid()
dbh = Connect('rhnuser/rhnuser@webdev')
- # PGPORT_3:ORAFCE() #
+
h = dbh.prepare("select 1 from dual")
start = time.time()
diff --git a/backend/server/test/test_leak3.py b/backend/server/test/test_leak3.py
index 96dfc0f..d3d7a5c 100644
--- a/backend/server/test/test_leak3.py
+++ b/backend/server/test/test_leak3.py
@@ -19,7 +19,7 @@ from DCOracle2 import connect
print os.getpid()
dbh = connect('rhnuser/rhnuser@webdev')
- # PGPORT_3:ORAFCE() #
+
h = dbh.prepare("select 1 from dual")
start = time.time()
diff --git a/backend/server/test/unit-test/test_rhnServerGroup.py
b/backend/server/test/unit-test/test_rhnServerGroup.py
index b2d32e8..8e4575d 100644
--- a/backend/server/test/unit-test/test_rhnServerGroup.py
+++ b/backend/server/test/unit-test/test_rhnServerGroup.py
@@ -38,7 +38,6 @@ class Tests(unittest.TestCase):
def test_new_org_1(self):
org_id = misc_functions.create_new_org()
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("select id from web_customer where id = :id")
h.execute(id=org_id)
row = h.fetchone_dict()
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index f8092a2..215f173 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -2,7 +2,6 @@
<mode name="org_pkg_errata">
<query params="org_id, pid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.advisory_name AS advisory,
TO_CHAR(E.update_date, 'YYYY-MM-DD HH24:MI:SS') AS update_date,
TO_CHAR(E.issue_date, 'YYYY-MM-DD HH24:MI:SS') AS issue_date,
@@ -24,7 +23,6 @@ ORDER BY E.advisory_name
<mode name="relevant_errata"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="user_id">
-<!-- PGPORT_2: AS keyword required -->
SELECT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
FROM rhnErrata E,
(SELECT SNEC.errata_id, COUNT(SNEC.server_id) C
@@ -40,7 +38,6 @@ ORDER BY E.update_date DESC, E.id
<mode name="relevant_errata_by_type"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="user_id, type">
-<!-- PGPORT_2: AS keyword required -->
SELECT E.id, E.update_date
FROM rhnErrata E,
(SELECT SNEC.errata_id, COUNT(SNEC.server_id) C
@@ -58,28 +55,18 @@ ORDER BY E.update_date DESC, E.id
<mode name="all_errata"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="org_id">
-<!-- PGPORT_1:NO CHANGE -->
-
-
-SELECT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
+SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
FROM rhnErrata E, rhnChannelErrata CE, rhnAvailableChannels AC
WHERE AC.org_id = :org_id
AND CE.channel_id = AC.channel_id
AND CE.errata_id = E.id
- UNION
-SELECT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
- FROM rhnErrata E, rhnChannelErrata CE, rhnSharedChannelView SCV
- WHERE SCV.org_trust_id = :org_id
- AND CE.channel_id = SCV.id
- AND CE.errata_id = E.id
-ORDER BY 2 DESC, 1
+ ORDER BY E.update_date DESC, E.id
</query>
<elaborator name="errata_overview" />
</mode>
<mode name="relevant_to_system"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="user_id, sid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id, E.update_date,
E.synopsis AS ADVISORY_SYNOPSIS,
E.advisory_name AS ADVISORY_NAME,
@@ -144,7 +131,6 @@ ORDER BY E.update_date DESC, E.id
<mode name="relevant_to_system_by_type"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="user_id, sid, type">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id, E.update_date,
E.synopsis AS ADVISORY_SYNOPSIS,
E.advisory_name AS ADVISORY_NAME,
@@ -164,7 +150,6 @@ ORDER BY E.update_date DESC, E.id
<mode name="relevant_to_system_sorted_by_priority">
<query params="user_id, sid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.synopsis AS ERRATA_SYNOPSIS, E.advisory_type
FROM rhnErrata E,
rhnServerNeededPackageCache SNEC,
@@ -180,7 +165,6 @@ ORDER BY E.advisory_type DESC, E.update_date DESC, E.id
<mode name="count_critical_errata_for_system">
<query params="user_id, sid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT COUNT(DISTINCT E.ID) AS COUNT
FROM rhnErrata E,
rhnServerNeededCache SNEC,
@@ -196,7 +180,6 @@ SELECT COUNT(DISTINCT E.ID) AS COUNT
<mode name="count_noncritical_errata_for_system">
<query params="user_id, sid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT COUNT(DISTINCT E.ID) AS COUNT
FROM rhnErrata E,
rhnServerNeededCache SNEC,
@@ -212,7 +195,6 @@ SELECT COUNT(DISTINCT E.ID) AS COUNT
<mode name="unscheduled_relevant_to_system"
class="com.redhat.rhn.domain.errata.impl.PublishedErrata">
<query params="user_id, sid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id, E.update_date
FROM rhnErrata E,
rhnServerNeededPackageCache SNPC
@@ -231,7 +213,6 @@ SELECT DISTINCT E.id, E.update_date
ORDER BY E.update_date, E.id
</query>
<elaborator name="published_overview" params="">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.advisory, E.advisory_name, E.advisory_type, E.update_date,
E.synopsis
FROM rhnErrata E
WHERE E.id IN (%s)
@@ -241,7 +222,6 @@ ORDER BY E.update_date, E.id
<mode name="issued_between">
<query params="start_date_str, end_date_str">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT
E.id, E.issue_date
FROM rhnErrata E
@@ -252,9 +232,10 @@ ORDER BY E.issue_date DESC
</query>
</mode>
+
+
<mode name="in_channel_between"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="cid, start_date, end_date">
-
SELECT DISTINCT E.id
FROM rhnErrata E,
rhnChannelErrata CE
@@ -297,7 +278,6 @@ SELECT DISTINCT E.id,
<mode name="relevant_to_channel_between_deprecated">
<query params="cid, start_date_str, end_date_str">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id,
E.advisory_name AS advisory,
E.advisory_name AS advisory_name,
@@ -319,7 +299,6 @@ ORDER BY last_modified_date DESC
<mode name="relevant_to_channel_after_deprecated">
<query params="cid, start_date_str">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT
E.advisory_name AS advisory,
TO_CHAR(E.issue_date, 'YYYY-MM-DD HH24:MI:SS') AS issue_date,
@@ -338,7 +317,6 @@ ORDER BY last_modified_date DESC
<mode name="relevant_to_channel_deprecated">
<query params="cid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id as id,
E.advisory_name AS advisory_name,
E.advisory_name AS advisory,
@@ -379,7 +357,6 @@ ORDER BY last_modified_date DESC
<mode name="in_sources_for_target"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="custom_cid, user_id">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id , E.advisory_name AS advisory,
E.update_date AS UPDATE_DATE,
E.synopsis as ADVISORY_SYNOPSIS,
@@ -401,7 +378,6 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="errata_list_in_set"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="user_id, set" >
-<!-- PGPORT_1:NO CHANGE -->
Select DISTINCT E.id , E.advisory_name AS advisory,
E.update_date AS UPDATE_DATE,
E.synopsis as ADVISORY_SYNOPSIS,
@@ -417,7 +393,6 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="in_sources_for_target_package_assoc"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="custom_cid, user_id">
-<!-- PGPORT_1:NO CHANGE -->
Select DISTINCT Errata1.id , Errata1.advisory_name AS advisory,
Errata1.update_date AS UPDATE_DATE,
Errata1.synopsis as ADVISORY_SYNOPSIS,
@@ -454,7 +429,6 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="for_target"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="custom_cid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id , E.advisory_name AS advisory,
E.update_date AS UPDATE_DATE,
E.synopsis as ADVISORY_SYNOPSIS,
@@ -479,7 +453,6 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="for_target_package_assoc"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="custom_cid">
-<!-- PGPORT_1:NO CHANGE -->
Select DISTINCT Errata1.id , Errata1.advisory_name AS advisory,
Errata1.update_date AS UPDATE_DATE,
Errata1.synopsis as ADVISORY_SYNOPSIS,
@@ -511,7 +484,6 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="custom_for_target"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="custom_cid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id , E.advisory_name AS advisory,
E.update_date AS UPDATE_DATE,
E.synopsis as ADVISORY_SYNOPSIS,
@@ -534,7 +506,6 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="custom_for_target_package_assoc"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="custom_cid">
-<!-- PGPORT_1:NO CHANGE -->
Select DISTINCT Errata1.id , Errata1.advisory_name AS advisory,
Errata1.update_date AS UPDATE_DATE,
Errata1.synopsis as ADVISORY_SYNOPSIS,
@@ -563,7 +534,6 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="find_packages_for_errata_set"
class="com.redhat.rhn.frontend.dto.PackageOverview">
<query params="uid, set">
-<!-- PGPORT_2:AS KEYWORD -->
select distinct P.id, PN.name package_name, PA.label as package_arch,
EVR.version
|| '-' || EVR.release || (CASE WHEN EVR.epoch IS NULL THEN '' ELSE
':' || EVR.epoch END)
@@ -584,12 +554,11 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="find_packages_for_errata_set_with_assoc"
class="com.redhat.rhn.frontend.dto.PackageOverview">
<query params="custom_cid, uid, set">
-<!-- PGPORT_2:AS KEYWORD -->
select distinct P.id, PN.name package_name, PA.label as package_arch,
EVR.version
|| '-' || EVR.release || (CASE WHEN EVR.epoch IS NULL THEN '' ELSE
':' || EVR.epoch END)
package_nvre,
-P.summary
+ P.summary
from
rhnSet S inner join
rhnErrata E on S.element = E.id inner join
@@ -597,9 +566,9 @@ P.summary
rhnPackage P on P.id = EP.package_id inner join
rhnPackageArch PA on PA.id = P.package_arch_id inner join
rhnPackageEvr EVR on Evr.id = P.evr_id inner join
- rhnPackage P2 on P2.name_id = P.name_id inner join
- rhnChannelPackage CP on CP.package_id = P2.id
- inner join rhnPackageName PN on PN.id = P.name_id
+ rhnPackage P2 on P2.name_id = P.name_id inner join
+ rhnChannelPackage CP on CP.package_id = P2.id inner join
+ rhnPackageName PN on PN.id = P.name_id
where S.label = :set
and S.user_id = :uid
and CP.channel_id = :custom_cid
@@ -609,7 +578,6 @@ P.summary
<mode name="find_packages_for_errata_and_channel"
class="com.redhat.rhn.frontend.dto.PackageOverview">
<query params="custom_cid, eid, org_id">
-<!-- PGPORT_2:AS KEYWORD -->
select distinct P.id, PN.name package_name, PA.label as package_arch,
EVR.version
|| '-' || EVR.release || (CASE WHEN EVR.epoch IS NULL THEN '' ELSE
':' || EVR.epoch END)
@@ -632,9 +600,7 @@ P.summary
</query>
</mode>
-
<query name="in_set" params="user_id, set_label">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id, E.update_date
FROM rhnErrata E,
rhnSet ST
@@ -649,6 +615,7 @@ ORDER BY E.update_date, E.id
<elaborator name="errata_overview" />
</mode>
+
<mode name="in_set_details"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="user_id, set_label">
SELECT DISTINCT E.id,
@@ -669,7 +636,6 @@ ORDER BY E.update_date, E.id
<mode name="unpublished_in_set"
class="com.redhat.rhn.frontend.dto.OwnedErrata">
<query params="user_id, set_label">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id,
E.update_date,
E.advisory,
@@ -692,7 +658,6 @@ ORDER BY E.update_date, E.id
<mode name="published_in_set"
class="com.redhat.rhn.frontend.dto.OwnedErrata">
<query params="user_id, set_label">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id,
E.update_date,
E.advisory,
@@ -713,11 +678,8 @@ ORDER BY E.update_date, E.id
<elaborator name="errata_overview" />
</mode>
-
-
<mode name="published_owned_errata"
class="com.redhat.rhn.frontend.dto.OwnedErrata">
<query params="org_id">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.advisory, E.advisory_type, E.advisory_name, E.synopsis,
E.update_date,
E.created,
@@ -731,7 +693,6 @@ ORDER BY E.update_date DESC, E.id
<mode name="unpublished_owned_errata"
class="com.redhat.rhn.frontend.dto.OwnedErrata">
<query params="org_id">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.advisory, E.advisory_type, E.advisory_name, E.synopsis,
E.update_date,
E.created,
@@ -743,11 +704,8 @@ ORDER BY E.update_date DESC, E.id
</query>
</mode>
-
-
<mode name="clonable_errata_list_all"
class="com.redhat.rhn.frontend.dto.ClonableErrataDto">
<query params="org_id">
-<!-- PGPORT_3:ORAFCE(NVL) -->
SELECT distinct E.id, E.advisory, E.advisory_type, E.advisory_name,
E.synopsis, TO_CHAR(E.update_date, 'YYYY-MM-DD') AS update_date,
NVL(((SELECT 1
@@ -775,7 +733,6 @@ ORDER BY update_date DESC, E.id
<mode name="clonable_errata_list_uncloned"
class="com.redhat.rhn.frontend.dto.ClonableErrataDto">
<query params="org_id">
-<!-- PGPORT_3:ORAFCE(NVL) -->
SELECT distinct E.id, E.advisory, E.advisory_type, E.advisory_name,
E.synopsis, TO_CHAR(E.update_date, 'YYYY-MM-DD') AS update_date,
NVL(((SELECT 1
@@ -813,7 +770,6 @@ ORDER BY update_date DESC, E.id
<mode name="clonable_errata_for_channel_all"
class="com.redhat.rhn.frontend.dto.ClonableErrataDto">
<query params="channel_id, org_id">
-<!-- PGPORT_3:ORAFCE(NVL) -->
SELECT distinct E.id, E.advisory, E.advisory_type, E.advisory_name,
E.synopsis, TO_CHAR(E.update_date, 'YYYY-MM-DD') AS update_date,
NVL(((SELECT 1
@@ -842,7 +798,6 @@ ORDER BY update_date DESC, E.id
<mode name="clonable_errata_for_channel_uncloned"
class="com.redhat.rhn.frontend.dto.ClonableErrataDto">
<query params="channel_id, org_id">
-<!-- PGPORT_3:ORAFCE(NVL) -->
SELECT distinct E.id, E.advisory, E.advisory_type, E.advisory_name,
E.synopsis, TO_CHAR(E.update_date, 'YYYY-MM-DD') AS update_date,
NVL(((SELECT 1
@@ -879,10 +834,7 @@ ORDER BY update_date DESC, E.id
<elaborator name="related_channels_owned_by_org"/>
</mode>
-
-
<query name="related_channels_owned_by_org" multiple="t"
params="org_id">
-<!-- PGPORT_1:NO CHANGE -->
SELECT CE.errata_id AS ID, C.id as channel_id, C.name AS channel_name
FROM rhnChannelErrata CE,
rhnChannel C,
@@ -894,9 +846,7 @@ ORDER BY update_date DESC, E.id
ORDER BY CE.errata_id, C.name
</query>
-
<query name="errata_overview" params="user_id">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.advisory, E.advisory_name, E.advisory_type, E.update_date, E.synopsis as
advisory_synopsis,
(SELECT COUNT(DISTINCT S.id)
FROM rhnServerNeededErrataCache SNEC, rhnServer S, rhnUserServerPerms USP
@@ -914,7 +864,6 @@ ORDER BY E.update_date DESC
</query>
<query name="relevant_to_system_set_elab" params="user_id">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.advisory, E.advisory_name, E.advisory_type,
E.synopsis AS advisory_synopsis,
TO_CHAR(E.update_date, 'YYYY-MM-DD') AS advisory_last_updated,
@@ -940,47 +889,39 @@ ORDER BY E.update_date DESC
<write-mode name="deletePaidErrataTempCache">
<query params="errata_id">
-<!-- PGPORT_1:NO CHANGE -->
delete from rhnPaidErrataTempCache where errata_id = :errata_id
</query>
</write-mode>
<write-mode name="deleteErrataFile">
<query params="errata_id">
-<!-- PGPORT_1:NO CHANGE -->
delete from rhnErrataFile where errata_id = :errata_id
</query>
</write-mode>
<write-mode name="deleteErrataPackage">
<query params="errata_id">
-<!-- PGPORT_1:NO CHANGE -->
delete from rhnErrataPackage where errata_id = :errata_id
</query>
</write-mode>
<write-mode name="deleteErrataTmp">
<query params="errata_id">
-<!-- PGPORT_1:NO CHANGE -->
delete from rhnErrataTmp where id = :errata_id
</query>
</write-mode>
<write-mode name="deleteErrata">
<query params="errata_id, org_id">
-<!-- PGPORT_1:NO CHANGE -->
delete from rhnErrata where id = :errata_id and org_id = :org_id
</query>
</write-mode>
-
<write-mode name="deleteServerErrataPackageCache">
<query params="errata_id, org_id">
-<!-- PGPORT_1:NO CHANGE -->
delete from rhnServerNeededCache
where server_id in (select id from rhnServer where org_id = :org_id)
- and org_id = :org_id
and errata_id = :errata_id
</query>
</write-mode>
@@ -995,7 +936,6 @@ delete from rhnServerNeededCache
<!-- Errata Search Queries -->
<elaborator name="default_errata_elaborator" params="">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.advisory, E.advisory_name, E.advisory_type, E.synopsis AS
ADVISORY_SYNOPSIS,
TO_CHAR(E.update_date, 'YYYY-MM-DD') AS ADVISORY_LAST_UPDATED
FROM rhnErrata E
@@ -1005,7 +945,6 @@ ORDER BY E.update_date DESC
<mode name="errata_search_by_advisory"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="org_id, search_string">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id, E.update_date
FROM rhnErrata E,
rhnChannelErrata CE,
@@ -1021,7 +960,6 @@ SELECT DISTINCT E.id, E.update_date
<mode name="errata_search_by_package_name"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="org_id, search_string">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id, E.update_date
FROM rhnErrata E,
rhnPackageName PN,
@@ -1043,7 +981,6 @@ SELECT DISTINCT E.id, E.update_date
<mode name="bugs_fixed_by_errata"
class="com.redhat.rhn.frontend.dto.Bug">
<query params="eid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT EBL.bug_id, EBL.summary
FROM rhnErrataBugList EBL
WHERE EBL.errata_id = :eid
@@ -1112,7 +1049,6 @@ SELECT 1
<write-mode name="populate_visible_errata">
<query params="session_id, org_id">
-<!-- PGPORT_1:NO CHANGE -->
insert into rhnVisibleObjects ( SELECT distinct :session_id, E.id, 'errata'
FROM rhnErrata E,
rhnChannelErrata CE,
@@ -1125,7 +1061,6 @@ SELECT 1
<mode name="channel_errata_for_list"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="cid">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT E.id,
E.advisory_name AS advisory,
E.update_date AS update_date,
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/database_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/database_queries.xml
index b41e6f2..644c47e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/database_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/database_queries.xml
@@ -1,6 +1,5 @@
<datasource_modes>
<mode name="tablespace_overview">
-<!-- PGPORT_5:POSTGRES_VERSION_QUERY(SYSTEM) -->
<query params="">
SELECT DT.tablespace_name, DT.extent_management,
DFS.bytes FREE_BYTES, DTS.bytes TOTAL_BYTES,
diff --git
a/java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_elaborators.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_elaborators.xml
index f0a8315..41a7fe2 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_elaborators.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_elaborators.xml
@@ -7,7 +7,6 @@
<mode name="simple_errata_search">
<query name="default_search_query" />
<elaborator params="">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.synopsis MATCHING_FIELD
FROM rhnErrata E
WHERE E.id IN (%s)
@@ -17,7 +16,6 @@
<mode name="errata_search_by_advisory">
<query name="default_search_query" />
<elaborator params="">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.synopsis MATCHING_FIELD
FROM rhnErrata E
WHERE E.id IN (%s)
@@ -27,7 +25,6 @@
<mode name="errata_search_by_package_name">
<query name="default_search_query" />
<elaborator params="">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, 'DUMMY' MATCHING_FIELD
FROM rhnErrata E
WHERE E.id IN (%s)
@@ -35,7 +32,6 @@
</mode>
<query name="default_search_query" params="user_id">
-<!-- PGPORT_1:NO CHANGE -->
SELECT E.id, E.advisory, E.advisory_name, E.advisory_type, E.synopsis AS
ADVISORY_SYNOPSIS,
TO_CHAR(E.update_date, 'YYYY-MM-DD') AS ADVISORY_LAST_UPDATED
FROM rhnErrata E,
diff --git
a/java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_elaborators.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_elaborators.xml
index 4d7d713..304e6a0 100644
---
a/java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_elaborators.xml
+++
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_elaborators.xml
@@ -7,7 +7,6 @@
<mode name="simple_package_search">
<query name="default_search_query" />
<elaborator params="" multiple="t">
-<!-- PGPORT_2: AS keyword required -->
SELECT PN.id ID,
NVL(P.summary, ' ') MATCHING_FIELD
FROM rhnPackageName PN,
@@ -20,7 +19,6 @@
<mode name="package_search_by_name">
<query name="default_search_query" />
<elaborator params="" multiple="t">
-<!-- PGPORT_2: AS keyword required -->
SELECT PN.id ID,
NVL(P.summary, ' ') MATCHING_FIELD
FROM rhnPackageName PN,
@@ -31,7 +29,6 @@
</mode>
<query name="default_search_query" params="user_id">
-<!-- PGPORT_4:QUERY_REWRITE(ORDER BY),AS KEYWORD -->
SELECT PN.id, PN.name PACKAGE_NAME
FROM rhnPackageName PN,
rhnSet RS
diff --git
a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartGuestInstallLog.hbm.xml
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartGuestInstallLog.hbm.xml
index 9ce0dc3..a76a90d 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartGuestInstallLog.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartGuestInstallLog.hbm.xml
@@ -22,12 +22,10 @@
</class>
<query name="KickstartGuestInstallLog.findLogMessagesBySessionId">
- <!-- PGPORT_1:NO CHANGE -->
<![CDATA[select t.logMessage from
com.redhat.rhn.domain.kickstart.KickstartGuestInstallLog as t where t.sessionId =
:sessionId order by t.id]]>
</query>
<query
name="KickstartGuestInstallLog.findNewestLogEntriesBySessionId">
- <!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.kickstart.KickstartGuestInstallLog as t
where t.sessionId = :sessionId order by t.id desc]]>
</query>
diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.hbm.xml
b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.hbm.xml
index e6f5135..c716bd8 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.hbm.xml
@@ -78,7 +78,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
<sql-query name="Org.accessibleChannels">
-<!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
<![CDATA[SELECT {c.*}
FROM rhnChannel {c},
rhnChannelCloned c_1_,
@@ -94,7 +93,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.numOfOrgAdmins">
<return-scalar type="long" column="user_id"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT ugm.user_id
FROM rhnUserGroupMembers ugm
WHERE ugm.user_group_id = (SELECT id
@@ -109,7 +107,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.numOfActiveUsers">
<return-scalar type="long" column="users"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT count(u.id) as users
FROM rhnUser u
WHERE 1=1
@@ -117,7 +114,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.numOfSystems">
<return-scalar type="long" column="systems"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT count(s.id) as systems
FROM rhnServer s
WHERE 1=1
@@ -125,7 +121,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.getMigratedSystems">
<return-scalar type="long" column="systems"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT count(s.server_id) as systems
FROM rhnSystemMigrations s
WHERE 1=1
@@ -134,7 +129,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.getSharedSubscribedSys">
<return-scalar type="long" column="channels"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT count(distinct(c.id)) as channels
FROM rhnServer s,
rhnChannel c,
@@ -147,7 +141,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Org.getSharedChannels">
<return-scalar type="long" column="id"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT count(s.id) as id
FROM rhnSharedChannelView s
WHERE 1=1
@@ -156,7 +149,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.getTrustedSince">
<return-scalar type="date" column="created"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT created
FROM rhnTrustedOrgs rto
WHERE 1=1
@@ -165,7 +157,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.numOfServerGroups">
<return-scalar type="long" column="groups"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT count(g.id) as groups
FROM rhnServerGroup g
WHERE 1=1
@@ -174,7 +165,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.numOfConfigChannels">
<return-scalar type="long" column="channels"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT count(CC.id) AS channels
FROM rhnConfigChannel CC, rhnConfigChannelType CCT
WHERE 1=1
@@ -184,10 +174,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Org.numOfOrgs">
<return-scalar type="long" column="org_count"/>
-<!-- PGPORT_1:NO CHANGE -->
SELECT count(wc.id) AS org_count FROM WEB_CUSTOMER wc
</sql-query>
-<!-- PGPORT_1:NO CHANGE -->
<query name="Org.findOrgsWithSystemsInChannelFamily"><![CDATA[
select o from
com.redhat.rhn.domain.org.OrgImpl as o
diff --git a/java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupImpl.hbm.xml
b/java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupImpl.hbm.xml
index f45133c..b7e0073 100644
--- a/java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupImpl.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupImpl.hbm.xml
@@ -25,11 +25,9 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
class="com.redhat.rhn.domain.role.RoleImpl"
not-null="true" />
</class>
<query name="UserGroup.findById">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.org.usergroup.UserGroupImpl as ug where
ug.id = :id]]>
</query>
<query name="UserGroup.findByRole">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[ select ug
from com.redhat.rhn.domain.org.usergroup.UserGroupImpl as ug
where ug.role = :role ]]>
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml
index ec183c1..883ecbd 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml
@@ -49,7 +49,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</class>
<query name="PackageSource.findByPackage">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[select ps
from com.redhat.rhn.domain.rhnpackage.Package as p,
com.redhat.rhn.domain.rpm.SourceRpm as sr,
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.hbm.xml
b/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.hbm.xml
index 5141cd1..8b08fff 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.hbm.xml
@@ -67,11 +67,9 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</class>
<query name="ServerSnapshot.findForServer">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.server.ServerSnapshot as s where s.server
= :server and s.org = :org]]>
</query>
<query name="ServerSnapshot.findTags">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[select l.tag
from com.redhat.rhn.domain.server.ServerSnapshotTagLink as l
where l.snapshot = :snap]]>
diff --git a/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.hbm.xml
b/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.hbm.xml
index d2e2dfc..af62f15 100644
--- a/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.hbm.xml
@@ -18,7 +18,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="expires" type="long" />
</class>
<query name="WebSession.deleteByUserId">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[delete com.redhat.rhn.domain.session.WebSessionImpl w where
w.webUserId = :user_id]]>
</query>
</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
b/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
index 47496d2..4b32495 100644
--- a/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
@@ -18,19 +18,16 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</class>
<query name="Task.lookup">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.task.Task as t
where t.org = :org and t.name = :name and t.data = :data]]>
</query>
<query name="Task.lookupByOrgAndName">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.task.Task as t
where t.org = :org and t.name = :name]]>
</query>
<query name="Task.deleteTaskQueue">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[delete from com.redhat.rhn.domain.task.Task
where org_id = :org_id and task_name = :name
and task_data = :data and earliest = :earliest]]>
diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml
b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml
index da2b97e..1d6665e 100644
--- a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml
@@ -22,18 +22,15 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</class>
<query name="ActivationKey.findByKey">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.token.ActivationKey as ak where ak.key =
:key]]>
</query>
<query name="ActivationKey.findByToken">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.token.ActivationKey as ak where ak.token =
:token and
kickstartSession = null]]>
</query>
<query name="ActivationKey.findByServer">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[select actKey
from com.redhat.rhn.domain.token.ActivationKey actKey,
com.redhat.rhn.domain.token.Token token
@@ -42,12 +39,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
<query name="ActivationKey.findBySession">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.token.ActivationKey as ak where
ak.kickstartSession = :session]]>
</query>
<query name="ActivationKey.findByOrg">
-<!-- PGPORT_1:NO CHANGE -->
<![CDATA[from com.redhat.rhn.domain.token.ActivationKey as ak where
ak.token.org = :org]]>
</query>
diff --git a/java/scripts/java-map-hibernate-table.pl
b/java/scripts/java-map-hibernate-table.pl
index 070417c..ce06132 100755
--- a/java/scripts/java-map-hibernate-table.pl
+++ b/java/scripts/java-map-hibernate-table.pl
@@ -47,10 +47,8 @@ my @desc = print_desc($tablename);
sub print_desc {
my $tablename = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_5:POSTGRES_VERSION_QUERY(all_tab_columns) #
my $sth = $dbh->prepare(<<EOQ);
-
SELECT column_name, data_type, data_length, nullable FROM all_tab_columns WHERE
table_name = :tab_name ORDER BY column_id
EOQ
@@ -165,5 +163,4 @@ sub string2file {
print "Wrote: $filename\n";
}
-#
commit be47c20ac2caeb3735c98dde7ca3bac82f7a1877
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Mar 31 15:29:22 2009 -0300
Missed conflict resolution.
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 f23238c..01c6a61 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
@@ -176,16 +176,12 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<return alias="c"
class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
-<<<<<<<
HEAD:java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
<query name="Channel.findChannelIdsByLabels">
<![CDATA[SELECT c.id
FROM com.redhat.rhn.domain.channel.Channel c
WHERE c.label in (:labels)]]>
</query>
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
-=======
->>>>>>> 5e147ad... PGPORT second set of query tagging
updates:java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
<sql-query name="Channel.findBaseChannel">
<![CDATA[SELECT {c.*}
FROM rhnChannel {c}, rhnChannelCloned c_1_, rhnServerChannel sc
@@ -200,8 +196,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[from com.redhat.rhn.domain.channel.ClonedChannel as c where c.org =
:org]]>
</query>
-<<<<<<<
HEAD:java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
-
<query name="Channel.packageInChannelAndErrata">
<![CDATA[
select p.id
@@ -216,9 +210,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
-=======
->>>>>>> 5e147ad... PGPORT second set of query tagging
updates:java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
<sql-query name="Channel.accessibleChildChannelIds">
<![CDATA[SELECT {c.*}
FROM rhnChannel c,
commit a45112c1751fc28b625cc4cd7c18f03f0ee4b92d
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Mar 31 15:20:31 2009 -0300
Revert "rhnMapping.py"
This reverts commit 22fae9993b39a35f882131ce7ae5c4b9024744cf.
diff --git a/backend/server/rhnMapping.py b/backend/server/rhnMapping.py
index b14202a..7c3ae31 100644
--- a/backend/server/rhnMapping.py
+++ b/backend/server/rhnMapping.py
@@ -19,7 +19,7 @@ from server import rhnSQL
# and has a chance of hitting some channels
def real_version(version):
version = str(version)
-# PGPORT_1:No Change
+
h = rhnSQL.prepare("""
select canon_version
from rhnRedHatCanonVersion rhcv
@@ -36,7 +36,6 @@ def check_package_arch(name):
name = str(name)
if name is None or len(name) == 0:
return None
-# PGPORT_1:No Change
h = rhnSQL.prepare("select id from rhnPackageArch where label = :label")
h.execute(label=name)
ret = h.fetchone_dict()
commit aa119342af424309e7cf7833c25f966ccb904157
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Mar 31 15:20:18 2009 -0300
Revert "PGPORT second set of query tagging updates"
This reverts commit 5e147ad535493c8209b28cb3c8d21bc1e3a78893.
Conflicts:
backend/satellite_tools/satCerts.py
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py
index 923c18d..436130b 100644
--- a/backend/satellite_tools/satCerts.py
+++ b/backend/satellite_tools/satCerts.py
@@ -70,7 +70,7 @@ def get_all_orgs():
raise NoOrgIdError("Unable to look up org_id")
return rows
-#PGPORT_1:NO Change
+
_queryLookupOrgId = rhnSQL.Statement("""
SELECT id
FROM web_customer
@@ -103,7 +103,7 @@ def create_first_org(owner):
# Now create the first private channel family
create_first_private_chan_family()
return get_org_id()
-#PGPORT_1:NO Change
+
_query_get_slot_types = rhnSQL.Statement("""
select sg.group_type slot_type_id, sgt.label slot_name
from rhnServerGroup sg,
@@ -111,7 +111,7 @@ _query_get_slot_types = rhnSQL.Statement("""
where sg.org_id = :org_id
and sg.group_type = sgt.id
""")
-#PGPORT_1:NO Change
+
_query_get_allorg_slot_types = rhnSQL.Statement("""
select sg.org_id,sg.group_type as slot_type_id,
sgt.label as slot_name, sg.max_members, sg.current_members
@@ -298,7 +298,7 @@ def storeRhnCert(cert, check_generation=0, check_version=0):
push_monitoring_configs(org_id)
rhnSQL.commit()
-#PGPORT_1:NO Change
+
_query_update_dates = rhnSQL.Statement("""
UPDATE rhnSatelliteCert
SET issued = :issued, expires = :expires
@@ -306,7 +306,7 @@ _query_update_dates = rhnSQL.Statement("""
AND ((version is null and :version is null)
OR version = :version)
""")
-#PGPORT_1:NO Change
+
_query_latest_version = rhnSQL.Statement("""
SELECT COALESCE(version, 0) as version, version as orig_version, cert,
TO_CHAR(issued, 'YYYY-MM-DD HH24:MI:SS') as issued,
@@ -327,7 +327,7 @@ def retrieve_db_cert(label='rhn-satellite-cert'):
return None
row['cert'] = rhnSQL.read_lob(row['cert'])
return row
-#PGPORT_1:NO Change
+
_query_insert_cert = rhnSQL.Statement("""
INSERT into rhnSatelliteCert
(label, version, cert, expires, issued)
@@ -335,18 +335,18 @@ _query_insert_cert = rhnSQL.Statement("""
TO_DATE(:expires, 'YYYY-MM-DD HH24:MI:SS'),
TO_DATE(:issued, 'YYYY-MM-DD HH24:MI:SS'))
""")
-#PGPORT_1:NO Change
+
_query_update_web_customer = rhnSQL.Statement("""
UPDATE web_customer
SET name = :owner
WHERE id = 1
""")
-#PGPORT_1:NO Change
+
_query_update_web_user = rhnSQL.Statement("""
UPDATE web_user_personal_info
SET company = :owner
""")
-#PGPORT_1:NO Change
+
_query_update_rhnchannelfamily = rhnSQL.Statement("""
UPDATE rhnchannelfamily
SET name = :owner
@@ -373,7 +373,7 @@ def push_monitoring_configs(org_id):
print "Pushing scout configs to all monitoring scouts"
-#PGPORT_1:NO Change
+
_query_get_sat_clusters = rhnSQL.Statement("""
SELECT recid
FROM rhn_Sat_Cluster
@@ -495,7 +495,7 @@ def store_rhnCryptoKey(description, caCert, verbosity=0):
raise CaCertInsertionError(
"...the traceback: %s" % fetchTraceback())
-#PGPORT_1:NO Change
+
_querySelectCryptoCertInfo = rhnSQL.Statement("""
SELECT ck.id, ck.description, ckt.label as type_label, ck.key
FROM rhnCryptoKeyType ckt,
@@ -505,7 +505,7 @@ _querySelectCryptoCertInfo = rhnSQL.Statement("""
AND ck.description = :description
AND ck.org_id = :org_id
""")
-#PGPORT_1:NO Change
+
_queryInsertCryptoCertInfo = rhnSQL.Statement("""
INSERT into rhnCryptoKey
(id, org_id, description, crypto_key_type_id, key)
@@ -527,7 +527,6 @@ def create_first_private_chan_family():
Check to see if org has a channelfamily associated with it.
If not, Create one.
"""
-#PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL)
_query_create_chfam = """
INSERT INTO rhnChannelFamily
(id, name, label, org_id, product_url)
diff --git a/backend/server/action_extra_data/script.py
b/backend/server/action_extra_data/script.py
index 6f62608..5be3944 100644
--- a/backend/server/action_extra_data/script.py
+++ b/backend/server/action_extra_data/script.py
@@ -21,16 +21,15 @@ from server import rhnSQL
# the "exposed" functions
__rhnexport__ = ['run']
-#PGPORT_1:NO Change
-_query_clear_output = rhnSQL.Statement("""
+_query_clear_output = rhnSQL.Statement("""
delete from rhnServerActionScriptResult
where server_id = :server_id
and action_script_id = (
select id from rhnActionScript where action_id = :action_id
)
""")
-#PGPORT_1:NO Change
+
_query_initial_store = rhnSQL.Statement("""
insert into rhnServerActionScriptResult (
server_id,
@@ -49,7 +48,7 @@ select :server_id,
from rhnActionScript ascript
where ascript.action_id = :action_id
""")
-#PGPORT_1:NO Change
+
_query_get_output_row = rhnSQL.Statement("""
select asr.output
from rhnServerActionScriptResult asr,
diff --git a/backend/server/handlers/app/channel.py
b/backend/server/handlers/app/channel.py
index 17e06e8..c4d28ee 100644
--- a/backend/server/handlers/app/channel.py
+++ b/backend/server/handlers/app/channel.py
@@ -189,7 +189,7 @@ class Channel(RPC_Base):
set_clause = string.join(
map(lambda x: "%s = :%s" % (x, x), fields), ', ')
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("update rhnChannel set %s where id = :id" %
set_clause)
try:
apply(h.execute, (), params)
@@ -213,7 +213,7 @@ class Channel(RPC_Base):
def listChannel(self, username, password):
log_debug(3)
self._auth(username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("select label from rhnChannel")
h.execute()
ret = h.fetchall_dict() or []
@@ -227,14 +227,12 @@ class Channel(RPC_Base):
h = None
# Red Hat only:
- # PGPORT_1:NO Change #
if not orgId:
h = rhnSQL.prepare("""select label
from rhnChannel
where org_id is 1""")
h.execute()
# any other org:
- # PGPORT_1:NO Change #
else:
h = rhnSQL.prepare("""select label
from rhnChannel
@@ -247,7 +245,6 @@ class Channel(RPC_Base):
log_debug(3)
# get channel family info for this channel
- # PGPORT_2:AS KEYWORD #
h = rhnSQL.prepare("""
select cfm.channel_family_id, cf.label channel_family
from rhnChannelFamilyMembers cfm,
@@ -269,7 +266,7 @@ class Channel(RPC_Base):
log_debug(3)
authobj = self._auth(username, password)
authobj.isChannelAdmin()
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("select * from rhnChannel where label = :label")
h.execute(label=name)
row = h.fetchone_dict()
@@ -286,7 +283,7 @@ class Channel(RPC_Base):
name = int(name)
except ValueError:
return ''
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("select * from rhnChannel where id = :channel_id")
h.execute(channel_id = name)
row = h.fetchone_dict()
@@ -303,7 +300,7 @@ class Channel(RPC_Base):
if not authobj.isChannelAdmin():
raise rhnFault(50, "Invalid user permissions",
explain=0)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("select * from rhnChannelFamily where label =
:label")
h.execute(label=name)
row = h.fetchone_dict()
@@ -319,7 +316,7 @@ class Channel(RPC_Base):
def lookupChannelArch(self, label, username, password):
log_debug(3)
self._auth(username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("select id from rhnChannelArch where label =
:label")
h.execute(label=label)
row = h.fetchone_dict()
@@ -333,7 +330,6 @@ class Channel(RPC_Base):
if not org_id:
return ''
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""select org_id from web_contact
where login_uc = UPPER(:org_id)""")
h.execute(org_id=org_id)
@@ -345,7 +341,7 @@ class Channel(RPC_Base):
org_id = int(org_id)
except ValueError:
raise rhnFault(42, "Invalid org_id ",explain=0)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select id from web_customer where id =
:org_id""")
h.execute(org_id=org_id)
row = h.fetchone_dict()
@@ -380,11 +376,11 @@ class Channel(RPC_Base):
log_debug(3)
authobj = self._auth(username, password)
authobj.isChannelAdmin()
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""
delete from rhnChannelFamilyMembers where channel_id =
:channel_id""")
h.execute(channel_id=channel_id)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""
insert into rhnChannelFamilyMembers (channel_id, channel_family_id )
values (:channel_id, :channel_family_id)
@@ -414,7 +410,7 @@ class Channel(RPC_Base):
# Nothing to be done here, same channel family
return 0
log_debug(3, " Migrating downloads")
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""
update rhnDownloads
set channel_family_id = :new_channel_family_id
@@ -454,7 +450,7 @@ class Channel(RPC_Base):
if kwargs.get('channel_arch_id') is None:
# Missing stuff
raise rhnFault(23, "Insufficient data, channel arch id missing to update
dist", explain=0)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""
insert into rhnDistChannelMap
(channel_id, channel_arch_id, os, release)
@@ -473,7 +469,7 @@ class Channel(RPC_Base):
def deleteDist(self, channel_id, username, password):
log_debug(3)
self._auth(username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""
delete from rhnDistChannelMap where channel_id = :channel_id
""")
@@ -503,7 +499,6 @@ class Channel(RPC_Base):
self._auth(username, password)
#probably there is better way to write this query
#but works for now.
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""
insert into rhnChannelPermission
(channel_id, role_id, user_id)
@@ -532,7 +527,6 @@ class Channel(RPC_Base):
self._auth(username, password)
#probably there is better way to write this query
#but works for now.
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""
delete from rhnchannelpermission
where (channel_id, role_id, user_id) in
diff --git a/backend/server/handlers/app/test/test_channel.py
b/backend/server/handlers/app/test/test_channel.py
index 905e490..7cb97d8 100644
--- a/backend/server/handlers/app/test/test_channel.py
+++ b/backend/server/handlers/app/test/test_channel.py
@@ -71,7 +71,7 @@ class ChannelTestCase(unittest.TestCase):
'summary': 'none', 'id': 255,
'gpg_key_id': '', 'description': ''}
ret = channel.createChannel(params, commit, username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select * from rhnChannel where label = :
label""")
h.execute(label = params['label'])
@@ -92,7 +92,7 @@ class ChannelTestCase(unittest.TestCase):
'basedir': '/', 'org_id': '',
'end_of_life': '', 'label': 'yy',
'parent_channel': '', 'summary':
'none', 'id': 255, 'gpg_key_id': '',
'description': ''}
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select id from rhnChannel where label = :
label""")
h.execute(label = params['label'])
@@ -105,7 +105,7 @@ class ChannelTestCase(unittest.TestCase):
ret = channel.updateChannel(params, channel_id, old_channel_family_id,
new_channel_family_id, commit, username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select name from rhnChannel where label = :
label""")
h.execute(label = params['label'])
@@ -117,7 +117,7 @@ class ChannelTestCase(unittest.TestCase):
def testdeletechannel(self):
channel_id = 5294
ret = channel.deleteChannel( channel_id, commit, username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select * from rhnChannel where id = :
cid""")
h.execute(cid = channel_id)
@@ -154,7 +154,7 @@ class ChannelTestCase(unittest.TestCase):
channel_family_id = 109
ret = channel.updateChannelMembership(channel_id, channel_family_id, kargs,
commit,
username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select * from rhnChannelFamilyMembers where
channel_id = : cid """)
h.execute(cid = channel_id)
@@ -176,7 +176,7 @@ class ChannelTestCase(unittest.TestCase):
def testdeleteDist(self):
channel_id = 505
ret = channel.deleteDist(channel_id, username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select *
from rhnDistChannelMap
where channel_id = : cid """)
@@ -194,7 +194,6 @@ class ChannelTestCase(unittest.TestCase):
'channel_arch_id' : 500,
'release' : version
}
- # PGPORT_1:NO Change #
ret = channel.updateDist(kargs, username, password)
h = rhnSQL.prepare("""select *
from rhnDistChannelMap
@@ -211,12 +210,12 @@ class ChannelTestCase(unittest.TestCase):
ret2 = channel.channelManagePermission(options['label'],
'subscribe', commit,
username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select id from rhnchannel where label =
:label""")
h.execute(label = options['label'])
ret = h.fetchone_dict() or []
- # PGPORT_1:NO Change #
+
h2 = rhnSQL.prepare("""
select cpr.label
from rhnchannelpermission cp,
@@ -233,12 +232,12 @@ class ChannelTestCase(unittest.TestCase):
def testrevokemanageChannelPermission(self):
ret = channel.revokeChannelPermission(options['label'], 'manage',
commit,
username, password)
- # PGPORT_1:NO Change #
+
h = rhnSQL.prepare("""select id from rhnchannel where label =
:label""")
h.execute(label = options['label'])
ret = h.fetchone_dict() or []
- # PGPORT_1:NO Change #
+
h2 = rhnSQL.prepare("""
select cpr.label
from rhnchannelpermission cp,
@@ -256,12 +255,11 @@ class ChannelTestCase(unittest.TestCase):
def testrevokesubscribeChannelPermission(self):
ret = channel.revokeChannelPermission(options['label'],
'subscribe', commit,
username, password)
- # PGPORT_1:NO Change #
h = rhnSQL.prepare("""select id from rhnchannel where label =
:label""")
h.execute(label = options['label'])
ret = h.fetchone_dict() or []
- # PGPORT_1:NO Change #
+
h2 = rhnSQL.prepare("""
select cpr.label
from rhnchannelpermission cp,
diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py
index 0fbe23d..3c204b7 100644
--- a/backend/server/rhnSQL/sql_table.py
+++ b/backend/server/rhnSQL/sql_table.py
@@ -70,7 +70,7 @@ class Table:
self.__cache = None
if cache:
self.__cache = {}
- # PGPORT_5:POSTGRES_VERSION_QUERY(ROWNUM) #
+
# see if the table exists
sql = "select %s from %s where rownum = 0" % (self.__hashid, self.__table)
try:
@@ -120,7 +120,6 @@ class Table:
else:
clause = "%s = :%s" % (col, col)
args.append(clause)
- # PGPORT_1:NO CHANGE
sql = "select * from %s where " % self.__table
cursor = self.__db.prepare(sql + string.join(args, " and "))
apply(cursor.execute, (), row)
@@ -142,7 +141,6 @@ class Table:
def __getitem__(self, key):
if self.__cache and self.__cache.has_key(key):
return self.__cache[key]
- # PGPORT_1:NO CHANGE
h = self.__db.prepare("select * from %s where %s = :p1" % (
self.__table, self.__hashid))
h.execute(p1=key)
@@ -200,7 +198,6 @@ class Table:
# length
def __len__(self):
- # PGPORT_1:NO CHANGE
h = self.__db.prepare("select count(*) as ID from %s" % self.__table)
h.execute()
row = h.fetchone_dict()
@@ -209,7 +206,6 @@ class Table:
return int(row["id"])
# delete an entry by the key
- # PGPORT_1:NO CHANGE
def __delitem__(self, key):
h = self.__db.prepare("delete from %s where %s = :p1" % (
self.__table, self.__hashid))
@@ -219,7 +215,6 @@ class Table:
return 0
# get all keys
- # PGPORT_1:NO CHANGE
def keys(self):
h = self.__db.prepare("select %s NAME from %s" % (
self.__hashid, self.__table))
@@ -234,11 +229,9 @@ class Table:
# smaller value
def has_key(self, key):
if self.__cache is not None:
- # PGPORT_1:NO CHANGE
h = self.__db.prepare("select * from %s where %s = :p1" %
(self.__table, self.__hashid))
else:
- # PGPORT_1:NO CHANGE
h = self.__db.prepare("select %s from %s where %s = :p1" %
(self.__hashid, self.__table, self.__hashid))
h.execute(p1=key)
diff --git a/backend/server/rhnServer/server_hardware.py
b/backend/server/rhnServer/server_hardware.py
index 91d03d3..8f33f8d 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -437,7 +437,7 @@ class NetIfaceInformation(Device):
self._insert(inserts)
return 0
- #PGPORT_1:NO Change
+
def _insert(self, params):
q = """insert into rhnServerNetInterface
(%s) values (%s)"""
@@ -447,7 +447,7 @@ class NetIfaceInformation(Device):
bind_params = string.join(map(lambda x: ':' + x, columns), ",
")
h = rhnSQL.prepare(q % (string.join(columns, ", "), bind_params))
return self._dml(h, params)
- #PGPORT_1:NO Change
+
def _delete(self, params):
q = """delete from rhnServerNetInterface
where %s"""
@@ -458,7 +458,6 @@ class NetIfaceInformation(Device):
return self._dml(h, params)
def _update(self, params):
-#PGPORT_1:NO Change
q = """update rhnServerNetInterface
set %s
where %s"""
@@ -485,7 +484,6 @@ class NetIfaceInformation(Device):
return rowcount
def reload(self, server_id):
-#PGPORT_1:NO Change
h = rhnSQL.prepare("""
select *
from rhnServerNetInterface
@@ -684,7 +682,7 @@ class Hardware:
def __load_from_db(self, db, DevClass, sysid):
if not self.__hardware.has_key(DevClass):
self.__hardware[DevClass] = []
- #PGPORT_1:NO Change
+
h = rhnSQL.prepare("select * from %s where server_id = :sysid" % db)
h.execute(sysid = sysid)
rows = h.fetchall_dict() or []
diff --git a/backend/server/rhnServer/server_solarispatches.py
b/backend/server/rhnServer/server_solarispatches.py
index e8437a2..acee80a 100644
--- a/backend/server/rhnServer/server_solarispatches.py
+++ b/backend/server/rhnServer/server_solarispatches.py
@@ -32,7 +32,7 @@ def get_package_id(pkg):
Return the id or return None if the package is not found"""
nvrea = get_nvrea(pkg)
- #PGPORT_1:NO Change
+
query = """SELECT id FROM rhnPackage
WHERE name_id=LOOKUP_PACKAGE_NAME(:name)
AND evr_id=LOOKUP_EVR(:epoch, :ver, :rel)
@@ -74,7 +74,7 @@ class SolarisPatches(object):
"""Clear the patched packages on a system from the
database"""
log_debug(4, sysid, "disposing of patched packages")
-#PGPORT_1:NO Change
+
query = """DELETE FROM rhnSolarisPatchedPackage
WHERE server_id = :sysid"""
@@ -97,7 +97,7 @@ class SolarisPatches(object):
"""Record the patched packages on a system in the
database"""
log_debug(4, sysid, "saving patched packages")
- # PGPORT_2:AS KEYWORD
+
select = """SELECT SP.name_id nid, SP.evr_id eid,
SP.package_arch_id aid
FROM rhnPackageNEVRA PN,
@@ -109,7 +109,7 @@ class SolarisPatches(object):
AND PN.name_id = SP.name_id
AND PN.evr_id = SP.evr_id
AND PN.package_arch_id = SP.package_arch_id"""
- #PGPORT_1:NO Change
+
insert = """INSERT INTO rhnSolarisPatchedPackage
(server_id, patch_id, package_nevra_id)
VALUES(:sysid, :pid,
diff --git a/backend/server/test/misc_functions.py
b/backend/server/test/misc_functions.py
index f0661fb..fe46be5 100644
--- a/backend/server/test/misc_functions.py
+++ b/backend/server/test/misc_functions.py
@@ -74,9 +74,8 @@ def fetch_server_group(org_id, name):
s = rhnServerGroup.ServerGroup()
s.load(org_id, name)
return s
-#PGPORT_1:NO Change
-_query_fetch_server_groups = rhnSQL.Statement("""
+_query_fetch_server_groups = rhnSQL.Statement("""
select sgm.server_group_id
from rhnServerGroupMembers sgm,
rhnServerGroup sg
@@ -126,7 +125,6 @@ def create_new_user(org_id=None, username=None, password=None,
roles=None):
user_id = u.getid()
# Set roles
- #PGPORT_1:NO Change
h = rhnSQL.prepare("""
select ug.id
from rhnUserGroupType ugt, rhnUserGroup ug
diff --git a/backend/server/test/unit-test/misc_functions.py
b/backend/server/test/unit-test/misc_functions.py
index 07daa20..d4473e7 100644
--- a/backend/server/test/unit-test/misc_functions.py
+++ b/backend/server/test/unit-test/misc_functions.py
@@ -51,7 +51,7 @@ def fetch_server_group(org_id, name):
s = rhnServerGroup.ServerGroup()
s.load(org_id, name)
return s
-#PGPORT_1:NO Change
+
_query_fetch_server_groups = rhnSQL.Statement("""
select sgm.server_group_id
from rhnServerGroupMembers sgm,
@@ -100,7 +100,7 @@ def create_new_user(org_id=None, username=None, password=None,
roles=None):
u.contact['password'] = password
u.save()
user_id = u.getid()
-#PGPORT_1:NO Change
+
# Set roles
h = rhnSQL.prepare("""
select ug.id
@@ -156,7 +156,7 @@ class InvalidEntitlementError(Exception):
class InvalidRoleError(Exception):
pass
-#PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
+
_query_grant_entitlements = rhnSQL.Statement("""
begin
select to_char(sysdate, 'YYYYMMDDHH24MISS') into :t0 from dual;
diff --git a/backend/test/suites/dbtests.py b/backend/test/suites/dbtests.py
index 6b52ac6..9823c0e 100644
--- a/backend/test/suites/dbtests.py
+++ b/backend/test/suites/dbtests.py
@@ -45,7 +45,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
#ids = [1, 2, 3, 4, 5]
#names = ["Bill", "Ted", "Mary", "Tom",
"Susan"]
#cursor.executemany([ids, names])
- # PGPORT_1:NO Change #
+
insert_query = "INSERT INTO %s(id, name, num) VALUES(:id, :name, :num)"
% \
self.temp_table
cursor = rhnSQL.prepare(insert_query)
@@ -58,7 +58,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
cursor = rhnSQL.prepare(drop_table_query)
cursor.execute()
rhnSQL.commit()
- # PGPORT_1:NO Change #
+
def test_execute_not_all_variables_bound(self):
query = "INSERT INTO %s(id, name) VALUES(:id, :name)" % \
self.temp_table
@@ -71,7 +71,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
self.assertRaises(rhnSQL.SQLStatementPrepareError,
cursor.execute)
rhnSQL.rollback()
- # PGPORT_1:NO Change #
+
def test_execute_bindbyname_extra_params_passed(self):
query = "SELECT * FROM %s WHERE id = :id" % self.temp_table
cursor = rhnSQL.prepare(query)
@@ -79,7 +79,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
results = cursor.fetchone()
self.assertEquals(TEST_IDS[0], results[0])
self.assertEquals(TEST_NAMES[0], results[1])
- # PGPORT_1:NO Change #
+
def test_executemany(self):
query = "INSERT INTO %s(id, name) VALUES(:id, :name)" \
% self.temp_table
@@ -88,7 +88,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
cursor = rhnSQL.prepare(query)
cursor.executemany(id=ids, name=names)
- # PGPORT_1:NO Change #
+
query = rhnSQL.prepare("SELECT * FROM %s WHERE id >= 1000 ORDER BY
ID"
% self.temp_table)
query.execute()
@@ -107,7 +107,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
# Just want to see that this doesn't throw an exception:
cursor.executemany()
- # PGPORT_1:NO Change #
+
def test_execute_bulk(self):
query = "INSERT INTO %s(id, name) VALUES(:id, :name)" \
% self.temp_table
@@ -120,7 +120,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
'name': names,
}
cursor.execute_bulk(d)
- # PGPORT_1:NO Change #
+
query = rhnSQL.prepare("SELECT * FROM %s WHERE id >= 1000 ORDER BY
ID"
% self.temp_table)
query.execute()
@@ -132,14 +132,14 @@ class RhnSQLDatabaseTests(unittest.TestCase):
self.assertEquals("Somebody", rows[0][1])
self.assertEquals("Else", rows[1][1])
- # PGPORT_1:NO Change #
+
def test_numeric_columns(self):
h = rhnSQL.prepare("SELECT num FROM %s WHERE id = %s" %
(self.temp_table, TEST_IDS[0]))
h.execute()
row = h.fetchone()
self.assertEqual(TEST_NUMS[0], row[0])
- # PGPORT_1:NO Change #
+
def test_fetchone(self):
query = "SELECT * FROM %s WHERE id = 1 ORDER BY id" % self.temp_table
cursor = rhnSQL.prepare(query)
@@ -147,7 +147,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
results = cursor.fetchone()
self.assertEquals(TEST_IDS[0], results[0])
self.assertEquals(TEST_NAMES[0], results[1])
- # PGPORT_1:NO Change #
+
def test_fetchone_dict(self):
query = "SELECT * FROM %s WHERE id = 1 ORDER BY id" % self.temp_table
cursor = rhnSQL.prepare(query)
@@ -156,7 +156,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
self.assertEquals(TEST_IDS[0], results['id'])
self.assertEquals(TEST_NAMES[0], results['name'])
self.assertEquals(TEST_NUMS[0], results['num'])
- # PGPORT_1:NO Change #
+
def test_fetchall(self):
query = rhnSQL.prepare("SELECT * FROM %s ORDER BY id" %
self.temp_table)
@@ -169,7 +169,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
self.assertEquals(TEST_IDS[i], rows[i][0])
self.assertEquals(TEST_NAMES[i], rows[i][1])
i = i + 1
- # PGPORT_1:NO Change #
+
def test_fetchall_dict(self):
query = rhnSQL.prepare("SELECT * FROM %s ORDER BY id" %
self.temp_table)
@@ -182,7 +182,7 @@ class RhnSQLDatabaseTests(unittest.TestCase):
self.assertEquals(TEST_IDS[i], rows[i]['id'])
self.assertEquals(TEST_NAMES[i], rows[i]['name'])
i = i + 1
- # PGPORT_1:NO Change #
+
def test_unicode_string_argument(self):
query = rhnSQL.prepare("SELECT * FROM %s WHERE name=:name" %
self.temp_table)
@@ -232,7 +232,7 @@ $$ LANGUAGE 'plpgsql';
RhnSQLDatabaseTests.tearDown(self)
- # PGPORT_5:POSTGRES_VERSION_QUERY(DATATYPE) #
+
class OracleDatabaseTests(RhnSQLDatabaseTests):
QUERY_CREATE_TABLE = """
CREATE TABLE %s(id NUMBER, name VARCHAR2(256), num NUMBER(5,2))
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
index 4120b15..248a053 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
@@ -1,5 +1,5 @@
<datasource_modes>
- <!-- PGPORT_2:AS KEYWORD -->
+
<mode name="system_events_history"
class="com.redhat.rhn.frontend.dto.HistoryEvent">
<query params="sid">
SELECT EVENT_ID as ID,
@@ -49,7 +49,6 @@ ORDER BY COMPLETED DESC, PICKED_UP DESC, CREATED DESC, EVENT_ID DESC
</mode>
<query name="action_overview_elab" params="user_id, org_id"
multiple="t">
-<!-- PGPORT_1:NO Change -->
SELECT UAO.id,
UAO.action_status,
UAO.tally
@@ -65,7 +64,6 @@ SELECT UAO.id,
<mode name="recently_scheduled_action_list"
class="com.redhat.rhn.frontend.dto.ScheduledAction">
<query params="user_id, org_id, age">
-<!-- PGPORT_3:ORAFCE(NVL) -->
select
distinct a.id as id,
a.earliest_action as earliest,
@@ -94,7 +92,6 @@ order by id desc
<query name="action_list_elab" params="user_id, org_id" >
-<!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id as ID,
A.prerequisite AS PREREQUISITE,
UAO.type_name,
@@ -116,7 +113,6 @@ SELECT DISTINCT UAO.id as ID,
<mode name="pending_action_list"
class="com.redhat.rhn.frontend.dto.ScheduledAction">
<query params="user_id, org_id">
-<!-- PGPORT_1:NO CHANGE -->
SELECT DISTINCT UAO.id AS ID,
UAO.earliest_action AS EARLIEST,
UAO.type_name,
@@ -137,7 +133,6 @@ ORDER BY EARLIEST DESC
<mode name="pending_actions_in_set"
class="com.redhat.rhn.frontend.dto.ScheduledAction">
<query params="user_id, org_id, set_label">
-<!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
UAO.earliest_action AS EARLIEST,
A.prerequisite AS PREREQUISITE,
@@ -163,7 +158,6 @@ ORDER BY EARLIEST DESC
<mode name="all_action_list"
class="com.redhat.rhn.frontend.dto.ScheduledAction">
<query params="user_id, org_id">
-<!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
UAO.earliest_action AS EARLIEST,
UAO.type_name,
@@ -184,7 +178,6 @@ ORDER BY EARLIEST DESC
<mode name="completed_action_list"
class="com.redhat.rhn.frontend.dto.ScheduledAction">
<query params="user_id, org_id">
-<!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
UAO.earliest_action AS EARLIEST,
UAO.type_name,
@@ -207,7 +200,6 @@ ORDER BY EARLIEST DESC
<mode name="failed_action_list"
class="com.redhat.rhn.frontend.dto.ScheduledAction">
<query params="user_id, org_id">
-<!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
UAO.earliest_action AS EARLIEST,
UAO.type_name,
@@ -231,7 +223,6 @@ ORDER BY EARLIEST DESC
<mode name="archived_action_list"
class="com.redhat.rhn.frontend.dto.ScheduledAction">
<query params="user_id, org_id">
-<!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
UAO.earliest_action AS EARLIEST,
UAO.type_name,
@@ -250,7 +241,6 @@ ORDER BY EARLIEST DESC
<write-mode name="archive_actions">
<query params="user_id, label, org_id">
-<!-- PGPORT_1:NO Change -->
UPDATE rhnAction
SET archived = 1
WHERE id IN (SELECT element FROM rhnSet WHERE user_id = :user_id
@@ -269,7 +259,6 @@ END;
<write-mode name="schedule_action">
<query params="action_id, name_id, evr_id, arch_id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnActionPackage (id, action_id, name_id, evr_id, package_arch_id)
VALUES (rhn_act_p_id_seq.nextval, :action_id, :name_id, :evr_id, :arch_id)
</query>
@@ -277,7 +266,6 @@ VALUES (rhn_act_p_id_seq.nextval, :action_id, :name_id, :evr_id,
:arch_id)
<write-mode name="schedule_action_no_arch">
<query params="action_id, name_id, evr_id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnActionPackage (id, action_id, name_id, evr_id)
VALUES (rhn_act_p_id_seq.nextval, :action_id, :name_id, :evr_id)
</query>
@@ -286,7 +274,6 @@ VALUES (rhn_act_p_id_seq.nextval, :action_id, :name_id, :evr_id)
<!-- this is so WRONG -->
<write-mode name="insert_package_delta_element">
<query params="delta_id, operation, n, e, v, r, a">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnPackageDeltaElement (package_delta_id, transaction_package_id)
VALUES (:delta_id, lookup_transaction_package(:operation, :n, :e, :v, :r, :a))
</query>
@@ -294,7 +281,6 @@ VALUES (:delta_id, lookup_transaction_package(:operation, :n, :e, :v,
:r, :a))
<write-mode name="insert_action_package_delta">
<query params="action_id, delta_id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnActionPackageDelta (action_id, package_delta_id)
VALUES (:action_id, :delta_id)
</query>
@@ -302,7 +288,6 @@ VALUES (:action_id, :delta_id)
<mode name="visible_to_user">
<query params="user_id, aid">
-<!-- PGPORT_1:NO Change -->
SELECT 1
FROM rhnUserActionOverview UAO
WHERE UAO.user_id = :user_id
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
index 779359b..6b696b7 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
@@ -3,7 +3,6 @@
<mode name="packages_needing_updates"
class="com.redhat.rhn.frontend.dto.ErrataCacheDto">
<query params="server_id">
- <!-- PGPORT_1:NO Change -->
select snpc.server_id, snpc.errata_id, snpc.package_id
from rhnServerNeededCache snpc,
rhnpackage p
@@ -16,7 +15,6 @@ select snpc.server_id, snpc.errata_id, snpc.package_id
<mode name="package_associated_to_errata_and_channel"
class="com.redhat.rhn.frontend.dto.ErrataPackageFile">
<query params="channel_id, errata_id">
- <!-- PGPORT_1:NO Change -->
select EP.package_id
from rhnErrataPackage EP inner join
rhnChannelPackage CP on EP.package_id = CP.package_id
@@ -28,7 +26,6 @@ select snpc.server_id, snpc.errata_id, snpc.package_id
<mode name="new_packages"
class="com.redhat.rhn.frontend.dto.ErrataCacheDto">
<query params="server_id">
-<!-- PGPORT_1:NO Change -->
select server_id, errata_id, package_id
from rhnServerNeededView
where server_id = :server_id
@@ -36,7 +33,6 @@ select server_id, errata_id, package_id
</mode>
<write-mode name="delete_needed_package_cache">
<query params="server_id, errata_id, package_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache
WHERE server_id = :server_id
AND errata_id = :errata_id
@@ -46,7 +42,6 @@ DELETE FROM rhnServerNeededCache
<write-mode name="delete_needed_package_cache_null_errata">
<query params="server_id, package_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache
WHERE server_id = :server_id
AND errata_id IS NULL
@@ -56,7 +51,6 @@ DELETE FROM rhnServerNeededCache
<write-mode name="delete_needed_package_cache_all">
<query params="server_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache
WHERE server_id = :server_id
</query>
@@ -64,7 +58,6 @@ DELETE FROM rhnServerNeededCache
<write-mode name="insert_needed_errata_cache">
<query params="server_id, errata_id, package_id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnServerNeededCache
(server_id, errata_id, package_id)
VALUES (:server_id, :errata_id, :package_id)
@@ -73,7 +66,6 @@ INSERT INTO rhnServerNeededCache
<write-mode name="delete_needed_errata_cache">
<query params="server_id, errata_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache
WHERE server_id = :server_id
AND errata_id = :errata_id
@@ -82,7 +74,6 @@ DELETE FROM rhnServerNeededCache
<write-mode name="delete_needed_errata_cache_all">
<query params="server_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache
WHERE server_id = :server_id
</query>
@@ -90,7 +81,6 @@ DELETE FROM rhnServerNeededCache
<mode name="count_servers_in_errata_cache_queue">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT server_count as num_items
FROM rhnOrgErrataCacheQueue
WHERE org_id = :org_id
@@ -100,21 +90,18 @@ SELECT server_count as num_items
<mode name="all_serverids_for_org">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT id FROM rhnServer WHERE org_id = :org_id
</query>
</mode>
<write-mode name="delete_errata_cache_queue">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnOrgErrataCacheQueue WHERE org_id = :org_id
</query>
</write-mode>
<write-mode name="insert_needed_package_cache">
<query params="server_id, errata_id, package_id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnServerNeededCache
(server_id, errata_id, package_id)
VALUES (:server_id, :errata_id, :package_id)
@@ -124,7 +111,6 @@ DELETE FROM rhnOrgErrataCacheQueue WHERE org_id = :org_id
<write-mode name="delete_needed_cache_by_channel">
<query params="channel_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache EC
WHERE EC.server_id in
(SELECT server_id from rhnServerChannel SC where SC.channel_id = :channel_id)
@@ -134,7 +120,6 @@ WHERE EC.server_id in
<write-mode name="insert_needed_cache_by_channel">
<query params="channel_id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnServerNeededCache
(server_id, package_id, errata_id)
(SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id
@@ -148,7 +133,6 @@ INSERT INTO rhnServerNeededCache
<write-mode name="delete_outdated_cache_entries_by_packages">
<!-- deletes cahe entries that are outdated by an errata -->
<query params="channel_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache SNC2 where
(SNC2.server_id, SNC2.package_id) in
(
@@ -182,7 +166,6 @@ INSERT INTO rhnServerNeededCache
<write-mode name="insert_new_cache_entries_by_packages">
<!-- -->
<query params="channel_id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnServerNeededCache (server_id, errata_id, package_id)
( SELECT /*+ RULE */ DISTINCT
S.id as server_id,
@@ -219,7 +202,6 @@ INSERT INTO rhnServerNeededCache
<write-mode name="insert_new_cache_entries_by_errata">
<!-- -->
<query params="channel_id, errata_id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnServerNeededCache (server_id, errata_id, package_id)
( SELECT /*+ RULE */ DISTINCT
S.id as server_id,
@@ -255,7 +237,6 @@ INSERT INTO rhnServerNeededCache
<write-mode name="delete_needed_cache_for_channel_packages">
<query params="channel_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache SNC
where (SNC.server_id, SNC.package_id) in
(select SNC.server_id, SNC.package_Id
@@ -268,7 +249,6 @@ DELETE FROM rhnServerNeededCache SNC
<write-mode name="delete_needed_cache_for_channel_errata">
<query params="channel_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache SNC
where (SNC.server_id, SNC.errata_id) in
( select SNC.server_id, SNC.errata_id
@@ -281,7 +261,6 @@ DELETE FROM rhnServerNeededCache SNC
<write-mode name="delete_needed_cache_for_errata_packages">
<query params="errata_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnServerNeededCache SNC
where ( SNC.errata_id, SNC.package_id) in
( select SNC.server_id, SNC.package_id
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
index 6dda01d..26f10ad 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
@@ -2,7 +2,6 @@
<mode name="active_org_admins">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT ugm.user_id
FROM rhnUserGroupMembers ugm
WHERE ugm.user_group_id = (SELECT id
@@ -19,7 +18,6 @@ SELECT ugm.user_id
<mode name="active_sat_admins">
<query params="">
-<!-- PGPORT_1:NO Change -->
SELECT ugm.user_id
FROM rhnUserGroupMembers ugm
WHERE ugm.user_group_id IN (SELECT id
@@ -35,7 +33,6 @@ SELECT ugm.user_id
<mode name="in_set"
class="com.redhat.rhn.frontend.dto.UserOverview">
<query params="user_id, set_label">
-<!-- PGPORT_1:NO Change -->
SELECT DISTINCT WC.id, WC.login_uc
FROM web_contact WC, rhnSet ST
WHERE ST.user_id = :user_id
@@ -48,7 +45,6 @@ ORDER BY WC.login_uc
<mode name="users_in_org"
class="com.redhat.rhn.frontend.dto.UserOverview">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT wc.id AS ID,
wc.login,
wc.login_uc,
@@ -62,7 +58,6 @@ ORDER BY wc.login_uc
<mode name="all_users_in_multiorg"
class="com.redhat.rhn.frontend.dto.MultiOrgAllUserOverview">
<query params="">
-<!-- PGPORT_1:NO Change -->
SELECT wc.id AS ID,
wc.login,
wc.org_id,
@@ -74,7 +69,6 @@ ORDER BY wc.login_uc
</mode>
<query name="all_users_in_multiorg_overview" params="">
-<!-- PGPORT_1:NO Change -->
SELECT UIOO.user_id as id, user_login, user_first_name, user_last_name,
rhn_user.check_role(user_id, 'org_admin') as org_admin,
rhn_user.check_role(user_id, 'satellite_admin') as sat_admin,
@@ -89,7 +83,6 @@ ORDER BY UPPER(user_login), UIOO.user_id
<mode name="users_in_multiorg"
class="com.redhat.rhn.frontend.dto.MultiOrgUserOverview">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT wc.id AS ID,
wc.login,
wc.login_uc
@@ -101,7 +94,6 @@ ORDER BY wc.login_uc
</mode>
<query name="users_in_multiorg_overview" params="">
-<!-- PGPORT_1:NO Change -->
SELECT UIOO.user_id as id, user_login, user_first_name, user_last_name,
rhn_user.check_role(user_id, 'org_admin') as org_admin,
wupi.email as address
@@ -113,7 +105,6 @@ ORDER BY UPPER(user_login), UIOO.user_id
<mode name="active_in_org"
class="com.redhat.rhn.frontend.dto.UserOverview">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT wce.id AS ID,
wce.login,
wce.login_uc
@@ -126,7 +117,6 @@ ORDER BY wce.login_uc
<mode name="disabled_in_org"
class="com.redhat.rhn.frontend.dto.UserOverview">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT wcd.id AS ID,
wcd.login,
wcd.login_uc
@@ -135,7 +125,6 @@ SELECT wcd.id AS ID,
ORDER BY wcd.login_uc
</query>
<elaborator params="">
-<!-- PGPORT_1:NO Change -->
SELECT UIOO.user_id as id, user_login, user_first_name, user_last_name, role_names,
last_logged_in, date_completed as change_date, WUPI.first_names as
changed_by_first_name,
WUPI.last_name as changed_by_last_name, 'disabled' as status
@@ -158,7 +147,6 @@ SELECT UIOO.user_id as id, user_login, user_first_name,
user_last_name, role_na
</callable-mode>
<query name="users_in_org_overview" params="">
- <!-- PGPORT_3:ORAFCE(NVL) -->
SELECT UIOO.user_id as id, user_login, user_first_name, user_last_name, role_names,
server_count, server_group_count, last_logged_in,
nvl((select
@@ -181,7 +169,6 @@ ORDER BY UPPER(user_login), UIOO.user_id
<mode name="default_system_groups">
<query params="user_id">
-<!-- PGPORT_1:NO Change -->
SELECT system_group_id
FROM rhnUserDefaultSystemGroups
WHERE user_id = :user_id
@@ -201,7 +188,6 @@ SELECT system_group_id
<write-mode name="delete_all_system_groups_for_user">
<query params="user_id">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnUserDefaultSystemGroups
WHERE user_id = :user_id
@@ -210,7 +196,6 @@ SELECT system_group_id
<write-mode name="set_system_group">
<query params="user_id, sgid">
-<!-- PGPORT_1:NO Change -->
INSERT
INTO rhnUserDefaultSystemGroups
(user_id, system_group_id)
@@ -226,7 +211,6 @@ SELECT system_group_id
<mode name="check_server_group_permissions">
<query params="user_id, server_group_id">
- <!-- PGPORT_2:AS KEYWORD -->
select wc.id user_id,
sg.id server_group_id
from rhnServerGroup sg,
@@ -253,7 +237,6 @@ SELECT system_group_id
<mode name="check_server_group_permissions_for_revoke">
<query params="user_id, server_group_id">
- <!-- PGPORT_1:NO CHANGE -->
select usgp.server_group_id, usgp.user_id
from rhnUserServerGroupPerms usgp
where usgp.server_group_id = :server_group_id
@@ -311,7 +294,6 @@ SELECT system_group_id
<mode name="user_count">
<query params="">
-<!-- PGPORT_1:NO Change -->
SELECT count(id) as user_count
FROM web_contact
</query>
@@ -319,7 +301,6 @@ SELECT count(id) as user_count
<mode name="get_user_id">
<query params="loginUc">
-<!-- PGPORT_1:NO Change -->
SELECT id as user_id
FROM web_contact
WHERE login_uc = :loginUc
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 73c0853..f23238c 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
@@ -124,7 +124,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
and parentChannel is null]]>
</query>
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
+
<sql-query name="Channel.findCustomBaseChannels">
<![CDATA[SELECT {c.*}
FROM rhnChannel {c},
@@ -155,7 +155,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
from com.redhat.rhn.domain.channel.Channel as c where c.parentChannel = :parent
]]>
</query>
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
+
<sql-query name="Channel.findByIdAndUserId">
<![CDATA[SELECT {c.*}
FROM rhnChannel {c},
@@ -165,7 +165,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
AND rhn_channel.user_role_check(c.id, :userId, 'subscribe') =
1]]>
<return alias="c"
class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
+
<sql-query name="Channel.findByLabelAndUserId">
<![CDATA[SELECT {c.*}
FROM rhnChannel {c},
@@ -176,6 +176,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<return alias="c"
class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
+<<<<<<<
HEAD:java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
<query name="Channel.findChannelIdsByLabels">
<![CDATA[SELECT c.id
FROM com.redhat.rhn.domain.channel.Channel c
@@ -183,6 +184,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
<!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
+=======
+>>>>>>> 5e147ad... PGPORT second set of query tagging
updates:java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
<sql-query name="Channel.findBaseChannel">
<![CDATA[SELECT {c.*}
FROM rhnChannel {c}, rhnChannelCloned c_1_, rhnServerChannel sc
@@ -197,6 +200,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[from com.redhat.rhn.domain.channel.ClonedChannel as c where c.org =
:org]]>
</query>
+<<<<<<<
HEAD:java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
<query name="Channel.packageInChannelAndErrata">
<![CDATA[
@@ -213,6 +217,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
+=======
+>>>>>>> 5e147ad... PGPORT second set of query tagging
updates:java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
<sql-query name="Channel.accessibleChildChannelIds">
<![CDATA[SELECT {c.*}
FROM rhnChannel c,
@@ -222,7 +228,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
AND c.id = c_1_.id (+) ]]>
<return alias="c"
class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
+
<sql-query name="Channel.accessibleChildChannels">
<![CDATA[SELECT {c.*}
FROM rhnChannel c,
@@ -232,12 +238,12 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
AND c.id = c_1_.id (+)]]>
<return alias="c"
class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="Channel.availableEntitlements">
<return-scalar type="long" column="entitlements"/>
<![CDATA[select rhn_channel.available_chan_subscriptions(:channel_id, :org_id)
as entitlements from dual]]>
</sql-query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="Channel.verifyLabel">
<return-scalar type="string" column="label"/>
<![CDATA[select label from rhnChannel where label = :label]]>
@@ -245,10 +251,9 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Channel.verifyName">
<return-scalar type="string" column="name"/>
- <!-- PGPORT_1:NO Change -->
<![CDATA[select name from rhnChannel where name = :name]]>
</sql-query>
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
+
<sql-query name="Channel.kickstartableChannels">
<![CDATA[SELECT {c.*}
FROM rhnChannel {c},
@@ -265,7 +270,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
]]>
<return alias="c"
class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="Channel.latestPackage">
<![CDATA[SELECT {p.*}
FROM rhnPackage {p},
@@ -306,25 +311,21 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Channel.getServerIds">
<return-scalar type="long" column="server_id"/>
- <!-- PGPORT_1:NO Change -->
<![CDATA[select server_id from rhnServerChannel where channel_id = :cid]]>
</sql-query>
<sql-query name="Channel.getPackageCount">
<return-scalar type="int" column="package_count"/>
- <!-- PGPORT_1:NO Change -->
<![CDATA[select count(*) as package_count from rhnChannelPackage cp where
cp.channel_id = :cid]]>
</sql-query>
<sql-query name="Channel.getPackageIdList">
<return-scalar type="long" column="package_id"/>
- <!-- PGPORT_1:NO Change -->
<![CDATA[select cp.package_id from rhnChannelPackage cp where cp.channel_id =
:cid]]>
</sql-query>
<sql-query name="Channel.lookupOriginalPackages">
- <!-- PGPORT_4:QUERY_REWRITE(RANK OVER PARTITION CLAUSE) -->
<![CDATA[
SELECT OLDEST.id
FROM (SELECT P.*,
@@ -347,14 +348,13 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
]]>
<return-scalar column="id" type="long"/>
</sql-query>
- <!-- PGPORT_1:NO Change -->
+
<query name="Channel.lookupOriginal">
<![CDATA[ select c.original
from com.redhat.rhn.domain.channel.ClonedChannel as c where c = :clone
]]>
</query>
<query name="Channel.findChannelArchLabelsSyncdChannels">
- <!-- PGPORT_1:NO Change -->
<![CDATA[select distinct c.channelArch.label from
com.redhat.rhn.domain.channel.Channel as c]]>
</query>
diff --git a/monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm
b/monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm
index 275cc4a..81bbf9f 100644
--- a/monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm
+++ b/monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm
@@ -14,7 +14,7 @@ sub run {
$params{ora_sid} = delete $params{sid_0};
my $ora = $args{data_source_factory}->oracle(%params);
- #PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $row = $ora->fetch_first(q{select count(*) as COUNT
from v$session_wait a, v$session b
where event = 'SQL*Net message from client'
diff --git a/monitoring/NPalert/NotificationDB.pm b/monitoring/NPalert/NotificationDB.pm
index 722f6dc..81e85a1 100644
--- a/monitoring/NPalert/NotificationDB.pm
+++ b/monitoring/NPalert/NotificationDB.pm
@@ -171,10 +171,8 @@ EOSQL
sub select_schedule_days {
##########################
my $self = shift;
- # PGPORT_1:NO Change #
my $table = 'RHN_SCHEDULE_DAYS';
my $sql = <<EOSQL;
-
SELECT
RECID, SCHEDULE_ID, ORD,
TO_CHAR(START_1,'HH24:MI') AS START_1,
@@ -198,7 +196,7 @@ sub select_global_redirects {
#############################
my $self = shift;
my $table = 'RHN_REDIRECTS';
- # PGPORT_1:NO Change #
+
my $fmt = DEF_DB_DATE_FMT;
my $sql = <<EOSQL;
SELECT
@@ -236,7 +234,7 @@ sub select_active_redirects {
#############################
my $self = shift;
my $table = 'RHN_REDIRECTS';
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
+
my $fmt = DEF_DB_DATE_FMT;
my $sql = <<EOSQL;
SELECT
@@ -296,7 +294,7 @@ EOSQL
push(@$arrayptr, 'e' . $_->{EMAIL_ADDRESS});
}
}
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
+
$table = 'RHN_REDIRECT_METHOD_TARGETS';
$table2 = 'RHN_REDIRECTS';
$sql = <<EOSQL;
@@ -321,7 +319,6 @@ EOSQL
push(@$arrayptr, 'i' . $_->{CONTACT_METHOD_ID});
}
}
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
$table = 'RHN_REDIRECT_GROUP_TARGETS';
$table2 = 'RHN_REDIRECTS';
$sql = <<EOSQL;
@@ -357,7 +354,7 @@ sub select_active_redirect_criteria {
my $self = shift;
my $table = 'RHN_REDIRECT_CRITERIA';
my $table2 = 'RHN_REDIRECTS';
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
+
my $sql = <<EOSQL;
SELECT
$table.RECID,
@@ -380,9 +377,7 @@ sub select_contact_groups {
###########################
my $self = shift;
my $table = 'RHN_CONTACT_GROUPS';
- # PGPORT_1:NO Change #
- my $sql = <<EOSQL;
-
+ my $sql = <<EOSQL;
select g.*,
(contact_strategy || ':' || ack_completed || 'Ack') as
strategy
from $table g,
@@ -401,7 +396,6 @@ sub select_contact_groups_and_members {
my %grouphash = map { $_->{MEMBERS} = []; $_->{'RECID'} => $_ }
@$groupptr;
my $table = 'RHN_CONTACT_GROUP_MEMBERS';
- # PGPORT_1:NO Change #
my $sql = <<EOSQL;
select *
from $table
@@ -446,7 +440,7 @@ sub select_customers_and_active_redirects {
sub select_schedule_and_zone_combos {
#####################################
my $self = shift;
- # PGPORT_4:QUERY_REWRITE(ANSI JOIN) #
+
my $table = 'RHN_CONTACT_METHODS';
my $support_table1 = 'RHNUSERINFO';
my $support_table2 = 'RHNTIMEZONE';
@@ -472,7 +466,7 @@ sub select_host_by_host_probe_id {
my $id = shift;
my $table = 'RHN_HOST_MONITORING';
my $table2 = 'RHN_HOST_PROBE';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT $table.*
FROM $table, $table2
@@ -494,7 +488,7 @@ sub select_service_probes_by_host_probe_id {
my $table2 = 'RHN_HOST_PROBE';
my $table3 = 'RHN_HOST_MONITORING';
my $table4 = 'RHN_CHECK_PROBE';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT $table.recid as recid,
$table.description as description
@@ -517,7 +511,7 @@ sub select_service_probes_by_host_id {
my $probe_table = 'RHN_PROBE';
my $host_table = 'RHN_HOST_MONITORING';
my $svc_ck_table = 'RHN_CHECK_PROBE';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT $probe_table.recid as recid,
$probe_table.description as description
@@ -539,7 +533,7 @@ sub select_URLs_by_customer_id {
my $id = shift;
my $table = 'RHN_URL_PROBE_ROLE';
my $table2 = 'RHN_URL_PROBE_STEP';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT
s.url_probe_id as url_probe_id,
@@ -565,7 +559,7 @@ sub select_host_probes_by_customer_id {
my $table = 'RHN_PROBE';
my $table2 = 'RHN_HOST_PROBE';
my $table3 = 'RHN_HOST_MONITORING';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
select $table.recid as recid,
$table3.name as host_name
@@ -588,7 +582,7 @@ sub select_scout_clusters_by_customer_id {
my $id = shift;
my $table = 'RHN_SAT_CLUSTER';
my $table2 = 'RHN_LL_NETSAINT';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT
recid,
@@ -611,7 +605,7 @@ sub select_sat_node_by_sat_cluster_id {
my $self = shift;
my $id = shift;
my $table = 'RHN_SAT_NODE';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT *
FROM $table
@@ -628,7 +622,7 @@ sub select_redirect_criteria_by_redirect_id {
my $self = shift;
my $id = shift;
my $table = 'RHN_REDIRECT_CRITERIA';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT *
FROM $table
@@ -645,7 +639,7 @@ sub select_current_alert_by_ticket_id {
my $self = shift;
my $id = shift;
my $table = 'RHN_CURRENT_ALERTS';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT *
FROM $table
@@ -664,7 +658,7 @@ sub select_contact_methods_by_customer_id {
my $id = shift;
my $table = 'RHN_CONTACT_METHODS';
my $table2 = 'RHN_CONTACT_MONITORING';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT $table.*
FROM $table, $table2
@@ -682,7 +676,7 @@ sub select_sat_clusters_by_customer_id {
my $self = shift;
my $id = shift;
my $table = 'RHN_SAT_CLUSTER';
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT *
FROM $table
@@ -789,7 +783,6 @@ sub select_max_last_update_date {
my ($self, $table) = @_;
my $fmt = SORTABLE_DB_DATE_FMT;
- # PGPORT_1:NO Change #
my $sql = <<EOSQL;
SELECT TO_CHAR(MAX(last_update_date),'$fmt') as last_update_date
FROM $table
@@ -923,7 +916,7 @@ sub _create {
}
} ## end foreach my $item (@$COLS)
my $BVSTR = join(',', @bindvars);
- # PGPORT_1:NO Change #
+
my $sql = "INSERT INTO $table ($COLSTR) VALUES ($BVSTR)";
return $self->execute($sql, $table, FETCH_ROWCOUNT, @bindvals);
@@ -935,7 +928,7 @@ sub _create_with_seq {
my ($self, $col, $seq, $table, %args) = @_;
my $x = 'DUAL';
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
my $sql = <<EOSQL;
SELECT $seq.NEXTVAL as id
FROM $x
@@ -977,13 +970,13 @@ sub _select_records {
if (%args) {
($wherephrase, $bindvals) = $self->_wherephrase($table, \%args);
- # PGPORT_1:NO Change #
+
$sql = <<EOSQL;
SELECT $selectphrase
FROM $table
WHERE $wherephrase
EOSQL
- # PGPORT_1:NO Change #
+
} else {
$sql = <<EOSQL;
SELECT $selectphrase
@@ -1026,7 +1019,7 @@ sub _delete_records {
my %args = @_;
my ($wherephrase, $bindvals) = $self->_wherephrase($table, \%args);
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
DELETE
FROM $table
@@ -1064,7 +1057,7 @@ sub _update_records {
my ($setphrase, $sbindvals) = $self->_wherephrase($table, $set, ',');
my ($wherephrase, $wbindvals) = $self->_wherephrase($table, \%args);
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
UPDATE $table
SET $setphrase
@@ -1140,7 +1133,7 @@ sub _select_table_description {
my ($self, @args) = @_;
my $table = 'ALL_TAB_COLUMNS';
- # PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG) #
+
my $sql = <<EOSQL;
SELECT
column_name,
@@ -1164,7 +1157,7 @@ sub _select_table_primary_keys {
my ($self, @args) = @_;
my $table = 'ALL_CONSTRAINTS';
- # PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG) #
+
my $sql = <<EOSQL;
SELECT ac.constraint_name,
ac.table_name,
@@ -1189,7 +1182,7 @@ EOSQL
sub dbIsOkay {
my $self = shift;
my $table = 'dual';
- # PGPORT_1:NO Change #
+
eval {
my $sql = <<EOSQL;
SELECT 1 as recid
diff --git a/monitoring/PerlModules/CPAN/DBD-Pg-0.95/test.pl
b/monitoring/PerlModules/CPAN/DBD-Pg-0.95/test.pl
index 4018600..c0cf466 100755
--- a/monitoring/PerlModules/CPAN/DBD-Pg-0.95/test.pl
+++ b/monitoring/PerlModules/CPAN/DBD-Pg-0.95/test.pl
@@ -128,7 +128,7 @@ my $attrs = $dbh->func('builtin',
'table_attributes');
######################### test various insert methods
# insert into table with $dbh->do($stmt)
- # PGPORT_1:NO Change #
+
$dbh->do("INSERT INTO builtin VALUES(
't',
'a',
@@ -146,7 +146,7 @@ $dbh->do("INSERT INTO builtin VALUES(
)") or die $DBI::errstr;
# insert into table with $dbh->prepare() with placeholders and
$dbh->execute(@bind_values)
- # PGPORT_1:NO Change #
+
( $sth = $dbh->prepare( "INSERT INTO builtin
( bool_, char_, char12_, char16_, varchar12_, text_, date_, int4_, int4a_, float8_,
point_, lseg_, box_ )
VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
@@ -189,7 +189,7 @@ $sth->execute (
) or die $DBI::errstr;
# insert into table with $dbh->do($stmt, @bind_values)
- # PGPORT_1:NO Change #
+
$dbh->do( "INSERT INTO builtin
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )",
{},
@@ -225,7 +225,7 @@ my $pg_cmd_status = $sth->{pg_cmd_status};
######################### test various select methods
# select from table using input parameters and and various fetchrow methods
- # PGPORT_1:NO Change #
+
$sth = $dbh->prepare("SELECT * FROM builtin where int4_ < ? + ?") or die
$DBI::errstr;
( $sth->bind_param(1, '4000', DBI::SQL_INTEGER) )
@@ -304,7 +304,7 @@ $sth->fetch or die $DBI::errstr;
$sth->finish or die $DBI::errstr;
# select from table using input parameters
- # PGPORT_1:NO Change #
+
$sth = $dbh->prepare( "SELECT * FROM builtin where char16_ = ?" ) or die
$DBI::errstr;
my $string = q{quote \ ' this};
@@ -328,9 +328,9 @@ my $rows = $sth->rows;
$sth->finish or die $DBI::errstr;
######################### test copy to/from stdout/stdin
- # PGPORT_1:NO Change #
+
$dbh->do( "DELETE FROM builtin" ) or die $DBI::errstr;
- # PGPORT_1:NO Change #
+
$dbh->do( "COPY builtin FROM STDIN" ) or die $DBI::errstr;
my $ret;
@@ -344,7 +344,7 @@ $dbh->func('endcopy');
( 1 == $ret )
and print "\$dbh->func(putline) ........ ok\n"
or print "\$dbh->func(putline) ........ not ok: ", $ret,
"\n";
- # PGPORT_1:NO Change #
+
$dbh->do( "COPY builtin TO STDOUT" ) or die $DBI::errstr;
my $buf = '';
$ret = 0;
diff --git a/monitoring/PerlModules/NP/NOT-USED/ReleaseDB/ReleaseDB.pm
b/monitoring/PerlModules/NP/NOT-USED/ReleaseDB/ReleaseDB.pm
index b0242b9..5236d48 100644
--- a/monitoring/PerlModules/NP/NOT-USED/ReleaseDB/ReleaseDB.pm
+++ b/monitoring/PerlModules/NP/NOT-USED/ReleaseDB/ReleaseDB.pm
@@ -150,7 +150,7 @@ sub expand_macro {
my @bindvals;
$self->_check_reqs(['MACRO_NAME'], \%args);
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT component_class, component_name
FROM macro_component
@@ -196,7 +196,6 @@ sub select_all_cvs_paths {
###############################
my $self = shift;
my @bindvals;
- # PGPORT_4:QUERY_REWRITE(UNIQUE) #
my $sql = <<EOSQL;
SELECT UNIQUE CVS_PATH
FROM COMPONENT
@@ -227,7 +226,7 @@ sub select_release_components {
$self->_check_reqs($pk, \%args);
my($wherephrase, $bindvals) = $self->_wherephrase(\%args);
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT BOX_TYPE, BOX_NAME, VERSION, RELEASE_NUMBER,
rcv.COMPONENT_CLASS as COMPONENT_CLASS,
@@ -260,7 +259,7 @@ sub select_current_component_version {
$args{'CVS_BRANCH'} ||= DBRANCH;
my($wherephrase, $bindvals) = $self->_wherephrase(\%args);
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT *
FROM component_version cv
@@ -297,7 +296,7 @@ sub select_current_macro_versions {
$self->_check_reqs(['MACRO_NAME'], \%args);
$args{'CVS_BRANCH'} ||= DBRANCH;
- # PGPORT_5:POSTGRES_VERSION_QUERY(START WITH CONNECT BY CLAUSE) #
+
my $sql = <<EOSQL;
SELECT *
FROM component_version outer
@@ -421,7 +420,7 @@ sub verify_macro_components {
"Cannot verify '$args{'MACRO_NAME'}': nonexistent macro\n"
) unless ($rec);
- # PGPORT_1:NO Change #
+
# 2) Verify all non-macro components;
my $sql = <<EOSQL;
SELECT mc.component_class, mc.component_name
@@ -549,7 +548,6 @@ sub make_branch {
$self->_check_reqs([qw(CVS_BRANCH)], \%args);
# 1) Bail out if the branch already exists
- # # PGPORT_1:NO Change #
my $sql = <<EOSQL;
SELECT count(*) as RECORDS
FROM component_version
@@ -567,7 +565,6 @@ EOSQL
# 2) Create branch by copying COMPONENT_VERSION
# records from the trunk to the branch
- # PGPORT_1:NO Change #
$sql = <<EOSQL;
INSERT INTO component_version (
COMPONENT_CLASS, COMPONENT_NAME, COMPONENT_VERSION, SORT_STRING,
@@ -605,7 +602,6 @@ sub merge_branch {
$self->_check_reqs([qw(CVS_BRANCH)], \%args);
# 1) Bail out if the trunk doesn't exist
- # PGPORT_1:NO Change #
my $sql = <<EOSQL;
SELECT count(*) as RECORDS
FROM component_version
@@ -634,7 +630,7 @@ EOSQL
# Situation b) is indicated when the latest version on the trunk
# exists on the branch and is not equal to the latest version on
# the branch.
- # PGPORT_1:NO Change #
+
$sql = <<EOSQL;
INSERT INTO component_version (
COMPONENT_CLASS, COMPONENT_NAME, COMPONENT_VERSION, SORT_STRING,
@@ -698,7 +694,6 @@ sub copy_to_branch {
my($wherephrase, $bindvals) = $self->_wherephrase(\%args);
# Copy a single component version to a branch.
- # PGPORT_1:NO Change #
my $sql = <<EOSQL;
INSERT INTO component_version (
COMPONENT_CLASS, COMPONENT_NAME, COMPONENT_VERSION, SORT_STRING,
@@ -732,7 +727,6 @@ sub delete_whole_release {
my($wherephrase, $bindvals) = $self->_wherephrase(\%args);
# 1) Delete release_component_version records
- # PGPORT_1:NO Change #
my $sql = <<EOSQL;
DELETE FROM release_component_version
WHERE $wherephrase
@@ -742,7 +736,6 @@ EOSQL
# 2) Delete release record
- # PGPORT_1:NO Change #
$sql = <<EOSQL;
DELETE FROM release
WHERE $wherephrase
@@ -944,7 +937,6 @@ sub _create {
$fields{$col} = $DEFAULT->{$col} unless (exists($fields{$col}));
if ($DEFAULT->{$col} eq 'sysdate') {
# Fancy stuff for sysdate
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
push(@bindvars,
"DECODE(?, 'sysdate', sysdate, TO_DATE(?, 'YYYY-MM-DD
HH24:MI:SS'))");
push(@bindvals, $fields{$col}, $fields{$col});
@@ -988,7 +980,7 @@ sub _select_records {
my %args = @_;
my($wherephrase, $bindvals) = $self->_wherephrase(\%args);
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
SELECT *
FROM $table
@@ -1025,7 +1017,7 @@ sub _delete_records {
my %args = @_;
my($wherephrase, $bindvals) = $self->_wherephrase(\%args);
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
DELETE
FROM $table
@@ -1067,7 +1059,7 @@ sub _update_records {
my($setphrase, $sbindvals) = $self->_wherephrase($set, ',');
my($wherephrase, $wbindvals) = $self->_wherephrase(\%args);
- # PGPORT_1:NO Change #
+
my $sql = <<EOSQL;
UPDATE $table
SET $setphrase
diff --git a/monitoring/PerlModules/NP/NOT-USED/ReleaseDB/test/TestRelease.pm
b/monitoring/PerlModules/NP/NOT-USED/ReleaseDB/test/TestRelease.pm
index 689e8a5..d9cdca6 100644
--- a/monitoring/PerlModules/NP/NOT-USED/ReleaseDB/test/TestRelease.pm
+++ b/monitoring/PerlModules/NP/NOT-USED/ReleaseDB/test/TestRelease.pm
@@ -49,7 +49,6 @@ sub test_constructor {
# Make sure we can talk to the database (autoconnect is on
# by default)
- #PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
my $rv = $rdb->execute('SELECT sysdate FROM dual', [qw(dual)],
FETCH_SINGLE);
$self->assert(keys %$rv);
@@ -459,7 +458,6 @@ sub test_macro_verification {
my $rv = $rdb->verify_macro_components(MACRO_NAME => 'TOP_MACRO');
# Now delete the COMPONENT_VERSION records for a component and try again
- #PGPORT_1:NO Change
$rv = $rdb->execute("DELETE FROM component_version
WHERE component_name = ?",
'component_version', FETCH_ROWCOUNT,
diff --git a/monitoring/PerlModules/NP/NOT-USED/TroubleTicket/TroubleTicket.pm
b/monitoring/PerlModules/NP/NOT-USED/TroubleTicket/TroubleTicket.pm
index b838075..b44dd1f 100644
--- a/monitoring/PerlModules/NP/NOT-USED/TroubleTicket/TroubleTicket.pm
+++ b/monitoring/PerlModules/NP/NOT-USED/TroubleTicket/TroubleTicket.pm
@@ -535,7 +535,6 @@ sub setCaseNumber {
$@ = $DBI::errstr ; return undef }
# Prepare the statement handle
- # #PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE
my $sql_statement = sprintf<<EOSQL;
SELECT MAX(case_num)
FROM hd_problem
diff --git a/monitoring/PerlModules/NP/Probe/Utils/gencmdsql.pl
b/monitoring/PerlModules/NP/Probe/Utils/gencmdsql.pl
index b135b6a..d631469 100755
--- a/monitoring/PerlModules/NP/Probe/Utils/gencmdsql.pl
+++ b/monitoring/PerlModules/NP/Probe/Utils/gencmdsql.pl
@@ -99,7 +99,6 @@ sub command_sql {
my @text = ("\n");
push @text, "prompt command_class $command_class\n";
- # PGPORT_3:ORAFCE(DUAL) #
push @text, "
insert into command_class(class_name) select '$command_class' from dual
where not exists (
diff --git a/scripts/ncsu-rhntools/rhnstats/rhndb.py
b/scripts/ncsu-rhntools/rhnstats/rhndb.py
index 7a73149..e991020 100644
--- a/scripts/ncsu-rhntools/rhnstats/rhndb.py
+++ b/scripts/ncsu-rhntools/rhnstats/rhndb.py
@@ -27,7 +27,6 @@ class RHNStore(object):
self.conn.commit()
def addSystem(self, system):
- #PGPORT_1:NO Change
q1 = """select clientid from CLIENTS where rhnsid =
%s"""
q2 = """insert into CLIENTS (rhnsid, name, lastcheckin) values
(%s, %s, %s)"""
@@ -47,7 +46,6 @@ class RHNStore(object):
return self.c.fetchone()[0]
def addGroup(self, grp):
- #PGPORT_1:NO Change
q1 = """select groupid from GROUPINFO where rhnsid =
%s"""
q2 = """insert into GROUPINFO (rhnsid, name) values (%s,
%s)"""
@@ -63,13 +61,12 @@ class RHNStore(object):
return self.c.fetchone()[0]
def subscribeGroup(self, clientid, groupids):
- #PGPORT_1:NO Change
q1 = """delete from GROUPS where clientid = %s"""
self.c.execute(q1, (clientid,))
if len(groupids) == 0:
return
- #PGPORT_1:NO Change
+
q2 = """insert into GROUPS (clientid, groupid) values (%s,
%s)"""
for id in groupids:
self.c.execute(q2, (clientid, id))
@@ -81,7 +78,7 @@ class RHNStore(object):
q = "clientid = %s"
else:
q = q + " or clientid = %s"
- #PGPORT_1:NO Change
+
q1 = """update CLIENTS set rl = 0"""
q2 = """update CLIENTS set rl = 1 where """ + q
@@ -95,13 +92,13 @@ class RHNStore(object):
q = "clientid = %s"
else:
q = q + " or clientid = %s"
- #PGPORT_1:NO Change
+
q1 = """update CLIENTS set active = 0"""
q2 = """update CLIENTS set active = 1 where """ +
q
self.c.execute(q1, ())
self.c.execute(q2, clients)
- #PGPORT_1:NO Change
+
def getGroups(self):
q = "select groupid from GROUPINFO"
@@ -113,7 +110,7 @@ class RHNStore(object):
ret = self.c.fetchone()
return list
- #PGPORT_1:NO Change
+
def getGroupName(self, gid):
q = "select name from GROUPINFO where groupid = %s"
@@ -124,7 +121,7 @@ class RHNStore(object):
return None
else:
return ret[0]
- #PGPORT_1:NO Change
+
def getTotalRLCount(self):
q = "select count(*) from CLIENTS where rl = 1 and active = 1"
@@ -132,7 +129,7 @@ class RHNStore(object):
ret = self.c.fetchone()
return ret[0]
- #PGPORT_1:NO Change
+
def getTotalCount(self):
q = "select count(*) from CLIENTS where active = 1"
@@ -140,7 +137,7 @@ class RHNStore(object):
ret = self.c.fetchone()
return ret[0]
- #PGPORT_1:NO Change
+
def getGroupRLCount(self, gid):
q = """select count(*) from GROUPS, CLIENTS where
GROUPS.clientid = CLIENTS.clientid and
@@ -152,7 +149,7 @@ class RHNStore(object):
ret = self.c.fetchone()
return ret[0]
- #PGPORT_1:NO Change
+
def getGroupCount(self, gid):
q = """select count(*) from GROUPS, CLIENTS where
GROUPS.clientid = CLIENTS.clientid and
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm
b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 912569c..cffa436 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -426,7 +426,7 @@ sub clear_db {
system_debug('/sbin/service tsdb_local_queue stop');
print loc("** Database: Services stopped. Clearing DB.\n");
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $select_sth = $dbh->prepare(<<EOQ);
SELECT 'drop ' || UO.object_type ||' '|| UO.object_name AS DROP_STMT
FROM user_objects UO
@@ -547,7 +547,7 @@ sub answered {
sub get_nls_database_parameters {
my $answers = shift;
my $dbh = get_dbh($answers);
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT NDP.parameter, NDP.value
FROM nls_database_parameters NDP
@@ -786,7 +786,7 @@ sub postgresql_populate_db {
sub postgresql_test_db_schema {
my $answers = shift;
my $dbh = get_dbh($answers);
- #PGPORT_1:NO Change
+
# Assumption, if web_customer table exists then schema exists:
my $sth = $dbh->prepare("SELECT tablename from pg_tables where
schemaname='public' and tablename='web_customer'");
@@ -809,7 +809,6 @@ sub postgresql_clear_db {
# TODO: This is no good, we're using schemas to replicate packages, these
# too need to be deleted and the list is too large to maintain...
- # #PGPORT_1:NO Change
my $sth = $dbh->prepare("DROP SCHEMA public CASCADE");
$sth->execute;
@@ -1080,7 +1079,7 @@ sub oracle_check_db_privs {
my $answers = shift;
my $dbh = get_dbh($answers);
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT DISTINCT privilege
FROM (
@@ -1145,7 +1144,7 @@ sub oracle_check_db_tablespace_settings {
my $tablespace_name = oracle_get_default_tablespace_name($answers);
my $dbh = get_dbh($answers);
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT UT.status, UT.contents, UT.logging
FROM user_tablespaces UT
@@ -1298,7 +1297,7 @@ sub oracle_test_db_schema {
my $answers = shift;
my $dbh = get_dbh($answers);
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<'EOQ');
SELECT 1
FROM user_objects
@@ -1360,7 +1359,7 @@ sub oracle_get_default_tablespace_name {
my $answers = shift;
my $dbh = get_dbh($answers);
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT UU.default_tablespace
FROM user_users UU
diff --git a/web/modules/rhn/RHN/DB/Action.pm b/web/modules/rhn/RHN/DB/Action.pm
index 71e8611..d7498b7 100644
--- a/web/modules/rhn/RHN/DB/Action.pm
+++ b/web/modules/rhn/RHN/DB/Action.pm
@@ -53,7 +53,7 @@ sub script_server_results {
my $dbh = RHN::DB->connect;
my $query;
my $sth;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
SELECT ASR.output,
TO_CHAR(ASR.start_date, 'YYYY-MM-DD HH24:MI:SS') AS START_DATE,
@@ -84,7 +84,7 @@ sub is_type_of {
my $query;
my $sth;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
SELECT 1
FROM DUAL
@@ -116,7 +116,7 @@ sub get_server_status {
my $query;
my $sth;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
SELECT AST.name
FROM rhnActionStatus AST, rhnServerAction SA
@@ -169,7 +169,7 @@ sub associated_errata {
my $query;
my $sth;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
SELECT errata_id FROM rhnActionErrataUpdate WHERE action_id = ?
EOQ
@@ -190,7 +190,7 @@ sub cancel_pending_for_system {
my %params = validate(@_, {server_id => 1, transaction => 0});
my $dbh = $params{transaction} || RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $sth = $dbh->prepare(<<EOQ);
DECLARE
@@ -246,7 +246,7 @@ sub delete_set_from_action {
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
DECLARE
@@ -278,7 +278,7 @@ sub delete_system_from_action_set {
my $set_name = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
DECLARE
@@ -316,7 +316,7 @@ sub archive_actions {
my $dbh = RHN::DB->connect;
my $sth;
- # PGPORT_1:NO Change #
+
my $query =<<EOQ;
UPDATE rhnAction
SET archived = 1
@@ -449,7 +449,7 @@ sub get_top_of_action_chain {
sub next_action_in_chain {
my $self = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOQ);
SELECT A.id
@@ -478,7 +478,7 @@ sub action_is_for_server {
my $query;
my $sth;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
SELECT 1
FROM rhnServerAction SA
diff --git a/web/modules/rhn/RHN/DB/ConfigChannel.pm
b/web/modules/rhn/RHN/DB/ConfigChannel.pm
index d9e5b4b..e48fa2d 100644
--- a/web/modules/rhn/RHN/DB/ConfigChannel.pm
+++ b/web/modules/rhn/RHN/DB/ConfigChannel.pm
@@ -92,7 +92,6 @@ sub lookup {
push @exec_params, $attr{org_id}, $attr{label};
}
elsif ($attr{cfid}) {
- # PGPORT_1:NO Change #
$query = $j->select_query("CC.id = (SELECT CF.config_channel_id FROM
rhnConfigFile CF WHERE CF.id = ?)");
push @exec_params, $attr{cfid};
}
@@ -144,7 +143,7 @@ sub set_type {
my $type = shift || '';
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
SELECT CCT.id, CCT.label, CCT.name
FROM rhnConfigChannelType CCT
@@ -236,7 +235,7 @@ sub find_server_config_channel {
my $class = shift;
my $server_id = shift;
my $type = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOQ);
SELECT CC.id
@@ -275,7 +274,7 @@ sub add_server_config_channel {
$cc->type_label($type_label);
$cc->org_id($server->org_id);
$dbh = $cc->commit($dbh);
- # PGPORT_1:NO Change #
+
my $sth = $dbh->prepare(<<EOQ);
INSERT
INTO rhnServerConfigChannel
@@ -299,7 +298,7 @@ EOQ
sub lookup_channel_type {
my $class = shift;
my $label = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOQ);
SELECT id
@@ -319,7 +318,7 @@ EOQ
sub find_file_existence {
my $self = shift;
my $path = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOQ);
SELECT CF.id
@@ -369,7 +368,7 @@ sub vivify_file_existence {
sub find_overriding_system {
my $self = shift;
- # PGPORT_1:NO Change #
+
my $sth = RHN::DB->connect->prepare(<<EOS);
SELECT SCC.server_id
FROM rhnServerConfigChannel SCC,
@@ -433,7 +432,6 @@ sub lookup_latest_in_channel {
my %query_params;
if ($params{file_id}) {
- # PGPORT_1:NO Change #
$query = <<EOQ;
SELECT CF.latest_config_revision_id
FROM rhnConfigFile CF
@@ -442,7 +440,6 @@ SELECT CF.latest_config_revision_id
EOQ
}
elsif ($params{file_path}) {
- # PGPORT_1:NO Change #
$query = <<EOQ;
SELECT CF.latest_config_revision_id
FROM rhnConfigFile CF,
diff --git a/web/modules/rhn/RHN/DB/ConfigRevision.pm
b/web/modules/rhn/RHN/DB/ConfigRevision.pm
index 7796a06..1765b9c 100644
--- a/web/modules/rhn/RHN/DB/ConfigRevision.pm
+++ b/web/modules/rhn/RHN/DB/ConfigRevision.pm
@@ -40,7 +40,6 @@ sub lookup {
my %params = validate(@_, {id => 1});
my $dbh = RHN::DB->connect();
- # PGPORT_2:AS KEYWORD #
my $query = <<EOS;
SELECT
CR.*,
@@ -99,7 +98,6 @@ sub create_config_contents {
my $dbh = RHN::DB->connect;
my $sth;
- # PGPORT_1:NO Change #
$sth = $dbh->prepare(<<EOS);
INSERT INTO rhnConfigContent
(id, md5sum, file_size, contents)
@@ -127,7 +125,7 @@ sub getFileTypeId {
#default to file for now...
$filetype = "file";
}
- # PGPORT_1:NO Change #
+
my $query = <<EOS;
SELECT FT.id
FROM rhnConfigFileType FT
@@ -177,7 +175,7 @@ EOS
$sth->execute_h(cfid => $self->config_file_id, ccid => $ccid, ciid =>
$ciid, crid => \$crid,
revision => $self->revision, delim_start => $self->delim_start, delim_end
=> $self->delim_end,
filetype => $cftid);
- # PGPORT_1:NO Change #
+
$dbh->do_h("UPDATE rhnConfigFile SET latest_config_revision_id = :crid WHERE id
= :cfid",
crid => $crid, cfid => $self->config_file_id);
@@ -192,7 +190,7 @@ sub commit_binary_flag {
my $tx = shift;
my $dbh = $tx || RHN::DB->connect;
- # PGPORT_1:NO Change #
+
$dbh->do_h("UPDATE rhnConfigContent SET is_binary = :flag WHERE id =
:ccid",
ccid => $self->config_content_id, flag => $self->is_binary ?
'Y' : 'N');
@@ -222,7 +220,7 @@ sub contents {
if (@_) {
return $self->set_contents(@_);
}
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare("SELECT CCon.contents FROM rhnConfigContent CCon WHERE
id = :ccid");
$sth->execute_h(ccid => $self->config_content_id);
@@ -244,7 +242,6 @@ sub find_alternate_in_namespace {
my $ccid = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
SELECT target_CFR.id AS id, target_CFR.revision
FROM rhnConfigFile current_CF,
@@ -305,7 +302,6 @@ sub next_revision {
my $self = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOS);
SELECT MAX(CR.revision)
FROM rhnConfigRevision CR,
@@ -326,7 +322,6 @@ sub lookup_action_data {
my %params = validate(@_, {acrid => 1} );
my $dbh = RHN::DB->connect;
- # PGPORT_4:QUERY_REWRITE(ANSI JOIN) #
my $sth = $dbh->prepare(<<EOQ);
SELECT ACR.id,
ACR.action_id,
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
index 5c70434..2c7866d 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
@@ -2,7 +2,6 @@
<mode name="events_in_set">
<query params="set_label, user_id, sid">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN),ORAFCE(NVL) -->
SELECT SA.action_id AS ID,
AType.name || ' scheduled by ' || NVL(U.login, '(none)') AS
SUMMARY,
TO_CHAR(A.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS SCHEDULED_FOR,
@@ -29,7 +28,6 @@ SELECT SA.action_id AS ID,
<mode name="system_events_history">
<query params="sid">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN),AS KEYWORD -->
SELECT EVENT_ID,
TO_CHAR(CREATED, 'YYYY-MM-DD HH24:MI:SS') CREATED,
TO_CHAR(PICKED_UP, 'YYYY-MM-DD HH24:MI:SS') PICKED_UP,
@@ -75,7 +73,6 @@ ORDER BY COMPLETED DESC, PICKED_UP DESC, CREATED DESC, EVENT_ID DESC
<mode name="system_events_pending">
<query params="sid">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN),ORAFCE(NVL) -->
SELECT SA.action_id AS ID,
AType.name || ' scheduled by ' || NVL(U.login, '(none)')
AS SUMMARY,
TO_CHAR(A.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS
SCHEDULED_FOR,
@@ -102,8 +99,7 @@ ORDER BY SCHEDULED_FOR DESC, ID DESC
<mode name="supported_system_history">
- <query params="support_sid">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN),ORAFCE(NVL),AS KEYWORD -->
+ <query params="support_sid">
SELECT EVENT_ID, TO_CHAR(CREATED, 'YYYY-MM-DD HH24:MI:SS') CREATED, SUMMARY
FROM (SELECT SH.id EVENT_ID,
SH.summary SUMMARY,
@@ -130,7 +126,6 @@ ORDER BY CREATED DESC, EVENT_ID DESC
</mode>
<query name="action_overview_elab" params="user_id, org_id"
multiple="t">
-<!-- PGPORT_1:NO Change -->
SELECT UAO.id,
UAO.action_status,
UAO.tally
@@ -142,7 +137,6 @@ SELECT UAO.id,
<mode name="pending_action_list">
<query params="user_id, org_id">
- <!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
TO_CHAR(UAO.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS EARLIEST,
UAO.type_name,
@@ -163,7 +157,6 @@ ORDER BY EARLIEST DESC
<mode name="completed_action_list">
<query params="user_id, org_id">
- <!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
TO_CHAR(UAO.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS EARLIEST,
UAO.type_name,
@@ -184,7 +177,6 @@ ORDER BY EARLIEST DESC
<mode name="failed_action_list">
<query params="user_id, org_id">
- <!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
TO_CHAR(UAO.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS EARLIEST,
UAO.type_name,
@@ -205,7 +197,6 @@ ORDER BY EARLIEST DESC
<mode name="archived_action_list">
<query params="user_id, org_id">
- <!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT DISTINCT UAO.id AS ID,
TO_CHAR(UAO.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS EARLIEST,
UAO.type_name,
@@ -222,7 +213,6 @@ ORDER BY EARLIEST DESC
<mode name="actions_for_system_named">
<query params="sid, action_name">
-<!-- PGPORT_1:NO Change -->
SELECT SA.action_id AS ID,
TO_CHAR(A.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS SCHEDULED_FOR,
AType.label AS history_type,
@@ -245,7 +235,6 @@ ORDER BY A.created DESC, ID DESC
<mode name="server_status">
<query params="aid">
-<!-- PGPORT_1:NO Change -->
SELECT SA.SERVER_ID AS ID,
SA.STATUS AS STATUS_ID,
SA.RESULT_CODE,
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/ConfigChannel_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/ConfigChannel_queries.xml
index f3910e8..d738443 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/ConfigChannel_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/ConfigChannel_queries.xml
@@ -2,7 +2,6 @@
<mode name="comparison_to_snapshot">
<query params="">
-<!-- PGPORT_1:NO Change -->
SELECT 1 FROM DUAL
<!-- dummy -->
</query>
@@ -10,7 +9,6 @@ SELECT 1 FROM DUAL
<mode name="namespaces_visible_to_org">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id,
CC.org_id,
CC.name,
@@ -26,7 +24,6 @@ SELECT CC.id,
ORDER BY UPPER(CC.name)
</query>
<elaborator params="">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id AS ID,
(SELECT count(config_file_id)
FROM rhnConfigRevision CR,
@@ -39,7 +36,6 @@ SELECT CC.id AS ID,
WHERE CC.id IN (%s)
</elaborator>
<elaborator params="user_id">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id AS ID,
(SELECT count(SCC.server_id)
FROM rhnServerConfigChannel SCC,
@@ -55,7 +51,6 @@ SELECT CC.id AS ID,
<mode name="namespaces_visible_to_user">
<query params="org_id, user_id">
- <!-- PGPORT_3:ORAFCE(NVL) -->
SELECT CC.id,
CC.org_id,
CC.name,
@@ -79,7 +74,6 @@ GROUP BY CC.id, CC.org_id, CC.name, CC.label, CC.description,
CC.created, CC.mod
ORDER BY UPPER(CC.name)
</query>
<elaborator params="user_id">
- <!-- PGPORT_1:NO Change -->
SELECT CC.id AS ID,
(SELECT count(SCC.server_id)
FROM rhnServerConfigChannel SCC,
@@ -95,7 +89,6 @@ SELECT CC.id AS ID,
<mode name="rank_namespaces_for_system">
<query params="sid">
- <!-- PGPORT_4:QUERY_REWRITE(ROWNUM),AS KEYWORD -->
SELECT
id,
org_id,
@@ -133,7 +126,6 @@ ORDER BY CCT.priority, SCC.position
<mode name="namespaces_for_system">
<query params="sid">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id,
CC.org_id,
CC.name,
@@ -155,7 +147,6 @@ ORDER BY CCT.priority, SCC.position
<mode name="namespaces_for_snapshot">
<query params="ss_id">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id,
CC.org_id,
CC.name,
@@ -177,7 +168,6 @@ SELECT CC.id,
<mode name="normal_namespaces_for_system">
<query params="sid">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id,
CC.org_id,
CC.name,
@@ -200,7 +190,6 @@ ORDER BY CCT.priority, SCC.position
<mode name="normal_namespaces_for_snapshot">
<query params="ss_id">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id,
CC.org_id,
CC.name,
@@ -222,7 +211,6 @@ SELECT CC.id,
<mode name="available_namespaces_for_system">
<query params="sid, org_id">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id, CC.org_id, CC.name, CC.label, CC.description, CC.created, CC.modified
FROM rhnConfigChannel CC
WHERE CC.org_id = :org_id
@@ -233,7 +221,6 @@ ORDER BY UPPER(CC.name)
<mode name="namespaces_with_filename">
<query params="cfnid, org_id">
-<!-- PGPORT_1:NO Change -->
SELECT CC.id, CC.name, CC.label, CR.revision AS revision, CR.id AS crid,
(SELECT count(SCC.server_id) FROM rhnServerConfigChannel SCC WHERE
SCC.config_channel_id = CC.id) AS SYSTEM_COUNT
FROM rhnConfigChannel CC, rhnConfigRevision CR, rhnConfigFile CF
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
index dc3f23c..9adb6f7 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
@@ -2,7 +2,6 @@
<mode name="comparison_to_snapshot">
<query params="">
- <!-- PGPORT_3:ORAFCE(DUAL) -->
SELECT 1 FROM DUAL
<!-- dummy -->
</query>
@@ -11,7 +10,6 @@ SELECT 1 FROM DUAL
<mode name="system_snapshot_group_list">
<query params="user_id, sid, ss_id">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
SELECT SG.id,
SG.name AS GROUP_NAME,
SGT.label AS GROUP_TYPE_LABEL,
@@ -30,7 +28,6 @@ SELECT SG.id,
<query name="visible_to_user_overview_fast" params="org_id,
user_id">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN),ORAFCE(DECODE),AS KEYWORD -->
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
GO.GROUP_ID AS ID, GROUP_NAME, GROUP_ADMINS, SERVER_COUNT,
NOTE_COUNT, GO.MODIFIED, GO.MAX_MEMBERS,
@@ -52,7 +49,6 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
</query>
<query name="visible_to_user_overview_slow" params="org_id,
user_id">
- <!-- PGPORT_3:ORAFCE(NVL) -->
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
GO.GROUP_ID AS ID, GROUP_NAME, GROUP_ADMINS, SERVER_COUNT,
NOTE_COUNT, GO.MODIFIED, GO.MAX_MEMBERS,
@@ -67,7 +63,6 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
<query name="visible_to_user_ids" params="user_id">
- <!-- PGPORT_4:QUERY_REWRITE(ORDER BY) -->
SELECT DISTINCT SG.id AS ID, SG.name AS GROUP_NAME
FROM rhnServerGroup SG, rhnUserManagedServerGroups UMSG
WHERE UMSG.user_id = :user_id
@@ -84,7 +79,6 @@ ORDER BY UPPER(NAME)
<mode name="visible_groups_summary">
<query params="org_id, user_id">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN),ORAFCE(DECODE),AS KEYWORD -->
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
GO.GROUP_ID AS ID, GROUP_NAME, GROUP_ADMINS, SERVER_COUNT,
NOTE_COUNT, GO.MODIFIED, GO.MAX_MEMBERS,
@@ -110,7 +104,6 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
<mode name="groups_a_system_is_in">
<query params="sid, org_id, user_id">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
SELECT VSGM.group_id AS ID,
SG.name AS GROUP_NAME,
SGT.label AS GROUP_TYPE_LABEL,
@@ -131,7 +124,6 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
<mode name="groups_a_system_is_in_unsafe">
<query params="sid, org_id">
-<!-- PGPORT_1:NO Change -->
SELECT SGM.group_id AS ID,
SG.name AS GROUP_NAME
FROM rhnServerGroup SG,
@@ -146,7 +138,6 @@ ORDER BY UPPER(SG.name)
<mode name="user_permissions">
<query params="formvar_uid, org_id">
-<!-- PGPORT_1:NO Change -->
SELECT SG.id, SG.name AS GROUP_NAME,
NVL((SELECT MAX(1)
FROM rhnUserServerGroupPerms USGP
@@ -161,7 +152,6 @@ ORDER BY UPPER(SG.name), SG.id
<mode name="ssm_group_membership_select">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT SGO.group_id ID, SGO.group_name
FROM rhnServerGroup SG, rhnServerGroupOverview SGO
WHERE SGO.org_id = :org_id
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
index 748f313..a39c62c 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
@@ -2,7 +2,6 @@
<mode name="system_probes">
<query params="sid">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
SELECT P.recid AS ID,
P.probe_type,
P.customer_id AS ORG_ID,
@@ -36,7 +35,6 @@ SELECT P.recid AS ID,
<mode name="command_groups">
<query params="">
-<!-- PGPORT_1:NO Change -->
SELECT GROUP_NAME AS COMMAND_GROUP_NAME,
DESCRIPTION AS COMMAND_GROUP_LABEL
FROM rhn_command_groups
@@ -47,7 +45,6 @@ ORDER BY UPPER(GROUP_NAME)
<mode name="enabled_commands_for_group">
<query params="command_group_label">
-<!-- PGPORT_1:NO Change -->
SELECT recid AS ID,
description AS COMMAND_NAME,
name AS COMMAND_LABEL
@@ -60,7 +57,6 @@ ORDER BY UPPER(description)
<mode name="parameters_for_command">
<query params="command_id">
-<!-- PGPORT_1:NO Change -->
SELECT command_id,
param_name,
param_type,
@@ -85,7 +81,6 @@ ORDER BY PARAM_TYPE, FIELD_ORDER
<mode name="clusters_for_customer">
<query params="customer_id">
-<!-- PGPORT_1:NO Change -->
SELECT SC.recid AS SAT_CLUSTER_ID,
SC.customer_id,
SC.description,
@@ -110,7 +105,6 @@ ORDER BY UPPER(SC.description)
<mode name="params_for_probe">
<query params="probe_id, command_id">
-<!-- PGPORT_1:NO Change -->
SELECT PPV.value,
CP.param_name
FROM rhn_probe_param_value PPV,
@@ -124,7 +118,6 @@ SELECT PPV.value,
<mode name="probe_state_summary">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT CSS.state,
CSS.state_count
FROM rhn_current_state_summaries CSS
@@ -136,7 +129,6 @@ ORDER BY UPPER(state)
<mode name="probe_state_count_by_state_and_user">
<query params="state, user_id">
-<!-- PGPORT_1:NO Change -->
SELECT count(*) as STATE_COUNT
FROM rhn_probe_state PS,
rhn_check_probe CP,
@@ -150,7 +142,6 @@ SELECT count(*) as STATE_COUNT
<mode name="probe_state">
<query params="probe_id">
-<!-- PGPORT_1:NO Change -->
SELECT probe_id,
scout_id,
state,
@@ -163,7 +154,6 @@ SELECT probe_id,
<mode name="probe_metrics">
<query params="probe_id">
-<!-- PGPORT_1:NO Change -->
SELECT m.metric_id,
m.storage_unit_id,
m.description,
@@ -178,7 +168,6 @@ ORDER BY m.metric_id
j
<mode name="probe_metric">
<query params="probe_id,metric_id">
-<!-- PGPORT_1:NO Change -->
SELECT m.metric_id,
m.storage_unit_id,
m.description,
@@ -193,7 +182,6 @@ AND c.command_class = m.command_class
<mode name="probe">
<query params="probe_id">
-<!-- PGPORT_1:NO Change -->
SELECT probe_type,
description,
customer_id,
@@ -216,7 +204,6 @@ WHERE recid = :probe_id
<mode name="probes_for_contact_method">
<query params="method_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT CP.host_id system_id,
P.recid probe_id,
P.description probe_description,
@@ -236,7 +223,6 @@ ORDER BY S.name, S.id, P.description, P.recid
<mode name="editable_config_macros">
<query >
- <!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT macro.name,
macro.definition,
macro.environment,
@@ -255,7 +241,6 @@ AND dbenv.environment = DECODE(macro.environment,
<mode name="ok_system_probes">
<query params="org_id, user_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT S.id system_id,
S.name system_name,
P.recid probe_id,
@@ -277,7 +262,6 @@ ORDER BY system_name, probe_description
<mode name="warning_system_probes">
<query params="org_id, user_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT S.id system_id,
S.name system_name,
P.recid probe_id,
@@ -299,7 +283,6 @@ ORDER BY system_name, probe_description
<mode name="critical_system_probes">
<query params="org_id, user_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT S.id system_id,
S.name system_name,
P.recid probe_id,
@@ -321,7 +304,6 @@ ORDER BY system_name, probe_description
<mode name="unknown_system_probes">
<query params="org_id, user_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT S.id system_id,
S.name system_name,
P.recid probe_id,
@@ -343,7 +325,6 @@ ORDER BY system_name, probe_description
<mode name="pending_system_probes">
<query params="org_id, user_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT S.id system_id,
S.name system_name,
P.recid probe_id,
@@ -365,7 +346,6 @@ ORDER BY system_name, probe_description
<mode name="all_system_probes">
<query params="org_id, user_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT S.id system_id,
S.name system_name,
P.recid probe_id,
@@ -387,7 +367,6 @@ ORDER BY system_name, probe_description
<mode name="system_groups_probes">
<query params="group_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT S.id system_id,
S.name system_name,
P.recid probe_id,
diff --git a/web/modules/rhn/RHN/DB/Feedback.pm b/web/modules/rhn/RHN/DB/Feedback.pm
index 15e69d0..e078425 100644
--- a/web/modules/rhn/RHN/DB/Feedback.pm
+++ b/web/modules/rhn/RHN/DB/Feedback.pm
@@ -103,7 +103,7 @@ sub commit {
if ($self->id == -1) {
my $dbh = RHN::DB->connect;
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
my $sth = $dbh->prepare("SELECT rhn_user_feedback_id_seq.nextval FROM
DUAL");
$sth->execute;
my ($id) = $sth->fetchrow;
@@ -144,7 +144,7 @@ sub commit {
sub set_type {
my $self = shift;
my $label = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare('SELECT id FROM rhnUserFeedbackType WHERE label =
?');
$sth->execute($label);
@@ -160,7 +160,7 @@ sub set_type {
sub set_status {
my $self = shift;
my $label = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare('SELECT id FROM rhnUserFeedbackStatus WHERE label =
?');
$sth->execute($label);
@@ -176,7 +176,7 @@ sub set_status {
sub get_status {
my $self = shift;
my $label = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare('SELECT label FROM rhnUserFeedbackStatus WHERE id =
:id');
$sth->execute_h(id => $self->status);
@@ -212,7 +212,7 @@ sub feedback_overview {
if ($mode) {
$where = " AND FBS.label = ?";
}
- # PGPORT_3:ORAFCE(NVL),AS KEYWORD #
+
my $query = <<EOQ;
SELECT FB.id, U.id, U.login, FB.subject, FB.escalation_id, FBS.label, FBT.label,
FB.created,
NVL((SELECT max_members
@@ -279,7 +279,7 @@ sub faq_list {
$where = 'WHERE FAQ.private != 1'
unless $private;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
SELECT FAQ.id, FAQ.subject, FAQ.modified, FAQ.details, FAQ.usage_count
FROM rhnFAQ FAQ
@@ -335,7 +335,7 @@ sub faq_insert {
$message = substr $message, 0, 4000;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
INSERT INTO
rhnFAQ
@@ -372,7 +372,7 @@ sub faq_update {
$private = ($private ? 1 : 0 );
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
UPDATE
rhnFAQ
@@ -395,7 +395,7 @@ sub faq_increment_usage {
my $faq_id = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
UPDATE rhnFAQ SET usage_count = usage_count + 1 WHERE id = ?
EOQ
@@ -418,7 +418,7 @@ sub faq_delete {
my $id = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
DELETE FROM
rhnFAQ
@@ -447,7 +447,7 @@ sub lookup_id {
my $dbh = RHN::DB->connect;
### LOOKUP ID
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
SELECT
UF.re_id, UF.subject
@@ -509,7 +509,7 @@ sub _lookup_re_id {
sub feedback_types {
my $class = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare('SELECT id, label, name FROM rhnUserFeedbackType ORDER
BY id');
$sth->execute;
@@ -524,7 +524,7 @@ sub feedback_types {
sub feedback_statuses {
my $class = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare('SELECT id, label, name FROM rhnUserFeedbackStatus ORDER
BY name, label');
$sth->execute;
diff --git a/web/modules/rhn/RHN/DB/KSTree.pm b/web/modules/rhn/RHN/DB/KSTree.pm
index 166965b..3f5017d 100644
--- a/web/modules/rhn/RHN/DB/KSTree.pm
+++ b/web/modules/rhn/RHN/DB/KSTree.pm
@@ -60,7 +60,7 @@ sub lookup {
my ($clause, $query_params) = helper_pick_field($id, $label);
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
SELECT KT.id, KT.label, KT.base_path, KT.channel_id, KT.boot_image,
KT.org_id, KTT.id AS TREE_TYPE, KTT.label AS TREE_TYPE_LABEL, KTT.name AS
TREE_TYPE_NAME,
@@ -88,7 +88,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/;
- # PGPORT_1:NO Change #
+
$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->execute_h(tree_id => $self->id);
$self->files( [ $sth->fullfetch_hashref ] );
@@ -105,7 +105,7 @@ sub create_tree {
$params{tree_type} ||= 'rhn-managed';
my $dbh = RHN::DB->connect;
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
my $sth = $dbh->prepare(<<EOS);
INSERT INTO rhnKickstartableTree
(id, label, base_path, channel_id, boot_image, org_id, kstree_type, install_type)
@@ -130,7 +130,7 @@ sub delete_tree {
my $id = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $sth = $dbh->prepare("SELECT channel_id FROM rhnKickstartableTree WHERE id =
:kstid");
$sth->execute_h(kstid => $id);
@@ -139,7 +139,7 @@ sub delete_tree {
unless (defined $channel_id) {
die "no channel id for given kickstart tree id $id";
}
- # PGPORT_1:NO Change #
+
$sth = $dbh->prepare("DELETE FROM rhnKickstartableTree WHERE id =
:kstid");
$sth->execute_h(kstid => $id);
$dbh->call_procedure('rhn_channel.update_channel', $channel_id);
@@ -167,7 +167,7 @@ sub commit {
my $self = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $sth = $dbh->prepare(<<EOQ);
UPDATE rhnKickstartableTree
SET label = :label,
@@ -185,14 +185,13 @@ EOQ
sub commit_files {
my $self = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare("DELETE FROM rhnKSTreeFile WHERE kstree_id = ?");
$sth->execute($self->id);
my %seen;
for my $file (@{$self->files}) {
- # PGPORT_1:NO Change #
$sth = $dbh->prepare(<<EOQ);
INSERT INTO rhnKSTreeFile
(kstree_id, relative_filename, md5sum, last_modified, file_size)
@@ -264,7 +263,6 @@ sub compatible_tree {
my $kstid = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_2:AS KEYWORD #
my $sth = $dbh->prepare(<<EOQ);
SELECT 1
FROM rhnKickstartableTree KST1, rhnKickstartableTree KST2,
diff --git a/web/modules/rhn/RHN/DB/MonitoringConfigMacro.pm
b/web/modules/rhn/RHN/DB/MonitoringConfigMacro.pm
index d4ca20b..840e38b 100644
--- a/web/modules/rhn/RHN/DB/MonitoringConfigMacro.pm
+++ b/web/modules/rhn/RHN/DB/MonitoringConfigMacro.pm
@@ -58,7 +58,7 @@ our $VERSION = (split(/s+/, q$Id$, 4))[2];
# there is a better spot for right now... :/
sub are_notifications_squelched {
my $class = shift;
-#PGPORT_1:NO Change
+
my $sql = q{
SELECT recid
FROM redirects
@@ -148,7 +148,7 @@ sub unsquelch_notifications {
my $class = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_1:NO Change
+
my $sql = q{
DELETE FROM redirects
WHERE redirect_type = 'BLACKHOLE'
@@ -208,7 +208,7 @@ sub update {
my $login = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
+
my $sql = q{
UPDATE rhn_config_macro
SET definition = :definition,
diff --git a/web/modules/rhn/RHN/DB/Product.pm b/web/modules/rhn/RHN/DB/Product.pm
index c6fed1b..308e263 100644
--- a/web/modules/rhn/RHN/DB/Product.pm
+++ b/web/modules/rhn/RHN/DB/Product.pm
@@ -95,7 +95,6 @@ sub name_by_label {
my $dbh = RHN::DB->connect;
my $query;
my $sth;
-#PGPORT_1:NO Change
$query = <<EOQ;
SELECT name FROM rhnProduct WHERE label = :product_label
EOQ
@@ -117,7 +116,6 @@ sub product_line {
my $dbh = RHN::DB->connect;
my $query;
my $sth;
-#PGPORT_1:NO Change
$query = <<EOQ;
SELECT PL.name
FROM rhnProductLine PL,
@@ -149,7 +147,6 @@ sub products_by_line {
my $dbh = RHN::DB->connect;
my $query;
my $sth;
-#PGPORT_4:QUERY_REWRITE(ORDER BY)
$query = <<EOQ;
SELECT DISTINCT P.id, P.label, P.name,
(SELECT MIN (rhn_channel.channel_priority(PC.channel_id))
diff --git a/web/modules/rhn/RHN/DB/Profile.pm b/web/modules/rhn/RHN/DB/Profile.pm
index d1a9fa9..c192f6a 100644
--- a/web/modules/rhn/RHN/DB/Profile.pm
+++ b/web/modules/rhn/RHN/DB/Profile.pm
@@ -73,7 +73,7 @@ foreach my $field ($p->method_names) {
sub set_profile_type {
my $self = shift;
my $label = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare('SELECT id FROM rhnServerProfileType WHERE label =
:l');
$sth->execute_h(l => $label);
@@ -124,7 +124,7 @@ sub commit {
my $mode = 'update';
my $dbh = $transaction || RHN::DB->connect;
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
if ($self->id == -1) {
my $sth = $dbh->prepare("SELECT rhn_server_profile_id_seq.nextval FROM
DUAL");
$sth->execute;
@@ -164,7 +164,7 @@ sub compatible_servers_in_set {
my $user_id = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
SELECT S.id,
S.name
@@ -193,7 +193,7 @@ sub compatible_servers {
my $self = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
SELECT S.id,
S.name
@@ -228,7 +228,6 @@ sub copy_from {
if ($params{sid}) {
# BZ 145708 - need to add package_arch_id to rhnServerProfilePackage,
# or switch to rhnServerProfilePackage.installed_package_id
-# PGPORT_1:NO Change #
$query =<<EOQ;
INSERT INTO rhnServerProfilePackage
(server_profile_id, name_id, evr_id)
@@ -244,7 +243,6 @@ EOQ
else {
# BZ 145708 - need to add package_arch_id to rhnServerProfilePackage,
# or switch to rhnServerProfilePackage.installed_package_id
- # PGPORT_1:NO Change #
$query =<<EOQ;
INSERT INTO rhnServerProfilePackage
(server_profile_id, name_id, evr_id)
@@ -257,7 +255,7 @@ EOQ
old_prid => $params{prid},
);
}
- # PGPORT_1:NO Change #
+
my $dbh = $params{transaction} || RHN::DB->connect;
my $sth = $dbh->prepare("DELETE FROM rhnServerProfilePackage WHERE
server_profile_id = ?");
$sth->execute($self->id);
@@ -275,7 +273,7 @@ sub package_info_for_match_action {
my ($action_id, $lower, $upper, $total_ref) =
map { $params{"-" . $_} } qw/action_id lower upper total_rows/;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOS);
SELECT PN.name || '-' || PE.evr.as_vre_simple(), AP.parameter
@@ -322,7 +320,7 @@ sub compatible_with_server {
}
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
SELECT DISTINCT P.id, P.name
FROM rhnServer S,
@@ -365,7 +363,6 @@ sub canonical_package_list {
my $self = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOS);
SELECT SPP.name_id, PN.name, SPP.evr_id, SPPE.evr.as_vre_simple(), SPPE.epoch,
SPPE.version, SPPE.release
FROM rhnPackageName PN,
@@ -391,13 +388,12 @@ sub delete_profile {
my $self = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
DELETE FROM rhnServerProfilePackage WHERE server_profile_id = :prid
EOQ
$sth->execute_h(prid => $self->id);
- # PGPORT_1:NO Change #
+
$sth = $dbh->prepare(<<EOQ);
DELETE FROM rhnServerProfile WHERE id = :prid
EOQ
@@ -493,7 +489,6 @@ sub remove_packages_by_id_combo {
my @id_combos = @_;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
DELETE
FROM rhnServerProfilePackage SPP
diff --git a/web/modules/rhn/RHN/DB/SatInstall.pm b/web/modules/rhn/RHN/DB/SatInstall.pm
index 0ae82a1..873d05d 100644
--- a/web/modules/rhn/RHN/DB/SatInstall.pm
+++ b/web/modules/rhn/RHN/DB/SatInstall.pm
@@ -39,7 +39,7 @@ sub test_db_schema {
return 1 unless PXT::Config->get("satellite");
my $dbh = RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT object_name
FROM user_objects
@@ -51,7 +51,7 @@ EOQ
$sth->finish;
return 0 unless $row;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
$sth = $dbh->prepare(<<EOQ);
SELECT 1
FROM user_objects
@@ -90,7 +90,7 @@ sub get_default_tablespace_name {
my $db_user = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT UU.default_tablespace
FROM user_users UU
@@ -112,7 +112,7 @@ sub check_db_privs {
my $class = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT DISTINCT privilege
FROM (
@@ -172,7 +172,7 @@ sub check_db_tablespace_settings {
$class->check_db_privs();
my $dbh = RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT UT.status, UT.contents, UT.logging
FROM user_tablespaces UT
@@ -211,7 +211,7 @@ sub get_nls_database_parameters {
my $class = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sth = $dbh->prepare(<<EOQ);
SELECT NDP.parameter, NDP.value
FROM nls_database_parameters NDP
@@ -253,7 +253,7 @@ sub clear_db {
if (grep { $dbh->{Name} eq $_ } qw/webdev webqa web phx live prod/) {
throw "No! Attempt to clear db: '" . $dbh->{Name} .
"'\n";
}
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $select_sth = $dbh->prepare(<<EOQ);
SELECT 'drop ' || UO.object_type ||' '|| UO.object_name AS DROP_STMT
FROM user_objects UO
@@ -282,7 +282,6 @@ sub schema_version {
my $class = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_1:NO Change
my $sth = $dbh->prepare(<<EOQ);
SELECT VI.label,
VI.name_id,
@@ -318,7 +317,6 @@ sub update_monitoring_config {
my $mon_config = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
my $sth = $dbh->prepare(<<EOQ);
UPDATE rhn_config_macro
SET definition = :definition,
@@ -342,9 +340,8 @@ sub update_monitoring_environment {
my $dbh = RHN::DB->connect;
# BZ 226915 we cannot use db_name from %answers - it contains instance name
# we want real db name
- #PGPORT_3:ORAFCE(DUAL)
my ($db_name) = $dbh->selectrow_array(q|SELECT UPPER(sys_context('userenv',
'db_name')) FROM dual|);
-#PGPORT_1:NO Change
+
my $sth = $dbh->prepare(<<EOQ);
UPDATE rhn_db_environment
SET db_name = UPPER(:db_name)
@@ -378,7 +375,7 @@ sub create_satellite_org {
sub get_satellite_org_id {
my $class = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_1:NO Change
+
my $sth = $dbh->prepare("SELECT MIN(id) FROM web_customer");
$sth->execute;
my ($org_id) = $sth->fetchrow;
@@ -390,7 +387,6 @@ sub valid_cert_countries {
my $class = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_4:QUERY_REWRITE(ANSI JOIN),NVL
my $sth = $dbh->prepare(<<EOQ);
SELECT VC.code AS VALUE,
nvl(TL.short_name_tl, VC.short_name) AS LABEL
@@ -421,7 +417,6 @@ sub set_first_gritch_destination {
throw "No user id" unless $uid;
my $dbh = RHN::DB->connect;
-#PGPORT_1:NO Change
my $sth = $dbh->prepare(<<EOQ);
SELECT CM.recid,
CM.method_name,
diff --git a/web/modules/rhn/RHN/DB/ServerGroup.pm
b/web/modules/rhn/RHN/DB/ServerGroup.pm
index 5339401..92180f0 100644
--- a/web/modules/rhn/RHN/DB/ServerGroup.pm
+++ b/web/modules/rhn/RHN/DB/ServerGroup.pm
@@ -82,7 +82,7 @@ sub commit {
if ($self->id == -1) {
my $dbh = RHN::DB->connect;
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
my $sth = $dbh->prepare("SELECT rhn_server_group_id_seq.nextval FROM
DUAL");
$sth->execute;
my ($id) = $sth->fetchrow;
@@ -167,7 +167,7 @@ sub member_count {
}
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $sqlstmt = sprintf <<EOT;
SELECT COUNT(server_id)
FROM rhnServerGroupMembers SGM
@@ -202,9 +202,7 @@ sub remove {
my $dbh = RHN::DB->connect;
# 1. Remove the user permissions to the group.
-# First, so that user perms won't be regenerated twice
-# PGPORT_1:NO Change #
-
+# First, so that user perms won't be regenerated twice.
my $query = <<EOQ;
DECLARE
cursor uids is
@@ -231,7 +229,6 @@ EOQ
$sth->execute_h(server_group_id => $group_id);
# 3. Remove the group itself
-# # PGPORT_1:NO Change #
$query = <<EOQ;
DELETE FROM rhnServerGroup SG WHERE SG.id = ?
EOQ
@@ -286,7 +283,7 @@ sub servers_in_groups {
@columns = ('S.ID') unless @columns;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = sprintf <<EOQ, join(", ", @columns), join(", ",
("?") x @$groups);
SELECT %s
FROM rhnServerGroupMembers SGM, rhnServer S, rhnServerArch SA
@@ -326,7 +323,6 @@ sub groups_in_org_overview {
my $query;
if ($mode eq 'server') {
- # PGPORT_1:NO Change #
$query = <<EOS;
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, GO.GROUP_ID, GROUP_NAME,
GROUP_ADMINS, SERVER_COUNT, NOTE_COUNT, GO.MODIFIED, GO.MAX_MEMBERS
FROM rhnVisServerGroupOverview GO, rhnServerGroupMembers SGM
@@ -338,7 +334,6 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
EOS
}
elsif ($mode eq 'user') {
- # PGPORT_1:NO Change #
$query = <<EOS;
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, GO.GROUP_ID, GROUP_NAME,
GROUP_ADMINS, SERVER_COUNT, NOTE_COUNT, GO.MODIFIED, GO.MAX_MEMBERS
FROM rhnVisServerGroupOverview GO, rhnUserManagedServerGroups UMSG
@@ -349,7 +344,6 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
EOS
}
elsif ($mode eq 'set') {
- # PGPORT_1:NO Change #
$query = <<EOS;
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, GROUP_ID, GROUP_NAME,
GROUP_ADMINS, SERVER_COUNT, NOTE_COUNT, MODIFIED, MAX_MEMBERS
FROM rhnVisServerGroupOverview, rhnSet RS
@@ -358,7 +352,6 @@ ORDER BY UPPER(GROUP_NAME), GROUP_ID
EOS
}
else {
- # PGPORT_1:NO Change #
$query = <<EOS;
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, GROUP_ID, GROUP_NAME,
GROUP_ADMINS, SERVER_COUNT, NOTE_COUNT, MODIFIED, MAX_MEMBERS
FROM rhnVisServerGroupOverview
@@ -396,7 +389,6 @@ sub group_overview {
$upper ||= 100000;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $query = <<EOQ;
SELECT SERVER_ID, SERVER_NAME, 0, GROUP_COUNT, MODIFIED
FROM rhnServerOverview
@@ -427,7 +419,6 @@ sub tri_state_server_group_list {
my $org_id = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $query = <<EOS;
SELECT SGO.group_id, SGO.group_name
FROM rhnServerGroup SG, rhnServerGroupOverview SGO
@@ -453,7 +444,6 @@ sub server_group_list {
my $org_id = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $query = <<EOQ;
SELECT SG.name, SG.id
FROM rhnServerGroup SG
@@ -480,9 +470,7 @@ sub servergroup_admin_overview {
my $sgid = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_3:ORAFCE(NVL) #
- my $sth = $dbh->prepare(<<EOS);
-
+ my $sth = $dbh->prepare(<<EOS);
SELECT wc.id, wc.login,
NVL((SELECT MAX(1) FROM rhnUserManagedServerGroups USGP WHERE USGP.server_group_id
= ? AND USGP.user_id = wc.id), 0)
FROM web_contact wc
@@ -507,7 +495,7 @@ sub intersect_groups {
my $sgid = shift(@groups);
RHN::Set->copy_from_group($user_id, "system_list", $sgid);
}
- # PGPORT_3:ORAFCE(NVL) #
+
$sth = $dbh->prepare(<<EOQ);
DELETE FROM rhnSet S
WHERE S.user_id = $user_id
@@ -537,7 +525,7 @@ sub union_groups {
my $sgid = shift(@groups);
RHN::Set->copy_from_group($user_id, "system_list", $sgid);
}
- # PGPORT_1:NO Change #
+
$sth = $dbh->prepare(<<EOQ);
INSERT INTO rhnSet (user_id, label, element)
(SELECT :user_id, :set_label, SGM.server_id
@@ -562,7 +550,6 @@ sub members {
}
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
SELECT server_id
FROM rhnServerGroupMembers SGM
@@ -608,7 +595,6 @@ sub errata_counts {
my $id = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA
FROM rhnServerGroupOverview
@@ -628,7 +614,6 @@ sub num_admins {
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
SELECT COUNT(DISTINCT user_id) NUM_ADMINS
FROM rhnUserServerGroupPerms
diff --git a/web/modules/rhn/RHN/DB/Set.pm b/web/modules/rhn/RHN/DB/Set.pm
index f58edcb..df475b2 100644
--- a/web/modules/rhn/RHN/DB/Set.pm
+++ b/web/modules/rhn/RHN/DB/Set.pm
@@ -80,7 +80,7 @@ sub empty {
sub _reload {
my $self = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare("SELECT element, element_two FROM rhnSet WHERE user_id
= ? AND label = ?");
@@ -106,7 +106,7 @@ sub add {
sub immediate_add {
my $self = shift;
my @vals = @_;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare("INSERT INTO rhnSet (user_id, label, element,
element_two) VALUES (?, ?, ?, ?)");
@@ -129,13 +129,12 @@ sub immediate_remove {
my @vals = @_;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
for my $val (@vals) {
if (ref $val) {
my $sth = $dbh->prepare("DELETE FROM rhnSet WHERE user_id = ? AND label = ?
AND element = ? AND element_two = ?");
$sth->execute($self->uid, $self->label, $val->[0], $val->[1]);
}
- # PGPORT_1:NO Change #
else {
my $sth = $dbh->prepare("DELETE FROM rhnSet WHERE user_id = ? AND label = ?
AND element = ?");
$sth->execute($self->uid, $self->label, $val);
@@ -173,10 +172,10 @@ sub commit {
my $dbh = $transaction || RHN::DB->connect;
my $lock_sth = RHN::User->lock_web_contact(-transaction => $dbh, -uid =>
$self->uid);
- # PGPORT_1:NO Change #
+
my $sth = $dbh->prepare("DELETE FROM rhnSet WHERE user_id = ? AND label =
?");
$sth->execute($self->uid, $self->label);
- # PGPORT_1:NO Change #
+
$sth = $dbh->prepare("INSERT INTO rhnSet (user_id, label, element, element_two)
VALUES (?, ?, ?, ?)");
foreach my $val (keys %{$self->{contents}}) {
my ($e1, $e2) = split /[|]/, $val;
@@ -198,7 +197,7 @@ sub remove_picked_up_for_action {
my $dbh = RHN::DB->connect;
my $query;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
DELETE FROM
rhnSet ST
@@ -231,7 +230,7 @@ sub remove_illegal_servers {
my $dbh = RHN::DB->connect;
my $query;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
DELETE FROM
rhnSet S
@@ -255,7 +254,7 @@ sub remove_unowned_servers {
my $dbh = RHN::DB->connect;
my $query;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
DELETE FROM
rhnSet S
@@ -280,7 +279,7 @@ sub copy_from_group {
$sth->execute($uid, $name);
my $query;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
INSERT INTO rhnSet
(user_id, label, element)
@@ -304,7 +303,7 @@ sub num_proxies_in_set {
my $dbh = RHN::DB->connect;
my $query;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
SELECT COUNT(ST.element)
FROM rhnProxyInfo PI,
@@ -327,7 +326,7 @@ sub num_satellites_in_set {
my $dbh = RHN::DB->connect;
my $query;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
SELECT COUNT(ST.element)
FROM rhnSatelliteInfo SI,
@@ -353,7 +352,7 @@ sub remove_scheduled_errata_for_system {
my $dbh = RHN::DB->connect;
my $query;
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
DELETE FROM
rhnSet S
@@ -382,7 +381,7 @@ sub remove_users_with_role {
my $role = shift;
croak "No role param" unless $role;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $query =<<EOQ;
DELETE FROM
@@ -407,7 +406,7 @@ EOQ
sub remove_unowned_actions {
my $self = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $query =<<EOQ;
DELETE
@@ -430,7 +429,7 @@ sub remove_prereq_actions {
my $self = shift;
my $server_id = shift;
die "no server_id" unless $server_id;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $query =<<EOQ;
DELETE
diff --git a/web/modules/rhn/RHN/DB/TinyURL.pm b/web/modules/rhn/RHN/DB/TinyURL.pm
index e2e6162..9beb625 100644
--- a/web/modules/rhn/RHN/DB/TinyURL.pm
+++ b/web/modules/rhn/RHN/DB/TinyURL.pm
@@ -32,7 +32,6 @@ sub lookup {
my $token = $params{token};
my $dbh = RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
my $sth = $dbh->prepare(<<EOS);
SELECT url FROM rhnTinyURL
WHERE token = :token
@@ -54,7 +53,6 @@ sub lookup_consume {
my $ret = $class->lookup(-token => $token);
if ($ret) {
-#PGPORT_1:NO Change
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare("UPDATE rhnTinyURL SET enabled = 'N' WHERE
token = :token");
$sth->execute_h(token => $token);
@@ -79,7 +77,6 @@ sub create {
}
my $dbh = RHN::DB->connect;
-#PGPORT_1:NO Change
my $sth = $dbh->prepare(<<EOS);
INSERT INTO rhnTinyURL
(token, url, enabled, expires)
commit 91157f8c5ed102602250f910c3f80068ad383e59
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Mar 31 15:17:30 2009 -0300
Revert "Modified rhnAction.py after running diff."
This reverts commit 9cad4715e3e3945a886f0581b1eb6f00d2468620.
Conflicts:
backend/server/rhnAction.py
diff --git a/backend/server/rhnAction.py b/backend/server/rhnAction.py
index 11ebac0..4c830f6 100644
--- a/backend/server/rhnAction.py
+++ b/backend/server/rhnAction.py
@@ -36,7 +36,7 @@ def schedule_action(action_type, action_name=None, delta_time=0,
'scheduler' : scheduler,
'prerequisite' : prerequisite,
}
-#PGPORT_1:no change
+
h = rhnSQL.prepare("""
insert into rhnAction
(id, org_id, action_type, name, scheduler, earliest_action, prerequisite)
@@ -51,7 +51,6 @@ def schedule_action(action_type, action_name=None, delta_time=0,
def schedule_server_action(server_id, action_type, action_name=None,
delta_time=0, scheduler=None, org_id=None, prerequisite=None):
if not org_id:
-#PGPORT_1:no change
h = rhnSQL.prepare("select org_id from rhnServer where id = :id")
h.execute(id=server_id)
row = h.fetchone_dict()
@@ -69,7 +68,6 @@ def schedule_server_action(server_id, action_type, action_name=None,
# Insert an action as Queued
-#PGPORT_1:no change
h = rhnSQL.prepare("""
insert into rhnServerAction (server_id, action_id, status)
values (:server_id, :action_id, 0)
@@ -81,7 +79,6 @@ def schedule_server_action(server_id, action_type, action_name=None,
def update_server_action(server_id, action_id, status, result_code=None,
result_message=""):
log_debug(4, server_id, action_id, status, result_code, result_message)
-#PGPORT_5:current_timestamp
h = rhnSQL.prepare("""
update rhnServerAction
set status = :status,
@@ -95,7 +92,7 @@ def update_server_action(server_id, action_id, status,
result_code=None,
status=status, result_code=result_code,
result_message=result_message[:1024])
-#PGPORT_1:no change
+
_query_lookup_action = rhnSQL.Statement("""
select sa.action_id, sa.status
from rhnServerAction sa,
@@ -130,10 +127,10 @@ def invalidate_action(server_id, action_id):
status=3, result_code=-100, result_message="Prerequisite failed")
return a_ids
-#PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL)
+
_query_schedule_server_packages_update = rhnSQL.Statement("""
insert into rhnActionPackage (id, action_id, name_id, parameter)
- values (sequence_nextval('rhn_act_p_id_seq'), :action_id, :name_id,
'uggrade')
+ values (sequence_nextval('rhn_act_p_id_seq'), :action_id, :name_id,
'upgrade')
""")
def schedule_server_packages_update(server_id, package_ids, org_id = None,
@@ -148,12 +145,12 @@ def schedule_server_packages_update(server_id, package_ids, org_id =
None,
'action_id' : [action_id] * len(package_ids),
'name_id' : package_ids,
})
-#PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL)
+
_query_schedule_server_packages_update_by_arch = rhnSQL.Statement("""
insert into rhnActionPackage (id, action_id, name_id, package_arch_id, \
parameter)
values (sequence_nextval('rhn_act_p_id_seq'), :action_id, :name_id, :arch_id,
\
- 'upgrade')
+ 'upgrade')
""")
def schedule_server_packages_update_by_arch(server_id, package_arch_ids, org_id = None,
prerequisite = None, action_name = "Package update"):
commit 9255901b49d10ff85f22b2cc1937fc9578279831
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Mar 31 15:16:42 2009 -0300
Revert "PGPORT Tagged queries 3rd batch"
This reverts commit da98013f69a90571cd2080c381f0e293153527d4.
Conflicts:
java/code/src/com/redhat/rhn/domain/server/ServerGroup.hbm.xml
spacewalk/setup/bin/spacewalk-setup
web/modules/rhn/RHN/DB/SatCluster.pm
diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency.py
index 636fe3f..f728fbf 100644
--- a/backend/server/rhnDependency.py
+++ b/backend/server/rhnDependency.py
@@ -22,7 +22,6 @@ import string
# QUERY PACKAGES
# sql query for solving a dep as a package
- # PGPORT_2:AS KEYWORD #
__packages_with_arch_and_id_sql = """
select distinct
p.id id,
@@ -62,7 +61,6 @@ and pe.evr = (
and p1.evr_id = pe1.id
)
"""
- # PGPORT_2:AS KEYWORD #
__packages_sql = """
select distinct
pn.name name,
@@ -101,7 +99,7 @@ and pe.evr = (
and p1.evr_id = pe1.id
)
"""
- # PGPORT_2:AS KEYWORD #
+
__packages_all_sql = """
select distinct
pn.name name,
@@ -128,7 +126,6 @@ and p.package_arch_id = pa.id
"""
# QUERY PROVIDES
# sql query for solving a dep as a provide
- # PGPORT_2:AS KEYWORD #
__provides_sql = """
select distinct
pn.name,
@@ -174,7 +171,7 @@ and pe.evr = (
and p1.evr_id = pe1.id
)
"""
- # PGPORT_2:AS KEYWORD #
+
__provides_all_sql = """
select distinct
pn.name,
@@ -206,7 +203,6 @@ and p.package_arch_id = pa.id
"""
# QUERY FILES
# sql query for solving a dependency as a file provide
- # PGPORT_2:AS KEYWORD #
__files_sql = """
select distinct
pn.name,
@@ -252,7 +248,7 @@ and pe.evr = (
)
"""
- # PGPORT_2:AS KEYWORD #
+
__files_all_sql = """
select distinct
pn.name,
diff --git a/backend/server/rhnSQL/sql_row.py b/backend/server/rhnSQL/sql_row.py
index 737c68e..0c121ff 100644
--- a/backend/server/rhnSQL/sql_row.py
+++ b/backend/server/rhnSQL/sql_row.py
@@ -38,7 +38,6 @@ class Row(UserDictCase):
self.table = table
self.hashname = string.lower(hashname)
# see if the table exists
- #PGPORT_5:POSTGRES_VERSION_QUERY(ROWNUM)
sql = "select %s from %s where rownum = 0" % (self.hashname, self.table)
try:
h = self.db.prepare(sql)
@@ -94,7 +93,6 @@ class Row(UserDictCase):
self.save()
# load an entry
- #PGPORT_1:NO Change
def load(self, hashval):
h = self.db.prepare("select * from %s where %s = :hashval" %
(self.table, self.hashname))
h.execute(hashval = hashval)
@@ -109,7 +107,6 @@ class Row(UserDictCase):
return 1
# kind of the same as load, but we load it from a sql clause instead
- #PGPORT_1:NO Change
def load_sql(self, sql, pdict = {}):
h = self.db.prepare("select * from %s where %s" % (self.table, sql))
apply(h.execute, (), pdict)
diff --git a/backend/server/rhnServer/server_lib.py
b/backend/server/rhnServer/server_lib.py
index 0c23856..d315137 100644
--- a/backend/server/rhnServer/server_lib.py
+++ b/backend/server/rhnServer/server_lib.py
@@ -138,14 +138,12 @@ def getServerID(server, fields = []):
# ugliness is over
# Now build the search
- #PGPORT_1:NO Change
if type(search_id) == type(0):
h = rhnSQL.prepare("""
select s.id %s from rhnServer s %s
where s.id = :p1 %s
""" % (xfields, archdb, archjoin))
else: # string
- # PGPORT_2:AS KEYWORD
h = rhnSQL.prepare("""
select s.id %s from rhnServer s %s
where s.digital_server_id = :p1 %s
@@ -171,7 +169,6 @@ def getServerSecret(server):
# create the initial server groups for a new server
def __create_server_group(group_label, org_id, maxnum = ''):
# Add this new server to the pending group
- # PGPORT_2:AS KEYWORD
h = rhnSQL.prepare("""
select sg.id, sg.current_members
from rhnServerGroup sg
@@ -183,7 +180,6 @@ def __create_server_group(group_label, org_id, maxnum = ''):
data = h.fetchone_dict()
if not data:
# create the requested group
- #PGPORT_1:NO Change
ret_id = rhnSQL.Sequence("rhn_server_group_id_seq")()
h = rhnSQL.prepare("""
insert into rhnServerGroup
@@ -224,7 +220,6 @@ def join_server_group(server_id, server_group_id):
# groups and channels
def create_server_setup(server_id, org_id):
# create the rhnServerInfo record
- #PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
h = rhnSQL.prepare("""
insert into rhnServerInfo (server_id, checkin, checkin_counter)
values (:server_id, sysdate, :checkin_counter)
@@ -244,7 +239,6 @@ def create_server_setup(server_id, org_id):
# abuse error for it
def __special_server(server_id):
# if a proxy or a satellite we don't enforce this. thanks chip.
- #PGPORT_1:NO Change
h = rhnSQL.prepare("""
select 1 from rhnProxyInfo where server_id = :server_id
union
@@ -259,7 +253,6 @@ def __special_server(server_id):
# checkin - update the last checkin time
# - check for abuse of service.
-#PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
def checkin(server_id, commit=1, check_for_abuse=1):
log_debug(3, server_id)
h = rhnSQL.prepare("""
@@ -274,7 +267,6 @@ def checkin(server_id, commit=1, check_for_abuse=1):
if not CFG.ABUSE_CHECK or not check_for_abuse:
return 1
# now check for abusers
- #PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE),As keyword
h = rhnSQL.prepare("""
select s.name, si.checkin_counter - ((sysdate - s.created) * 100) ticks
from rhnServer s, rhnServerInfo si
@@ -302,7 +294,6 @@ def set_qos(server_id):
pass
# set_qos - sets some Quality of Service params for users
-#PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE),As keyword
def set_qos_dummy(server_id):
log_debug(3, server_id)
@@ -338,7 +329,7 @@ def throttle(server):
if not os.path.exists(throttlefile):
# We don't throttle anybody
return
-#PGPORT_3:ORAFCE(DUAL),SYSDATE
+
# from this point on, normal throttle
h = rhnSQL.prepare("select rhn_bel.is_org_paid(:org_id) as paid, sysdate from
dual")
h.execute(org_id = server['org_id'])
@@ -400,7 +391,7 @@ def dbiDate2timestamp(dateobj):
def snapshot_server(server_id, reason):
if CFG.ENABLE_SNAPSHOTS:
return rhnSQL.Procedure("rhn_server.snapshot_server")(server_id,
reason)
-#PGPORT_1:NO Change
+
def check_entitlement(server_id):
h = rhnSQL.prepare("""select server_id, label from
rhnServerEntitlementView where server_id = :server_id""")
diff --git a/backend/server/test/test_leak4.py b/backend/server/test/test_leak4.py
index 491dc5a..1058435 100644
--- a/backend/server/test/test_leak4.py
+++ b/backend/server/test/test_leak4.py
@@ -21,7 +21,6 @@ print 'PID', os.getpid()
db = connect('rhnuser/rhnuser@webdev')
#c = db.prepare("select 1, 'z', 2, 3, 4, 't' from dual")
-#PGPORT_3:ORAFCE(DUAL)
c = db.prepare("select 1 from dual")
#c = db.prepare("select 1, 2 from dual")
diff --git a/backend/server/test/unit-test/cx_create_table.py
b/backend/server/test/unit-test/cx_create_table.py
index 2074da7..606dc56 100644
--- a/backend/server/test/unit-test/cx_create_table.py
+++ b/backend/server/test/unit-test/cx_create_table.py
@@ -61,7 +61,6 @@ def drop_table(dbh, table_name):
def list_tables(dbh):
h = dbh.cursor()
- #PGPORT_5:POSTGRES_VERSION_QUERY(VERSION)
h.execute("select table_name from user_tables")
return map(lambda x: x[0].upper(), h.fetchall())
diff --git a/backend/server/test/unit-test/rhnSQL/test_1.py
b/backend/server/test/unit-test/rhnSQL/test_1.py
index f8891b1..c0e536d 100644
--- a/backend/server/test/unit-test/rhnSQL/test_1.py
+++ b/backend/server/test/unit-test/rhnSQL/test_1.py
@@ -20,7 +20,7 @@ class Tests1(unittest.TestCase):
self.table_name = "misatest_%d" % os.getpid()
rhnSQL.initDB(DB)
self._cleanup()
- # PGPORT_5:POSTGRES_VERSION_QUERY(varchar2) #
+
rhnSQL.execute("create table %s (id int, val varchar2(10))" %
self.table_name)
rhnSQL.commit()
@@ -76,7 +76,6 @@ class Tests1(unittest.TestCase):
def test_executemany_1(self):
"""Tests executemany"""
- # PGPORT_1:NO Change #
q = "insert into %s (id, val) values (:id, :val)" % self.table_name
h = rhnSQL.prepare(q)
ids = [1, 2, 3] * 100
@@ -100,20 +99,17 @@ class Tests1(unittest.TestCase):
def test_execute_rowcount(self):
"""Tests row counts"""
# XXX
- # PGPORT_1:NO Change #
table_name = "misatest"
rhnSQL.execute("delete from misatest")
- # PGPORT_1:NO Change #
ret = rhnSQL.execute("insert into misatest values (1, 1)")
self.assertEqual(ret, 1)
- # PGPORT_1:NO Change #
ret = rhnSQL.execute("insert into misatest values (2, 2)")
self.assertEqual(ret, 1)
- # PGPORT_1:NO Change #
+
ret = rhnSQL.execute("delete from misatest")
self.assertEqual(ret, 2)
rhnSQL.commit()
- # PGPORT_1:NO Change #
+
def _list_tables(self):
h = rhnSQL.prepare("select table_name from user_tables")
h.execute()
diff --git a/backend/server/test/unit-test/rhnSQL/test_executemany.py
b/backend/server/test/unit-test/rhnSQL/test_executemany.py
index 8937b09..4382252 100644
--- a/backend/server/test/unit-test/rhnSQL/test_executemany.py
+++ b/backend/server/test/unit-test/rhnSQL/test_executemany.py
@@ -22,7 +22,7 @@ class ExecutemanyTest(unittest.TestCase):
self.table_name = "misatest_%d" % os.getpid()
rhnSQL.initDB(DB)
self._cleanup()
- #PGPORT_4:QUERY_REWRITE(data-type)
+
rhnSQL.execute("create table %s (id int, val varchar2(10))" %
self.table_name)
@@ -45,7 +45,6 @@ class ExecutemanyTest(unittest.TestCase):
verifies the param types; passing a string and an Int takes it one
step further)
"""
- #PGPORT_1:NO Change
h = rhnSQL.prepare("""
insert into %s (id, val) values (:id, :val)
""" % self.table_name)
@@ -54,7 +53,7 @@ class ExecutemanyTest(unittest.TestCase):
'val' : ['', 3],
}
apply(h.executemany, (), params)
- #PGPORT_1:NO Change
+
h = rhnSQL.prepare("select id, val from %s" % self.table_name)
h.execute()
rows = h.fetchall_dict()
diff --git a/backend/server/test/unit-test/rhnSQL/test_lob.py
b/backend/server/test/unit-test/rhnSQL/test_lob.py
index 595cd99..00e8dfc 100644
--- a/backend/server/test/unit-test/rhnSQL/test_lob.py
+++ b/backend/server/test/unit-test/rhnSQL/test_lob.py
@@ -14,20 +14,18 @@ class ExceptionsTest(unittest.TestCase):
def setUp(self):
rhnSQL.initDB(DB)
self._cleanup()
- #PGPORT_4:QUERY_REWRITE(data type)
+
rhnSQL.execute("create table misatestlob (id int, val blob)")
rhnSQL.execute("create sequence misatestlob_id_seq")
def _cleanup(self):
try:
- #PGPORT_1:NO Change
rhnSQL.execute("drop table misatestlob")
except rhnSQL.SQLStatementPrepareError:
pass
try:
- #PGPORT_1:NO Change
rhnSQL.execute("drop sequence misatestlob_id_seq")
except rhnSQL.SQLStatementPrepareError:
pass
@@ -42,12 +40,11 @@ class ExceptionsTest(unittest.TestCase):
def test_lobs(self):
new_id = rhnSQL.Sequence('misatestlob_id_seq').next()
- #PGPORT_1:NO Change
h = rhnSQL.prepare("""
insert into misatestlob (id, val) values (:id, empty_blob())
""")
h.execute(id=new_id)
- #PGPORT_1:NO Change
+
h = rhnSQL.prepare("""
select val from misatestlob where id = :id for update of val
""")
@@ -60,7 +57,7 @@ class ExceptionsTest(unittest.TestCase):
s = s + chr(i)
lob.write(s)
rhnSQL.commit()
- #PGPORT_1:NO Change
+
h = rhnSQL.prepare("""
select val from misatestlob where id = :id
""")
diff --git a/backend/test/suites/rhnsqltests.py b/backend/test/suites/rhnsqltests.py
index e446e28..a9f5324 100644
--- a/backend/test/suites/rhnsqltests.py
+++ b/backend/test/suites/rhnsqltests.py
@@ -24,11 +24,10 @@ from server.rhnSQL.driver_postgresql import
convert_named_query_params
class RhnSQLTests(unittest.TestCase):
""" Pure unit tests for components of rhnSQL. """
- # PGPORT_1:NO Change #
+
def test_convert_named_query_params(self):
query = "INSERT INTO people(id, name, phone) VALUES(:id, :name,
:phone)"
- # PGPORT_1:NO Change #
- expected_query = \
+ expected_query = \
"INSERT INTO people(id, name, phone) VALUES($1, $2, $3)"
(new_query, param_index, args_found) = convert_named_query_params(query)
@@ -38,7 +37,7 @@ class RhnSQLTests(unittest.TestCase):
self.assertEquals([1], param_index['id'])
self.assertEquals([2], param_index['name'])
self.assertEquals([3], param_index['phone'])
- # PGPORT_1:NO Change #
+
def test_convert_named_params_none_required(self):
query = "SELECT * FROM people"
@@ -47,10 +46,8 @@ class RhnSQLTests(unittest.TestCase):
self.assertEquals(0, len(param_index.keys()))
def test_convert_named_params_multiple_uses(self):
- # PGPORT_1:NO Change #
query = "INSERT INTO people(a, b, c, d) VALUES(:a, :b, :a, :b)"
expected_query = \
- # PGPORT_1:NO Change #
"INSERT INTO people(a, b, c, d) VALUES($1, $2, $3, $4)"
(new_query, param_index, args_found) = convert_named_query_params(query)
@@ -59,10 +56,9 @@ class RhnSQLTests(unittest.TestCase):
self.assertEquals(2, len(param_index.keys()))
self.assertEquals([1, 3], param_index['a'])
self.assertEquals([2, 4], param_index['b'])
- # PGPORT_1:NO Change #
+
def test_date_format_conversion_issue(self):
query = "SELECT TO_CHAR(issued, 'YYYY-MM-DD HH24:MI:SS') issued FROM
rhnSatelliteCert WHERE id=:id, name=:name"
- # PGPORT_1:NO Change #
expected_query = "SELECT TO_CHAR(issued, 'YYYY-MM-DD HH24:MI:SS')
issued FROM rhnSatelliteCert WHERE id=$1, name=$2"
(new_query, param_index, args_found) = convert_named_query_params(query)
self.assertEquals(expected_query, new_query)
diff --git a/documentation/db-schema/spacewalk-0.1/sql_sources/view/rhnhistoryview.sql
b/documentation/db-schema/spacewalk-0.1/sql_sources/view/rhnhistoryview.sql
index df45027..9a04b3a 100644
--- a/documentation/db-schema/spacewalk-0.1/sql_sources/view/rhnhistoryview.sql
+++ b/documentation/db-schema/spacewalk-0.1/sql_sources/view/rhnhistoryview.sql
@@ -1,6 +1,6 @@
-- created by Oraschemadoc Fri Jun 13 14:06:08 2008
-- visit
http://www.yarpen.cz/oraschemadoc/ for more info
---#PGPORT_4:QUERY_REWRITE(read only)
+
CREATE OR REPLACE FORCE VIEW "RHNSAT"."RHNHISTORYVIEW"
("EVENT_ID", "SERVER_ID", "SUMMARY", "DETAILS",
"CREATED", "MODIFIED") AS
select
id event_id, server_id, summary, details, created, modified
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
index 53d92cc..8fb577a 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
@@ -2,7 +2,6 @@
<write-mode name="remove_channel_permissions">
<query params="user_id,cid,role_label">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnChannelPermission CP
WHERE CP.user_id = :user_id
@@ -13,7 +12,6 @@ DELETE
<write-mode name="reset_channel_permissions">
<query params="user_id,cid,role_label">
-<!-- PGPORT_1:NO Change -->
INSERT
INTO rhnChannelPermission
(channel_id, user_id, role_id)
@@ -23,14 +21,12 @@ VALUES (:cid, :user_id, (SELECT id FROM rhnChannelPermissionRole WHERE
label = :
<mode name="get_all_orgs"
class="com.redhat.rhn.frontend.dto.OrgSystemEntitlementDto">
<query params="label">
-<!-- PGPORT_1:NO Change -->
SELECT id as orgid,name as orgname,:label as entname from web_customer where id !=
1
</query>
</mode>
<mode name="has_channel_family_entitlement">
<query params="org_id, label">
-<!-- PGPORT_1:NO Change -->
SELECT 1
FROM rhnChannelFamilyPermissions CFP
WHERE CFP.channel_family_id = (SELECT id FROM rhnChannelFamily WHERE label = :label)
@@ -40,7 +36,6 @@ SELECT 1
<mode name="orgs_in_satellite"
class="com.redhat.rhn.frontend.dto.OrgDto">
<query params="">
-<!-- PGPORT_2:AS KEYWORD -->
SELECT
wc.id,
wc.name,
@@ -53,7 +48,6 @@ FROM web_customer wc
<mode name="trusted_orgs"
class="com.redhat.rhn.frontend.dto.TrustedOrgDto">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT wc.id, wc.name,
(SELECT COUNT(s.id)
FROM rhnSharedChannelView s
@@ -69,7 +63,6 @@ AND torg.org_id = :org_id
<mode name="trust_overview"
class="com.redhat.rhn.frontend.dto.OrgTrustOverview">
<query params="org_id">
- <!-- PGPORT_2:AS KEYWORD -->
SELECT org.id,
org.name,
(SELECT count(*)
@@ -82,7 +75,6 @@ WHERE org.id != :org_id
</mode>
<mode name="get_total_entitlement_counts"
class="com.redhat.rhn.frontend.dto.MultiOrgSystemEntitlementsDto">
-<!-- PGPORT_1:NO Change -->
<query> SELECT sgt.id as id,
sgt.label as label,
SUM(sg.max_members) as total,
@@ -102,7 +94,6 @@ ORDER BY sgt.label
<mode name="get_org_entitlement_counts">
<query params="label">
-<!-- PGPORT_1:NO Change -->
SELECT wc.name as name,
wc.id as orgid,
sgt.label,
@@ -126,7 +117,6 @@ ORDER BY wc.name
<mode name="get_sat_entitlement_usage">
<query params="label">
-<!-- PGPORT_1:NO Change -->
SELECT SUM(sg.max_members) as total,
SUM(sg.current_members) as curr,
COUNT(sg.max_members) as alloc
@@ -140,7 +130,6 @@ AND sg.max_members > 0
<mode name="get_used_org_counts">
<query params="label">
-<!-- PGPORT_1:NO Change -->
SELECT COUNT(sg.org_id) as orgsused
FROM rhnServerGroup sg, rhnServerGroupMembers sgm, rhnServerGroupType sgt
WHERE sg.GROUP_TYPE = sgt.id
@@ -183,7 +172,6 @@ AND sg.max_members > 0
<write-mode name="create_chan_family">
<query params="org_id, name, label, url">
- <!-- PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) -->
INSERT INTO rhnChannelFamily
(id, name, label, org_id, product_url)
VALUES (rhn_channel_family_id_seq.nextval, :name, :label, :org_id, :url)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml
index 27114e8..e5b88d4 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml
@@ -2,7 +2,6 @@
<write-mode name="delete_set">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet
WHERE user_id = :user_id
@@ -12,7 +11,6 @@
<write-mode name="add_to_set_el3">
<query params="user_id, label, el_one, el_two, el_three">
-<!-- PGPORT_1:NO Change -->
INSERT
INTO rhnSet (user_id, label, element, element_two, element_three)
VALUES (:user_id, :label, :el_one, :el_two, :el_three)
@@ -21,7 +19,6 @@
<write-mode name="add_to_set_el2">
<query params="user_id, label, el_one, el_two">
-<!-- PGPORT_1:NO Change -->
INSERT
INTO rhnSet (user_id, label, element, element_two)
VALUES (:user_id, :label, :el_one, :el_two)
@@ -30,7 +27,6 @@
<write-mode name="add_to_set_el1">
<query params="user_id, label, el_one">
-<!-- PGPORT_1:NO Change -->
INSERT
INTO rhnSet (user_id, label, element)
VALUES (:user_id, :label, :el_one)
@@ -39,7 +35,6 @@
<write-mode name="delete_from_set_el3">
<query params="user_id, label, el_one, el_two, el_three">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet
WHERE user_id = :user_id
@@ -52,7 +47,6 @@
<write-mode name="delete_from_set_el2">
<query params="user_id, label, el_one, el_two">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet
WHERE user_id = :user_id
@@ -64,7 +58,6 @@
<write-mode name="delete_from_set_el1">
<query params="user_id, label, el_one">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet
WHERE user_id = :user_id
@@ -76,7 +69,6 @@
<mode name="lookup_set"
class="com.redhat.rhn.domain.rhnset.RhnSetElement">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
SELECT user_id, label, element, element_two, element_three
FROM rhnSet S
WHERE S.user_id = :user_id
@@ -86,7 +78,6 @@ SELECT user_id, label, element, element_two, element_three
<write-mode name="remove_illegal_servers">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE user_id = :user_id
AND label = :label
@@ -101,7 +92,6 @@ SELECT user_id, label, element, element_two, element_three
<write-mode name="remove_illegal_errata">
<query params="user_id, label, org_id">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE user_id = :user_id
AND label = :label
@@ -114,7 +104,6 @@ SELECT user_id, label, element, element_two, element_three
<write-mode name="remove_unowned_servers">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -127,7 +116,6 @@ SELECT user_id, label, element, element_two, element_three
<write-mode name="remove_unowned_virtual_servers">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -142,7 +130,6 @@ SELECT user_id, label, element, element_two, element_three
<write-mode name="remove_unowned_probes">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -155,7 +142,6 @@ SELECT user_id, label, element, element_two, element_three
<write-mode name="remove_unowned_actions">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -175,7 +161,6 @@ SELECT user_id, label, element, element_two, element_three
<write-mode name="remove_unowned_channels">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -187,7 +172,6 @@ SELECT user_id, label, element, element_two, element_three
<write-mode name="remove_unowned_errata">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet S
WHERE rowid IN(SELECT s.rowid
@@ -214,7 +198,6 @@ DELETE
<write-mode name="remove_nonrhn_unowned_errata">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet S
WHERE rowid IN(SELECT s.rowid
@@ -241,7 +224,6 @@ DELETE
<write-mode name="remove_unowned_system_profiles">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -254,7 +236,6 @@ DELETE
<write-mode name="remove_unowned_packages">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet
WHERE rowid IN(SELECT s.rowid
@@ -283,7 +264,6 @@ DELETE
<write-mode name ="remove_unowned_kickstart_scripts">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet
WHERE 1=1
@@ -301,7 +281,6 @@ DELETE
<write-mode name="remove_unowned_users">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -315,7 +294,6 @@ DELETE
<write-mode name="remove_unowned_system_groups">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE
FROM rhnSet S
WHERE S.user_id = :user_id
@@ -349,7 +327,6 @@ DELETE
<write-mode name="remove_unowned_filters">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -364,7 +341,6 @@ DELETE
<write-mode name="remove_unowned_suites">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -379,7 +355,6 @@ DELETE
<write-mode name="remove_unowned_activation_keys">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -393,7 +368,6 @@ DELETE
<write-mode name="remove_unowned_gpgssl_keys">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -407,7 +381,6 @@ DELETE
<write-mode name="remove_unowned_file_list">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -421,7 +394,6 @@ DELETE
<write-mode name="remove_unowned_package_profiles">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -435,7 +407,6 @@ DELETE
<write-mode name="remove_inaccessible_config_revs">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -445,7 +416,6 @@ DELETE
<write-mode name="remove_inaccessible_config_files">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
@@ -455,7 +425,6 @@ DELETE
<write-mode name="remove_inaccessible_config_channels">
<query params="user_id, label">
-<!-- PGPORT_1:NO Change -->
DELETE FROM rhnSet S
WHERE S.user_id = :user_id
AND S.label = :label
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
index 41caa0d..39d7ecf 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
@@ -1,5 +1,5 @@
<datasource_modes>
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN),ORAFCE(DECODE),AS KEYWORD -->
+
<query name="visible_to_user_overview_fast" params="org_id,
user_id">
SELECT
G.ID AS ID, G.NAME AS NAME,
@@ -58,7 +58,6 @@
</query>
<query name="errata_count">
-<!-- PGPORT_1:NO Change -->
SELECT
sgm.server_group_id AS ID,
( select count(distinct E.id) from rhnErrata E where E.id = SNPC.errata_id
AND E.advisory_type = 'Security Advisory') AS SECURITY_ERRATA,
@@ -78,7 +77,6 @@
</query>
<query name="visible_to_user_overview_slow" params="org_id,
user_id">
- <!-- PGPORT_3:ORAFCE(NVL) -->
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
GO.GROUP_ID AS ID, GROUP_NAME, GROUP_ADMINS, SERVER_COUNT,
NOTE_COUNT, GO.MODIFIED, GO.MAX_MEMBERS,
@@ -93,7 +91,6 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
<query name="visible_to_user_ids-back" params="user_id">
- <!-- PGPORT_4:QUERY_REWRITE(ORDER BY) -->
SELECT DISTINCT SG.id AS ID, SG.name AS NAME,
( SELECT COUNT ( * )
FROM rhnServerGroupMembers SGM
@@ -110,7 +107,6 @@ ORDER BY UPPER(NAME)
</query>
<query name="visible_to_user_ids" params="user_id">
- <!-- PGPORT_4:QUERY_REWRITE(ORDER BY) -->
SELECT DISTINCT SG.id AS ID, SG.name AS NAME
FROM rhnServerGroup SG, rhnUserManagedServerGroups UMSG
WHERE UMSG.user_id = :user_id
@@ -123,7 +119,6 @@ ORDER BY UPPER(NAME)
<mode name="is_visible">
<query params="sgid, user_id">
-<!-- PGPORT_1:NO Change -->
SELECT 1
FROM rhnServerGroup SG
inner join rhnUserManagedServerGroups UMSG on UMSG.server_group_id = SG.id
@@ -142,7 +137,6 @@ ORDER BY UPPER(NAME)
<mode name="visible_to_system">
<query params="sid, org_id, user_id">
- <!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN),ORAFCE(DECODE),AS KEYWORD -->
SELECT MAX(DECODE(VSGM.server_id, :sid, 1, 0)) is_system_member,
VSGM.GROUP_ID id,
VSGM.GROUP_NAME,
@@ -161,7 +155,6 @@ ORDER BY UPPER(VSGM.group_name), VSGM.group_id
<mode name="user_permissions">
<query params="user_id, org_id">
- <!-- PGPORT_3:ORAFCE(NVL) -->
SELECT SG.id, SG.name AS NAME, SG.current_Members as server_count,
NVL((SELECT MAX(1)
FROM rhnUserServerGroupPerms USGP
@@ -176,7 +169,6 @@ ORDER BY UPPER(SG.name), SG.id
<mode name="unused_entitlements">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT SUM(max_members - current_members) AS available
FROM rhnServerGroup
WHERE org_id = :org_id
diff --git
a/java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_setbuilder.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_setbuilder.xml
index 09a341a..32e4bf7 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_setbuilder.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/errata_search_setbuilder.xml
@@ -2,7 +2,6 @@
<mode name="simple_errata_search">
<query params="org_id, search_string">
-<!--#PGPORT_3:ORAFCE(INSTR)-->
SELECT E.id
FROM rhnErrata E,
rhnChannelErrata CE,
@@ -17,7 +16,6 @@ SELECT E.id
<mode name="errata_search_by_advisory">
<query params="user_id, search_string">
-<!--#PGPORT_3:ORAFCE(INSTR)-->
SELECT E.id
FROM rhnErrata E,
rhnChannelErrata CE,
@@ -31,7 +29,6 @@ SELECT E.id
<mode name="errata_search_by_package_name">
<query params="user_id, search_string">
-<!--#PGPORT_3:ORAFCE(INSTR)-->
SELECT E.id
FROM rhnErrata E,
rhnPackageName PN,
diff --git
a/java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_setbuilder.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_setbuilder.xml
index 5bb0669..da7cd93 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_setbuilder.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/package_search_setbuilder.xml
@@ -2,7 +2,6 @@
<mode name="simple_package_search">
<query params="org_id, search_string">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -20,7 +19,6 @@ SELECT DISTINCT PN.id
<mode name="simple_package_search_smart">
<query params="org_id, search_string">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -39,7 +37,6 @@ SELECT DISTINCT PN.id
<mode name="simple_package_search_clabel">
<query params="org_id, search_string, channel_label">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -57,7 +54,6 @@ SELECT DISTINCT PN.id
<mode name="package_search_by_name">
<query params="org_id, search_string">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -74,7 +70,6 @@ SELECT DISTINCT PN.id
<mode name="package_search_by_name_smart">
<query params="org_id, search_string">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -91,7 +86,6 @@ SELECT DISTINCT PN.id
<mode name="package_search_by_name_clabel">
<query params="org_id, search_string, channel_label">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml
index 2075b0a..d911efa 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml
@@ -2,7 +2,6 @@
<mode name="profile_overview"
class="com.redhat.rhn.frontend.dto.ProfileOverviewDto">
<query params="org_id">
-<!-- # PGPORT_2:AS KEYWORD-->
SELECT SP.ID, SP.NAME, C.name CHANNEL_NAME,
TO_CHAR(SP.created, 'YYYY-MM-DD') AS CREATED
FROM rhnChannel C,
@@ -16,7 +15,6 @@ ORDER BY UPPER(SP.name)
<mode name="profile_package_overview"
class="com.redhat.rhn.frontend.dto.ProfilePackageOverviewDto">
<query params="prid">
-<!--#PGPORT_1:NO Change-->
SELECT PN.name || '-' || PE.evr.as_vre_simple() AS NVRE,
PA.label as arch
FROM rhnServerProfilePackage SPP LEFT OUTER JOIN
@@ -30,7 +28,6 @@ ORDER BY UPPER(PN.name), PE.evr
<mode name="compatible_with_channel"
class="com.redhat.rhn.frontend.dto.ProfileDto">
<query params="org_id, cid">
-<!--#PGPORT_4:QUERY_REWRITE(ORDER BY)-->
SELECT DISTINCT SP.id, SP.name
FROM rhnServerProfile SP, rhnServerProfileType SPT
WHERE SP.org_id = :org_id
@@ -43,7 +40,6 @@ ORDER BY SP.name
<write-mode name="delete_package_profile">
<query params="sid">
-<!--#PGPORT_1:NO Change-->
DELETE FROM rhnServerProfilePackage
WHERE server_profile_id = :sid
</query>
@@ -51,7 +47,6 @@ ORDER BY SP.name
<write-mode name="insert_package_profile">
<query params="prid, sid">
-<!--#PGPORT_1:NO Change-->
INSERT INTO rhnServerProfilePackage (server_profile_id, name_id, evr_id,
package_arch_id)
SELECT DISTINCT :prid, SP.name_id, SP.evr_id, SP.package_arch_id
FROM rhnServerPackage SP
diff --git a/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
b/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
index af7391c..79fee30 100644
--- a/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
@@ -394,12 +394,11 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
<query name="Action.getServerActionCount">
-<!-- PGPORT_1:NO Change -->
<![CDATA[
select a.serverActions.size
from com.redhat.rhn.domain.action.Action as a where a.id = :aid and org_id =
:orgId]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="Action.getServerActionCountByStatus">
<return-scalar type="int" column="count"/>
<![CDATA[select count(sa.server_id) as count from rhnServerAction sa where
sa.action_id = :aid and
@@ -413,7 +412,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
]]></query>
<sql-query
name="Action.findLastActionByServerIdAndActionTypeIdAndUserId">
-<!-- PGPORT_2:AS KEYWORD -->
<![CDATA[
select {ra.*}
from rhnAction {ra},
@@ -449,21 +447,21 @@ select {ra.*}
sa.server = :server]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<query name="Action.rescheduleFailedActions">
<![CDATA[ update com.redhat.rhn.domain.action.server.ServerAction sa
set sa.status = :queued, sa.remainingTries = :tries
where sa.status = :failed and
sa.parentAction = :action ]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<query name="Action.rescheduleAllActions">
<![CDATA[ update com.redhat.rhn.domain.action.server.ServerAction sa
set sa.status = :queued, sa.remainingTries = :tries
where sa.parentAction = :action ]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="Action.findServerIds">
<![CDATA[
select sa.server_id
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
index 178e835..8319b33 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
@@ -106,7 +106,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<query name="PublishedErrata.findByAdvisory">
<![CDATA[from com.redhat.rhn.domain.errata.impl.PublishedErrata as e
where e.advisory = :advisory]]>
-<!-- PGPORT_1:NO Change -->
</query>
<query name="PublishedErrata.lookupSortedByChannel">
<![CDATA[select e
@@ -116,7 +115,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
order by e.issueDate
]]>
</query>
-<!-- PGPORT_1:NO Change -->
<query name="PublishedErrata.lookupByChannelBetweenDates">
<![CDATA[select e
from com.redhat.rhn.domain.errata.impl.PublishedErrata as e
@@ -127,14 +125,13 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
order by e.issueDate
]]>
</query>
-<!-- PGPORT_1:NO Change -->
<query name="PublishedErrata.searchById">
<![CDATA[select distinct e.id, e.advisory, e.advisoryName, e.advisoryType,
e.synopsis, e.updateDate, e.issueDate
from com.redhat.rhn.domain.errata.impl.PublishedErrata as e
where e.id IN (:eids)
]]>
</query>
-<!-- PGPORT_1:NO Change -->
+
<sql-query name="PublishedErrata.searchByPackageIds">
<![CDATA[select distinct e.id, e.advisory, e.advisory_name as advisoryName,
e.advisory_type as advisoryType, e.synopsis as advisorySynopsis,
e.update_date as updateDate, e.issue_date as issueDate, pn.name
@@ -156,7 +153,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<return-scalar column="issueDate" type="timestamp" />
<return-scalar column="name" type="string" />
</sql-query>
-<!-- PGPORT_1:NO Change -->
+
<sql-query name="PublishedErrata.lookupFromSet">
<![CDATA[SELECT {e.*}
from rhnErrata e left join
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml
index d3a9386..96693c7 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml
@@ -114,7 +114,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="commandSort">
<load-collection alias="sortcol"
role="com.redhat.rhn.domain.kickstart.KickstartData.commands"/>
- <!--#PGPORT_1:NO Change-->
SELECT {sortcol.*}
FROM rhnKickstartCommand sortcol, rhnKickstartCommandName cname
WHERE KICKSTART_ID = :id
@@ -130,7 +129,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
AND ksd.kstree_id = 121
-->
<sql-query name="KickstartData.lookupByTreeId">
-<!--#PGPORT_1:NO Change-->
<![CDATA[SELECT {k.*}
FROM rhnKickstartDefaults ksd,
rhnksdata k
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
index a775d54..7b33a63 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
@@ -188,7 +188,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<query name="Package.findByPackageName">
<![CDATA[from com.redhat.rhn.domain.rhnpackage.Package as p where
p.packageName = :packageName]]>
</query>
-<!-- PGPORT_1:NO Change -->
+
<query name="Package.searchByIdAndArches">
<![CDATA[select distinct p.packageName.id, p.packageName.name, p.summary
from com.redhat.rhn.domain.rhnpackage.Package as p,
@@ -198,7 +198,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
and p in elements(c.packages)
]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<query name="Package.searchById">
<![CDATA[select distinct p.packageName.id, p.packageName.name, p.summary
from com.redhat.rhn.domain.rhnpackage.Package as p,
@@ -209,7 +209,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
and p IN elements (c.packages)
]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<query name="Package.listOrphans">
<![CDATA[ select p
from com.redhat.rhn.domain.rhnpackage.Package as p
@@ -230,7 +230,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
(p.org is null or p.org = :org)
]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="Package.lookupFromSet">
<![CDATA[SELECT {p.*}
from rhnPackage p
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/profile/Profile.hbm.xml
b/java/code/src/com/redhat/rhn/domain/rhnpackage/profile/Profile.hbm.xml
index 7201730..160d8fb 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/profile/Profile.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/profile/Profile.hbm.xml
@@ -40,7 +40,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
where p.id = :id and org_id=:org_id]]>
</query>
<sql-query name="Profile.compatibleWithServer">
-<!--#PGPORT_1:NO Change-->
<![CDATA[SELECT DISTINCT {p.*}
FROM rhnServer S,
rhnServerProfile P
@@ -60,7 +59,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<return alias="p"
class="com.redhat.rhn.domain.rhnpackage.profile.Profile" />
</sql-query>
<sql-query name="Profile.findByNameAndOrgId">
-<!--#PGPORT_1:NO Change-->
<![CDATA[SELECT {p.*}
FROM rhnServerProfile P
WHERE P.name = :name
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerGroup.hbm.xml
b/java/code/src/com/redhat/rhn/domain/server/ServerGroup.hbm.xml
index bd6de1a..320dc0b 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerGroup.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerGroup.hbm.xml
@@ -68,7 +68,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
<sql-query name="ServerGroup.lookupByTypeLabelAndOrg2">
- <!-- PGPORT_1:NO Change -->
<![CDATA[ select {sg.*}
from rhnServerGroup SG
where SG.group_type = (select id from rhnServerGroupType where label = :label)
@@ -82,7 +81,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
and s.org = :org
]]>
</query>
-<!-- PGPORT_1:NO Change -->
+
<sql-query name="ServerGroup.lookupAdministeredServerGroups">
<![CDATA[ select {sg.*}
from rhnServerGroup SG,
@@ -95,7 +94,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="ServerGroup.lookupAdministrators">
-<!-- PGPORT_1:NO Change -->
<![CDATA[ select {wc.*}
from WEB_CONTACT wc
inner join rhnUserManagedServerGroups umsg on wc.id = umsg.user_id
@@ -108,7 +106,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="ServerGroup.lookupGroupsWithNoAssocAdmins">
-<!-- PGPORT_1:NO Change -->
<![CDATA[ select {sg.*}
from rhnServerGroup SG
where
@@ -129,7 +126,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="ServerGroup.lookupServerIds">
-<!-- PGPORT_1:NO Change -->
<![CDATA[ select s.id
from rhnServer s
inner join rhnServerGroupMembers sgm on s.id = sgm.server_id
@@ -138,7 +134,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
and s.org_id = :org_id
]]>
</sql-query>
-<!-- PGPORT_1:NO Change -->
+
<sql-query name="ServerGroup.lookupCurrentMembersValue">
<![CDATA[ select Current_Members from rhnServerGroup
where id = :sgid
@@ -146,7 +142,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="ServerGroup.lookupEntitlementGroups">
-<!-- PGPORT_1:NO Change -->
<![CDATA[select {sg.*}
from rhnServerGroup sg
inner join rhnServerGroupMembers sgm on sg.id = sgm.server_group_id
@@ -159,7 +154,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="ServerGroup.lookupManagedGroups">
-<!-- PGPORT_1:NO Change -->
<![CDATA[select {sg.*}
from rhnServerGroup sg
inner join rhnServerGroupMembers sgm on sg.id = sgm.server_group_id
@@ -180,7 +174,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[from com.redhat.rhn.domain.server.ManagedServerGroup as s where
s.org = :org and (s.groupType is null)]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="ServerGroup.lookupActiveServerIds">
<![CDATA[
SELECT S.id
@@ -192,17 +186,16 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
SGM.server_group_id = :sgid
]]>
</sql-query>
- <sql-query name="ServerGroup.lookupInactiveServerIds">
-<!-- PGPORT_1:NO Change -->
+ <sql-query name="ServerGroup.lookupInactiveServerIds">
<![CDATA[
SELECT S.id
FROM rhnServerGroupMembers SGM
inner join rhnServer S on SGM.server_id = s.id
inner join rhnServerInfo SI on S.id = SI.server_id
- WHERE
- SI.checkin < (sysdate - :threshold) AND
- SGM.server_group_id = :sgid
+ WHERE
+ SI.checkin < (sysdate - :threshold) AND
+ SGM.server_group_id = :sgid
]]>
- </sql-query>
+ </sql-query>
</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml
b/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml
index b902dfa..b938eef 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml
@@ -176,7 +176,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[from com.redhat.rhn.domain.server.Server as s where s.id = :sid and
ORG_ID = :orgId]]>
</query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="Server.findVirtPlatformHostsByOrg">
<![CDATA[select s.id as id, s.name as name, count(vi.id) as count
from rhnServer S
@@ -188,7 +188,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
and vi.virtual_system_id is not null
group by s.id, s.name]]>
</sql-query>
- <!-- PGPORT_1:NO Change -->
+
<sql-query name="Server.findVirtHostsExceedingGuestLimitByOrg">
<![CDATA[select s.id as id, s.name as name, count(vi.id) as count
from rhnServer S
@@ -203,7 +203,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Server.lookupAdministrators">
-<!-- PGPORT_1:NO Change -->
<![CDATA[select {wc.*}
from WEB_CONTACT wc
inner join rhnUserServerPerms usp on wc.id = usp.user_id
@@ -216,7 +215,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Server.findUngrouped">
-<!-- PGPORT_1:NO Change -->
<![CDATA[select {S.*}
from rhnServer {S}
left outer join rhnSatelliteInfo S_2_ on S.id = S_2_.server_id
@@ -238,7 +236,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Server.listProxies">
-<!-- PGPORT_1:NO Change -->
<![CDATA[select S.id
from rhnServer S
inner join rhnUserServerPerms USP on USP.server_id = S.id
@@ -249,7 +246,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</sql-query>
<sql-query name="Server.findInSet">
-<!-- PGPORT_1:NO Change -->
<![CDATA[
select S.*,
case when p.host_id is not null then 1
diff --git a/monitoring/NOCpulsePlugins/Oracle/BlockingSessions.pm
b/monitoring/NOCpulsePlugins/Oracle/BlockingSessions.pm
index 2c9f68e..bbe0ff3 100644
--- a/monitoring/NOCpulsePlugins/Oracle/BlockingSessions.pm
+++ b/monitoring/NOCpulsePlugins/Oracle/BlockingSessions.pm
@@ -14,7 +14,7 @@ sub run {
$params{ora_sid} = delete $params{sid_0};
my $ora = $args{data_source_factory}->oracle(%params);
- #PGPORT_1:NO Change
+
my $row = $ora->fetch_first(q{
select count(*) as BLOCKED from v$lock
where ctime > ?
diff --git a/monitoring/NPalert/test/TestAlertDB.pm
b/monitoring/NPalert/test/TestAlertDB.pm
index 997b96a..6d3e3f4 100644
--- a/monitoring/NPalert/test/TestAlertDB.pm
+++ b/monitoring/NPalert/test/TestAlertDB.pm
@@ -170,7 +170,7 @@ sub test_connect {
my $db = $self->{'blah'};
$db->connect;
-#PGPORT_1:NO Change
+
eval {
$db->dbprepare("select * from dual");
};
diff --git a/monitoring/PerlModules/CPAN/DBD-Pg-0.95/Pg.pm
b/monitoring/PerlModules/CPAN/DBD-Pg-0.95/Pg.pm
index 21fc93b..cb5bbad 100644
--- a/monitoring/PerlModules/CPAN/DBD-Pg-0.95/Pg.pm
+++ b/monitoring/PerlModules/CPAN/DBD-Pg-0.95/Pg.pm
@@ -130,7 +130,7 @@ $DBD::Pg::VERSION = '0.95';
sub table_info { # DBI spec: TABLE_CAT, TABLE_SCHEM, TABLE_NAME, TABLE_TYPE,
REMARKS
my($dbh) = @_;
- # PGPORT_1:NO Change #
+
my $sth = $dbh->prepare("
SELECT c.reltype, u.usename, c.relname, 'TABLE', ''
FROM pg_class c, pg_user u
@@ -157,7 +157,7 @@ $DBD::Pg::VERSION = '0.95';
sub tables {
my($dbh) = @_;
- # PGPORT_1:NO Change #
+
my $sth = $dbh->prepare("
select relname
from pg_class
@@ -176,7 +176,7 @@ $DBD::Pg::VERSION = '0.95';
return @tables;
}
- # PGPORT_1:NO Change #
+
sub table_attributes {
my ($dbh, $table) = @_;
my $result = [];
@@ -195,7 +195,6 @@ $DBD::Pg::VERSION = '0.95';
return $result unless scalar(@$attrs);
# Get the primary key
- # PGPORT_1:NO Change #
my ($pri_key) = $dbh->selectrow_array("SELECT pg_attribute.attname
FROM pg_class, pg_attribute, pg_index
WHERE pg_class.oid =
pg_attribute.attrelid
@@ -223,12 +222,10 @@ $DBD::Pg::VERSION = '0.95';
};
# Get the default value, if any
- # PGPORT_1:NO Change #
my ($default) = $dbh->selectrow_array("SELECT adsrc FROM pg_attrdef
WHERE adnum = $attnum") if -1 == $attnum;
$default = '' unless $default;
# Test for any constraints
- # PGPORT_1:NO Change #
my ($constraint) = $dbh->selectrow_array("select rcsrc from
pg_relcheck where rcname = '${table}_$col_name'");
$constraint = '' unless $constraint;
diff --git a/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
b/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
index 158e5bc..b2342a1 100644
--- a/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
+++ b/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
@@ -95,7 +95,7 @@ sub CQ_Commands {
return @cols;
} elsif ($action eq 'insert') {
- # PGPORT_3:ORAFCE(DUAL) #
+
my $rv = $self->dbexec("SELECT $idseq FROM dual");
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
@@ -153,7 +153,7 @@ sub CQ_Instances {
return @cols;
} elsif ($action eq 'insert') {
- # PGPORT_3:ORAFCE(DUAL) #
+
my $rv = $self->dbexec("SELECT $idseq FROM dual");
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
@@ -345,7 +345,7 @@ sub Customer {
return @cols;
} elsif ($action eq 'insert') {
- # PGPORT_3:ORAFCE(DUAL) #
+
my $rv = $self->dbexec("SELECT $idseq FROM dual");
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
@@ -406,7 +406,7 @@ sub Netsaint {
return @cols;
} elsif ($action eq 'insert') {
- # PGPORT_3:ORAFCE(DUAL) #
+
my $rv = $self->dbexec("SELECT $idseq FROM dual");
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
@@ -472,7 +472,7 @@ sub Node {
return @cols;
} elsif ($action eq 'insert') {
- # PGPORT_3:ORAFCE(DUAL) #
+
my $rv = $self->dbexec("SELECT $idseq FROM dual");
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
@@ -575,7 +575,7 @@ sub Contact {
return @cols;
} elsif ($action eq 'insert') {
- # PGPORT_3:ORAFCE(DUAL) #
+
my $rv = $self->dbexec("SELECT $idseq FROM dual");
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
@@ -958,7 +958,7 @@ sub getUnexpiredCQ_SessionBySessionId {
my $self = shift;
my $sid = shift;
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
+
my($dataref, $ordref) =
$self->CQ_Sessions('select', ['session_id = ?',
'expiration_date > sysdate'], [$sid]);
@@ -1417,7 +1417,7 @@ sub updateCQ_Session {
sub get_sysdate {
#################
my $self = shift();
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
+
my $statement = sprintf("SELECT TO_CHAR(sysdate, '%s') as current_time
FROM dual",$self->dateformat);
my $ref = $self->dbexec($statement);
diff --git a/monitoring/PerlModules/NP/OracleDB/OracleDB.pm
b/monitoring/PerlModules/NP/OracleDB/OracleDB.pm
index 9ca8292..b41bab7 100644
--- a/monitoring/PerlModules/NP/OracleDB/OracleDB.pm
+++ b/monitoring/PerlModules/NP/OracleDB/OracleDB.pm
@@ -255,7 +255,7 @@ sub desc {
if ($self->desc_cache()) {
return $DESC{uc($tablename)} if (exists($DESC{uc($tablename)}));
}
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $sql = "SELECT LOWER(t.column_name),t.data_type,
t.data_precision,t.nullable
FROM all_tab_columns t, all_synonyms s
@@ -296,7 +296,6 @@ sub TableOp {
$self->dprint(3, "\tInserting into table\n");
my $cols = join(',', @$colref);
-#PGPORT_1:NO Change
$sql_statement = sprintf<<EOSQL, join(', ', @$whereclauses);
INSERT INTO $table ($cols)
VALUES (%s)
diff --git a/monitoring/PerlModules/NP/Probe/DataSource/test/TestOracle.pm
b/monitoring/PerlModules/NP/Probe/DataSource/test/TestOracle.pm
index 4ef143c..61592c9 100644
--- a/monitoring/PerlModules/NP/Probe/DataSource/test/TestOracle.pm
+++ b/monitoring/PerlModules/NP/Probe/DataSource/test/TestOracle.pm
@@ -86,12 +86,12 @@ sub test_sql {
$self->assert($ora->connected, "Cannot connect to Oracle: ",
$ora->errors);
my $result;
- #PGPORT_1:NO Change
+
$result = $ora->fetch_first('select count(*) from dual');
$self->assert(ref($result) eq 'HASH', "Dual count results not hash:
", ref($result));
my $count = $result->{'COUNT(*)'};
$self->assert($count == 1, "Dual row count not one: $count");
- #PGPORT_5:POSTGRES_VERSION_QUERY(ROWNUM)
+
$result = $ora->fetch(q{
select recid, description
from probe where rownum < 10
@@ -106,7 +106,7 @@ sub test_sql {
$self->assert($recid == 2, "Wrong recid for second row: $recid");
my $descr = $result->[1]->{'DESCRIPTION'};
$self->assert($descr eq 'lab-2', "Wrong description for second row:
$descr");
- #PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
$result = $ora->fetch_first(q{
select a.value as SPACE_REQS, b.value as ALLOC_RETRIES
from v$sysstat a, v$sysstat b
@@ -116,7 +116,7 @@ sub test_sql {
$self->assert(ref($result) eq 'HASH', "Sysstat query not an array
ref: ", ref($result));
$self->assert(defined $result->{SPACE_REQS}, "Sysstat query got no space
requests");
$self->assert(defined $result->{ALLOC_RETRIES}, "Sysstat query got no
allocation retries");
-#PGPORT_1:NO Change
+
try {
$result = $ora->fetch('select foo from no_such_table,
another_bad_one',
['no_such_table', 'another_bad_one']);
diff --git a/monitoring/PerlModules/NP/Probe/DataSource/test/TestSQLServer.pm
b/monitoring/PerlModules/NP/Probe/DataSource/test/TestSQLServer.pm
index 477c5d7..ce9b906 100644
--- a/monitoring/PerlModules/NP/Probe/DataSource/test/TestSQLServer.pm
+++ b/monitoring/PerlModules/NP/Probe/DataSource/test/TestSQLServer.pm
@@ -69,7 +69,7 @@ sub test_sql {
$self->assert($ss->connected, "Cannot connect to SQLServer: ",
$ss->errors);
my $result;
-#PGPORT_1:NO Change
+
$result = $ss->fetch_first('select count(*) as num_users from sysusers');
$self->assert(ref($result) eq 'HASH', "Sysusers count results not
hash: ", ref($result));
my $count = $result->{'num_users'};
@@ -92,7 +92,7 @@ sub test_sql {
$self->assert($name eq 'guest', "Wrong name for first row:
$name");
$name = $result->[1]->{'name'};
$self->assert($name eq 'public', "Wrong name for second row:
$name");
-#PGPORT_1:NO Change
+
try {
$result = $ss->fetch('select foo from no_such_table,
another_bad_one',
['no_such_table', 'another_bad_one']);
diff --git a/monitoring/SputLite/html/cgi-bin/create_commands.cgi
b/monitoring/SputLite/html/cgi-bin/create_commands.cgi
index 2e5deca..de88aec 100755
--- a/monitoring/SputLite/html/cgi-bin/create_commands.cgi
+++ b/monitoring/SputLite/html/cgi-bin/create_commands.cgi
@@ -998,7 +998,6 @@ my $val = $q->param("val_field$_");
}
#execute the newly constructed sql statement
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
my $sql1 = "
$select1
$from1
diff --git a/monitoring/nocpulse-db-perl/Database.pm
b/monitoring/nocpulse-db-perl/Database.pm
index 4fff960..4d9ae87 100644
--- a/monitoring/nocpulse-db-perl/Database.pm
+++ b/monitoring/nocpulse-db-perl/Database.pm
@@ -39,7 +39,6 @@ sub insert {
my $value = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOS);
INSERT INTO $self->{table_name}
(o_id, entry_time, data)
@@ -60,7 +59,6 @@ sub insert_list {
my $list = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOS);
INSERT INTO $self->{table_name}
(o_id, entry_time, data)
@@ -88,7 +86,6 @@ sub fetch {
my $get_initial = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOS);
SELECT entry_time, data
FROM $self->{table_name}
@@ -132,7 +129,7 @@ sub last {
$before_clause = " AND entry_time < :before";
push @params, (before => $before);
}
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOS);
SELECT entry_time, data
@@ -156,7 +153,6 @@ sub delete {
my $key = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOS);
DELETE FROM $self->{table_name}
WHERE o_id = :o_id
@@ -174,7 +170,7 @@ EOS
sub size {
my $self = shift;
my $oid = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOS);
SELECT COUNT(*)
diff --git a/monitoring/status_log_acceptor/AcceptStatusLog.pm
b/monitoring/status_log_acceptor/AcceptStatusLog.pm
index 7c879d2..e3f743e 100644
--- a/monitoring/status_log_acceptor/AcceptStatusLog.pm
+++ b/monitoring/status_log_acceptor/AcceptStatusLog.pm
@@ -19,7 +19,7 @@ sub store_probe_state
my $probe_state = shift;
# print "storing probe state...\n";
- #PGPORT_1:NO Change
+
my $update_probe = $cs_dbh->prepare(q{
UPDATE PROBE_STATE
SET LAST_CHECK = TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS'),
@@ -28,7 +28,7 @@ sub store_probe_state
WHERE SCOUT_ID = ?
AND PROBE_ID = ?
});
- #PGPORT_1:NO Change
+
my $insert_probe = $cs_dbh->prepare(q{
INSERT INTO PROBE_STATE
(LAST_CHECK, STATE, OUTPUT, SCOUT_ID, PROBE_ID)
@@ -93,10 +93,10 @@ sub store_program
pct_pending recent_state_changes imminent_probes
max_exec_time min_exec_time avg_exec_time max_latency
min_latency avg_latency );
-#PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
+
my $update_sql =
"UPDATE SATELLITE_STATE SET LAST_CHECK = SYSDATE";
-#PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE)
+
my $insert_sql = sprintf(
"INSERT INTO SATELLITE_STATE (SATELLITE_ID, LAST_CHECK, %s) " .
"VALUES (?, SYSDATE", join(",\n", @params));
diff --git a/scripts/ncsu-rhntools/rhnstats/schema.py
b/scripts/ncsu-rhntools/rhnstats/schema.py
index cfff70f..dccca61 100644
--- a/scripts/ncsu-rhntools/rhnstats/schema.py
+++ b/scripts/ncsu-rhntools/rhnstats/schema.py
@@ -1,4 +1,3 @@
-#PGPORT_1:NO Change
INITDB = """
create table CLIENTS (
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 1b06a67..4181685 100644
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -317,7 +317,6 @@ sub valid_cert_countries {
my $answers = shift;
my $dbh = Spacewalk::Setup::get_dbh($answers);
- # PGPORT_4:DONE:QUERY_REWRITE(ANSI JOIN) #
# NOTE: Removed a nvl on TL.short_name_tl and VC.short_name here,
# short_name_tl was always NULL.
my $sth = $dbh->prepare(<<EOQ);
@@ -1047,7 +1046,6 @@ sub final_db_config {
my $answers = shift;
my $dbh = Spacewalk::Setup::get_dbh($answers);
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
SELECT TS.value
FROM rhnTemplateString TS
@@ -1058,7 +1056,6 @@ EOQ
my ($current_hostname) = $sth->fetchrow();
unless ($current_hostname) {
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
$sth = $dbh->prepare(<<EOQ);
INSERT
INTO rhnTemplateString
@@ -1172,8 +1169,6 @@ sub update_monitoring_environment {
# BZ 226915 we cannot use db_name from %answers - it contains instance name
# we want real db name
($db_name) = $dbh->selectrow_array(q|SELECT UPPER(sys_context('userenv',
'db_name')) FROM dual|);
- # PGPORT_1:NO Change #
- }
my $sth = $dbh->prepare(<<EOQ);
UPDATE rhn_db_environment
@@ -1200,7 +1195,6 @@ sub update_monitoring_config {
my $mon_config = shift;
my $dbh = Spacewalk::Setup::get_dbh($answers);
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
UPDATE rhn_config_macro
SET definition = ?,
diff --git a/web/modules/dobby/Dobby/DB.pm b/web/modules/dobby/Dobby/DB.pm
index 5672ec5..bef7fc0 100644
--- a/web/modules/dobby/Dobby/DB.pm
+++ b/web/modules/dobby/Dobby/DB.pm
@@ -103,7 +103,6 @@ sub tablespaces {
my $ts = shift;
my $dbh = $self->sysdba_connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
my $sth = $dbh->prepare(<<EOS);
select tablespace_name NAME, contents TYPE from dba_tablespaces
EOS
@@ -117,7 +116,7 @@ sub tablespace_datafiles {
my $ts = shift;
my $dbh = $self->sysdba_connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG),As keyword
+
my $sth = $dbh->prepare(<<EOS);
select file_name FILENAME, status STATUS, bytes BYTES,
'DATAFILE' filetype
diff --git a/web/modules/dobby/Dobby/Reporting.pm b/web/modules/dobby/Dobby/Reporting.pm
index 1f3583b..da97e7f 100644
--- a/web/modules/dobby/Dobby/Reporting.pm
+++ b/web/modules/dobby/Dobby/Reporting.pm
@@ -23,7 +23,7 @@ sub tablespace_overview {
my $dobby = shift;
my $dbh = $dobby->sysdba_connect;
-#PGPORT_4:QUERY_REWRITE(ANSI JOIN)
,POSTGRES_VERSION_QUERY(CATALOG),orafce(NVL),orafce(AS)
+
my $query = <<EOQ;
SELECT DT.tablespace_name NAME, DT.extent_management,
nvl(DFS.bytes,0) FREE_BYTES, nvl(DTS.bytes,0) TOTAL_BYTES,
@@ -52,7 +52,7 @@ sub table_size_overview {
my $dobby = shift;
my $dbh = $dobby->sysdba_connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $query = <<EOQ;
SELECT de.segment_name AS NAME, SUM(de.bytes) AS TOTAL_BYTES
FROM dba_tables dt, dba_extents de
@@ -72,7 +72,7 @@ sub segadv_recomendations {
my $dobby = shift;
my $dbh = $dobby->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(CATALOG)
+
my $query = <<EOQ;
SELECT tbs.segment_space_management, rec.*
FROM TABLE(DBMS_SPACE.ASA_RECOMMENDATIONS()) rec,
diff --git a/web/modules/pxt/PXT/Utils.pm b/web/modules/pxt/PXT/Utils.pm
index d4d83b4..8c6fabf 100644
--- a/web/modules/pxt/PXT/Utils.pm
+++ b/web/modules/pxt/PXT/Utils.pm
@@ -144,7 +144,7 @@ sub country_selectbox {
$current ||= $default || '';
my $dbh = RHN::DB->connect;
-#PGPORT_4:QUERY_REWRITE(ANSI JOIN) ,NVL
+
my $sql = "SELECT vc.code, nvl(short_name_tl, short_name)
FROM valid_countries vc, valid_countries_tl tl
where tl.lang (+) = ? and tl.code (+)= vc.code
@@ -346,7 +346,7 @@ sub prefix_selectbox {
my ($class, $formvar, $default) = @_;
my $dbh = RHN::DB->connect;
-#PGPORT_1:NO Change
+
my $sql = "SELECT text FROM web_user_prefix WHERE text <> '.' AND
text <> ' ' ORDER BY text";
my $sth = $dbh->prepare($sql);
diff --git a/web/modules/rhn/RHN/DB/AppInstall/Session.pm
b/web/modules/rhn/RHN/DB/AppInstall/Session.pm
index 101346a..39db401 100644
--- a/web/modules/rhn/RHN/DB/AppInstall/Session.pm
+++ b/web/modules/rhn/RHN/DB/AppInstall/Session.pm
@@ -205,7 +205,7 @@ sub lookup {
sub lookup_session_data {
my $self = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOQ);
SELECT AISD.key, AISD.value, AISD.extra_data
@@ -244,7 +244,7 @@ sub commit {
unless ($self->get_id) {
my $seq = $self->sequence;
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
my $sth = $dbh->prepare("SELECT $seq.nextval FROM DUAL");
$sth->execute;
my ($id) = $sth->fetchrow;
@@ -292,7 +292,7 @@ sub commit_session_data {
my $dbh = RHN::DB->connect;
my %data = $self->get_session_data();
- # PGPORT_1:NO Change #
+
my $sth = $dbh->prepare(<<EOQ);
DELETE
FROM rhnAppInstallSessionData AISD
@@ -300,14 +300,14 @@ DELETE
EOQ
$sth->execute_h(session_id => $self->get_id);
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
my $val_sth = $dbh->prepare(<<EOQ);
INSERT
INTO rhnAppInstallSessionData
(id, session_id, key, value)
VALUES (rhn_appinst_sdata_id_seq.nextval, :session_id, :key, :value)
EOQ
-# PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
my $dat_sth = $dbh->prepare(<<EOQ);
INSERT
INTO rhnAppInstallSessionData
@@ -340,7 +340,6 @@ sub clear_session {
});
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
DELETE
FROM rhnAppInstallSession AIS
diff --git a/web/modules/rhn/RHN/DB/ContactMethod.pm
b/web/modules/rhn/RHN/DB/ContactMethod.pm
index f1b4155..5088752 100644
--- a/web/modules/rhn/RHN/DB/ContactMethod.pm
+++ b/web/modules/rhn/RHN/DB/ContactMethod.pm
@@ -175,7 +175,6 @@ sub commit {
my $dbh = RHN::DB->connect;
# Get the next recid from the sequence and set it as the id for this instance.
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
my $sth = $dbh->prepare("SELECT " . $self->get_sequence .
".nextval FROM DUAL");
$sth->execute;
my ($pk_value) = $sth->fetchrow;
@@ -206,13 +205,11 @@ sub commit {
$query = get_table->update_query(get_table->methods_to_columns(@modified));
$query .= get_table_alias . ".$pk_upper = ?";
# adjust the query to update last_update_date
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
$query =~ s/SET (.*) WHERE/SET $1, $table_alias\.last_update_date = SYSDATE WHERE/;
}
else {
$query = get_table->insert_query(get_table->methods_to_columns(@modified));
# adjust the query to update last_update_date
- # PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) #
$query =~ s/\((.*)\) VALUES \((.*)\)/\($1, $table_alias\.last_update_date\) VALUES
\($2, SYSDATE\)/;
}
@@ -304,7 +301,7 @@ sub delete {
my $dbh = RHN::DB->connect;
my ($sth, $query);
- # PGPORT_1:NO Change #
+
$query = <<EOQ;
DELETE FROM rhn_contact_methods
WHERE recid = :method_id
@@ -328,7 +325,7 @@ sub has_probe_dependencies {
my $dbh = RHN::DB->connect;
my ($sth, $query);
- # PGPORT_3:ORAFCE(DECODE) #
+
$query = <<EOQ;
SELECT decode(count(*),0,0,1)
FROM rhn_probe P, rhn_contact_group_members CGM
@@ -365,7 +362,6 @@ sub get_method_type_info {
);
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
my $sth = $dbh->prepare(<<EOQ);
SELECT recid as method_type_id,
notification_format_id as method_format_id,
diff --git a/web/modules/rhn/RHN/DB/CustomInfoKey.pm
b/web/modules/rhn/RHN/DB/CustomInfoKey.pm
index 0b54ea0..521e922 100644
--- a/web/modules/rhn/RHN/DB/CustomInfoKey.pm
+++ b/web/modules/rhn/RHN/DB/CustomInfoKey.pm
@@ -1,4 +1,4 @@
-
+#
# Copyright (c) 2008 Red Hat, Inc.
#
# This software is licensed to you under the GNU General Public License,
@@ -59,7 +59,7 @@ sub delete_key {
my %params = validate(@_, {key_id => 1, user_id => 1, transaction => 0});
my $key_id = $params{key_id};
my $dbh = $params{transaction} || RHN::DB->connect();
-#PGPORT_1:NO Change
+
my $sth = $dbh->prepare(<<EOQ);
DECLARE
BEGIN
@@ -97,7 +97,7 @@ sub commit {
if ($self->id == -1) {
my $dbh = $transaction || RHN::DB->connect;
-#PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL)
+
my $sth = $dbh->prepare("SELECT rhn_cdatakey_id_seq.nextval FROM
DUAL");
$sth->execute;
my ($id) = $sth->fetchrow;
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml
index 05b380a..394a66e 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml
@@ -6,7 +6,6 @@
-->
<mode name="users_contact_methods">
<query params="user_id">
-<!--#PGPORT_3:ORAFCE(Decode),AS KEYWORD-->
SELECT CM.recid recid,
CM.method_name method_name,
DECODE( MT.method_type_name,
@@ -25,7 +24,6 @@ ORDER BY CM.method_name
-->
<mode name="orgs_contact_method_tree">
<query params="org_id">
-<!--#PGPORT_4:QUERY_REWRITE(ANSI JOIN),DECODE,aS KEYWORD-->
SELECT WC.id contact_id,
WC.login contact_login,
CM.recid method_id,
@@ -49,7 +47,6 @@ ORDER BY WC.login, CM.method_name
-->
<mode name="contact_groups">
<query params="method_id">
-<!--#PGPORT_1:NO Change-->
SELECT CG.recid,
CG.contact_group_name,
CG.customer_id,
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/errata_search_setbuilder.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/errata_search_setbuilder.xml
index 09a341a..32e4bf7 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/errata_search_setbuilder.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/errata_search_setbuilder.xml
@@ -2,7 +2,6 @@
<mode name="simple_errata_search">
<query params="org_id, search_string">
-<!--#PGPORT_3:ORAFCE(INSTR)-->
SELECT E.id
FROM rhnErrata E,
rhnChannelErrata CE,
@@ -17,7 +16,6 @@ SELECT E.id
<mode name="errata_search_by_advisory">
<query params="user_id, search_string">
-<!--#PGPORT_3:ORAFCE(INSTR)-->
SELECT E.id
FROM rhnErrata E,
rhnChannelErrata CE,
@@ -31,7 +29,6 @@ SELECT E.id
<mode name="errata_search_by_package_name">
<query params="user_id, search_string">
-<!--#PGPORT_3:ORAFCE(INSTR)-->
SELECT E.id
FROM rhnErrata E,
rhnPackageName PN,
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/package_search_setbuilder.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/package_search_setbuilder.xml
index c1f8554..da7cd93 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/package_search_setbuilder.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/package_search_setbuilder.xml
@@ -2,7 +2,6 @@
<mode name="simple_package_search">
<query params="org_id, search_string">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -20,7 +19,6 @@ SELECT DISTINCT PN.id
<mode name="simple_package_search_smart">
<query params="org_id, search_string">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -39,7 +37,6 @@ SELECT DISTINCT PN.id
<mode name="simple_package_search_clabel">
<query params="org_id, search_string, channel_label">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -57,7 +54,6 @@ SELECT DISTINCT PN.id
<mode name="package_search_by_name">
<query params="org_id, search_string">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -74,7 +70,6 @@ SELECT DISTINCT PN.id
<mode name="package_search_by_name_smart">
<query params="org_id, search_string">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
@@ -91,7 +86,6 @@ SELECT DISTINCT PN.id
<mode name="package_search_by_name_clabel">
<query params="org_id, search_string, channel_label">
- <!-- PGPORT_3:ORAFCE(INSTR) -->
SELECT DISTINCT PN.id
FROM rhnPackageName PN,
rhnPackage P,
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/profile_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/profile_queries.xml
index 4fc02bf..f413442 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/profile_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/profile_queries.xml
@@ -2,7 +2,6 @@
<mode name="profile_overview">
<query params="org_id">
-<!-- # PGPORT_2:AS KEYWORD-->
SELECT SP.ID, SP.NAME, SP.created, C.name CHANNEL_NAME
FROM rhnChannel C,
rhnServerProfile SP
@@ -12,7 +11,7 @@ SELECT SP.ID, SP.NAME, SP.created, C.name CHANNEL_NAME
ORDER BY UPPER(SP.name)
</query>
</mode>
-<!-- # PGPORT_2:AS KEYWORD-->
+
<mode name="profile_package_overview">
<query params="prid">
SELECT PN.name || '-' || PE.evr.as_vre_simple() PACKAGE_NVRE
@@ -25,7 +24,7 @@ SELECT PN.name || '-' || PE.evr.as_vre_simple() PACKAGE_NVRE
ORDER BY UPPER(PN.name), PE.evr
</query>
</mode>
-<!--#PGPORT_1:NO Change-->
+
<mode name="compatible_with_channel">
<query params="org_id, cid">
SELECT DISTINCT SP.id, SP.name
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/scout_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/scout_queries.xml
index 615024d..7526a23 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/scout_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/scout_queries.xml
@@ -2,7 +2,6 @@
<mode name="scouts_for_org">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT SC.recid AS ID,
SC.customer_id,
SC.description,
@@ -30,7 +29,6 @@ ORDER BY UPPER(SC.description)
<mode name="scouts_all">
<query params="">
-<!-- PGPORT_1:NO Change -->
SELECT SC.recid AS ID,
SC.customer_id,
SC.description,
@@ -62,7 +60,6 @@ ORDER BY UPPER(SC.description)
- if date executed is not null then an exit status of '0' is OK, '1' is
warning, otherwise "error"
-->
<query name="config_push_status" params="org_id">
- <!-- PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE),ORAFCE(DECODE), -->
SELECT distinct decode(
CQE.date_executed, null, decode(sign(SYSDATE - CQI.expiration_date), -1,
'PENDING', 'EXPIRED'),
decode(exit_status, 0, 'OK', 1, 'WARNING', 'ERROR')) AS
CONFIG_STATUS,
@@ -88,7 +85,6 @@ SELECT distinct decode(
<query name="org_changes" params="org_id">
- <!-- PGPORT_3:ORAFCE(NVL),AS KEYWORD -->
SELECT 1 AS PUSH_NEEDED,
SC.recid AS id
FROM rhn_sat_cluster SC, (
@@ -125,7 +121,6 @@ SELECT 1 AS PUSH_NEEDED,
<query name="config_push_status_all" params="">
- <!-- PGPORT_3:ORAFCE(DECODE) -->
SELECT distinct decode(
CQE.date_executed, null, decode(sign(SYSDATE - CQI.expiration_date), -1,
'PENDING', 'EXPIRED'),
decode(exit_status, 0, 'OK', 1, 'WARNING', 'ERROR')) AS
CONFIG_STATUS,
@@ -150,7 +145,6 @@ SELECT distinct decode(
<query name="org_changes_all" params="">
- <!-- PGPORT_3:ORAFCE(NVL),AS KEYWORD -->
SELECT 1 AS PUSH_NEEDED,
SC.recid AS id
FROM rhn_sat_cluster SC, (
@@ -186,7 +180,6 @@ SELECT 1 AS PUSH_NEEDED,
<mode name="fetch_key">
<query params="sat_cluster_id">
-<!-- PGPORT_1:NO Change -->
SELECT recid as ID,
scout_shared_key
FROM rhn_sat_node
diff --git a/web/modules/rhn/RHN/DB/EmailAddress.pm
b/web/modules/rhn/RHN/DB/EmailAddress.pm
index defad0a..02dfce8 100644
--- a/web/modules/rhn/RHN/DB/EmailAddress.pm
+++ b/web/modules/rhn/RHN/DB/EmailAddress.pm
@@ -115,7 +115,7 @@ sub commit {
my $self = shift;
my $dbh = shift || RHN::DB->connect;
my $mode = 'update';
- # PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL) #
+
if ($self->id == -1) {
my $sth = $dbh->prepare("SELECT rhn_eaddress_id_seq.nextval FROM
DUAL");
$sth->execute;
@@ -169,7 +169,7 @@ sub state {
my $self = shift;
return $self->mail_state_label if not @_;
my $new_label = shift;
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare('SELECT id FROM rhnEmailAddressState WHERE label =
:label');
$sth->execute_h(label => $new_label);
@@ -186,7 +186,7 @@ sub email_address_states {
my $class = shift;
my $dbh = RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
SELECT label
FROM rhnEmailAddressState
@@ -208,7 +208,7 @@ sub delete_self {
my $self = shift;
my %params = validate(@_, {-transaction => 0});
my $dbh = $params{-transaction} || RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
DELETE
FROM rhnEmailAddress
@@ -225,7 +225,7 @@ sub delete_other_addresses {
my $self = shift;
my %params = validate(@_, {-transaction => 0});
my $dbh = $params{-transaction} || RHN::DB->connect;
- # PGPORT_1:NO Change #
+
my $query = <<EOQ;
DELETE
FROM rhnEmailAddress
@@ -280,7 +280,7 @@ sub reset_email {
sub log_sent_email {
my $class = shift;
my %params = validate(@_, {-reason => 1, -address => 1, -user_id => 1});
- # PGPORT_1:NO Change #
+
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOS);
INSERT INTO rhnEmailAddressLog
diff --git a/web/modules/rhn/RHN/DB/Grail.pm b/web/modules/rhn/RHN/DB/Grail.pm
index baa6a6a..32eaa2f 100644
--- a/web/modules/rhn/RHN/DB/Grail.pm
+++ b/web/modules/rhn/RHN/DB/Grail.pm
@@ -21,7 +21,7 @@ use RHN::DB;
sub components_for_user {
my $class = shift;
my $user_id = shift;
-#PGPORT_1:NO Change
+
my $dbh = RHN::DB->connect;
my $query = "SELECT component_pkg, component_mode FROM rhnGrailComponentChoices
WHERE user_id = ? ORDER BY ordering";
my $sth = $dbh->prepare($query);
@@ -39,7 +39,6 @@ sub components_available {
my $class = shift;
my $dbh = RHN::DB->connect;
-#PGPORT_4:QUERY_REWRITE(ANSI JOIN),NVL
my $query = <<EOQ;
SELECT component_pkg, component_mode, config_mode, component_label, NVL(UGT.label,
''), GC.id
FROM rhnGrailComponents GC, rhnUserGroupType UGT
@@ -63,13 +62,12 @@ sub set_user_components {
my @components = @_;
my $dbh = RHN::DB->connect;
-#PGPORT_1:NO Change
my $query = <<EOQ;
DELETE FROM rhnGrailComponentChoices WHERE user_id = ?
EOQ
my $sth = $dbh->prepare($query);
$sth->execute($uid);
-#PGPORT_1:NO Change
+
$query = <<EOQ;
INSERT INTO rhnGrailComponentChoices
SELECT ?, ?, component_pkg, component_mode
diff --git a/web/modules/rhn/RHN/DB/Inspector.pm b/web/modules/rhn/RHN/DB/Inspector.pm
index 82e6cdd..96e6845 100644
--- a/web/modules/rhn/RHN/DB/Inspector.pm
+++ b/web/modules/rhn/RHN/DB/Inspector.pm
@@ -45,9 +45,7 @@ sub find_org_by_user {
# $where_clause = "S.name = ?";
# }
-#PGPORT_1:NO Change
$query = <<EOQ;
-
SELECT WC.org_id, WC.login, WC.id, PI.email
FROM web_user_personal_info PI, web_contact WC
WHERE (WC.login_uc LIKE UPPER(?) OR PI.email LIKE UPPER(?))
@@ -96,7 +94,7 @@ sub find_org_by_server_name {
else {
$where_clause = "S.name = ?";
}
-#PGPORT_1:NO Change
+
$query = <<EOQ;
SELECT O.id, O.name, S.id, S.name
FROM web_customer O, rhnServer S
diff --git a/web/modules/rhn/RHN/DB/SatCluster.pm b/web/modules/rhn/RHN/DB/SatCluster.pm
index 27d421f..d5f1975 100644
--- a/web/modules/rhn/RHN/DB/SatCluster.pm
+++ b/web/modules/rhn/RHN/DB/SatCluster.pm
@@ -146,7 +146,6 @@ sub create_new {
# Fetch two IDs from RHN_COMMAND_TARGET_RECID_SEQ to act
# as the sat_cluster recid and sat_node recid
- #PGPORTED_5:POSTGRES_VERSION_QUERY(NEXTVAL),DUAL
$sql = q{
SELECT sequence_nextval('RHN_COMMAND_TARGET_RECID_SEQ')
FROM dual
@@ -161,7 +160,6 @@ sub create_new {
}
# Next, create RHN_COMMAND_TARGET records
- #PGPORT_1:NO Change
$sql = q{
INSERT INTO rhn_command_target (recid, target_type, customer_id)
VALUES (?, ?, ?)
@@ -174,7 +172,6 @@ sub create_new {
# Then create the RHN_SAT_CLUSTER record
- #PGPORTED_1:NO Change
$sql = q{
INSERT INTO rhn_sat_cluster (
RECID,
@@ -211,7 +208,6 @@ sub create_new {
my $scout_shared_key = generate_shared_key();
# Finally, create the RHN_SAT_NODE record.
- #PGPORTED_1:NO Change
$sql = q{
INSERT INTO rhn_sat_node (
RECID,
diff --git a/web/modules/rhn/RHN/DB/ServerActions.pm
b/web/modules/rhn/RHN/DB/ServerActions.pm
index 3904adc..8bb24ed 100644
--- a/web/modules/rhn/RHN/DB/ServerActions.pm
+++ b/web/modules/rhn/RHN/DB/ServerActions.pm
@@ -28,7 +28,7 @@ sub channel_license_consent_for_set {
my $channel_id = shift;
my $user_id = shift;
my $transaction = shift;
-#PGPORT_1:NO Change
+
my $query = <<EOQ;
INSERT INTO rhnChannelFamilyLicenseConsent (channel_family_id, user_id, server_id)
SELECT CFM.channel_family_id, ?, SC.server_id
@@ -63,6 +63,7 @@ sub assign_set_to_group {
my $set = shift;
my $sgid = shift;
die "Invalid format for sgid $sgid" if $sgid =~ /\D/; # contain nondigit?
die
+
my $query = <<EOQ;
BEGIN
rhn_server.insert_set_into_servergroup(:server_group_id,:user_id,:label);
diff --git a/web/modules/rhn/RHN/DB/UserActions.pm
b/web/modules/rhn/RHN/DB/UserActions.pm
index c0c17c7..14790ea 100644
--- a/web/modules/rhn/RHN/DB/UserActions.pm
+++ b/web/modules/rhn/RHN/DB/UserActions.pm
@@ -30,7 +30,7 @@ sub assign_set_to_group {
my $query = "delete from rhnSet where user_id = :user_id and label =
:label";
my $sth0 = $dbh->prepare($query);
$sth0->execute_h(user_id=>$set->uid, label=>"user_group_list");
- # PGPORT_1:NO Change #
+
my $sth1 = $dbh->prepare(<<EOQ);
INSERT INTO rhnSet (user_id, label, element, element_two)
SELECT :user_id, 'user_group_list', element, :ugid
@@ -56,11 +56,11 @@ sub remove_set_from_group {
my $ugid = shift;
my $dbh = RHN::DB->connect();
- # PGPORT_1:NO Change #
+
my $query = "delete from rhnSet where user_id = :user_id and label =
:label";
my $sth0 = $dbh->prepare($query);
$sth0->execute_h(user_id=>$set->uid, label=>"user_group_list");
- # PGPORT_1:NO Change #
+
my $sth1 = $dbh->prepare(<<EOQ);
INSERT INTO rhnSet (user_id, label, element, element_two)
SELECT :user_id, 'user_group_list', element, :ugid
commit 54451bb3e095c86eb2261b64fe14049a4b9de89c
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Mar 31 15:12:25 2009 -0300
Revert "Tagged Channel_queries.xml"
This reverts commit 3baf10be31097917b6046899e94d919da6911542.
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 3deb3c5..f0d00b9 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
@@ -2,7 +2,6 @@
<write-mode name="remove_org_channel_setting">
<query params="org_id, cid, label">
-<!-- # PGPORT_1:NO Change # -->
DELETE
FROM rhnOrgChannelSettings OCS
WHERE OCS.org_id = :org_id
@@ -13,7 +12,6 @@ DELETE
<write-mode name="add_channel_package">
<query params="pid, cid">
-<!-- # PGPORT_1:NO Change # -->
INSERT INTO rhnChannelPackage (channel_id, package_id)
VALUES (:cid, :pid)
</query>
@@ -21,7 +19,6 @@ DELETE
<write-mode name="add_org_channel_setting">
<query params="org_id, cid, label">
-<!-- # PGPORT_1:NO Change # -->
INSERT
INTO rhnOrgChannelSettings
(org_id, channel_id, setting_id)
@@ -31,7 +28,6 @@ VALUES (:org_id, :cid, (SELECT id FROM rhnOrgChannelSettingsType WHERE
label = :
<write-mode name="grant_channel_permission">
<query params="user_id, cid, role_label">
-<!-- # PGPORT_1:NO Change # -->
INSERT INTO rhnChannelPermission (channel_id, user_id, role_id)
VALUES (:cid, :user_id, (SELECT id FROM rhnChannelPermissionRole WHERE label =
:role_label))
</query>
@@ -39,7 +35,6 @@ VALUES (:cid, :user_id, (SELECT id FROM rhnChannelPermissionRole WHERE
label = :
<write-mode name="revoke_channel_permission">
<query params="user_id, cid, role_label">
-<!-- # PGPORT_1:NO Change # -->
DELETE
FROM rhnChannelPermission CP
WHERE CP.user_id = :user_id
@@ -73,7 +68,6 @@ DELETE
<write-mode name="request_repo_regen">
<query params="label, client, reason">
-<!-- PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) -->
INSERT
INTO rhnRepoRegenQueue
(id, channel_label, client, reason, force, bypass_filters, next_action, created,
modified)
@@ -84,7 +78,6 @@ VALUES (rhn_repo_regen_queue_id_seq.nextval,
<mode name="org_pkg_channels">
<query params="org_id, pid">
-<!-- # PGPORT_1:NO Change # -->
SELECT C.label AS label,
C.name AS name,
NVL(C2.label, ' ') AS parent_label
@@ -103,7 +96,6 @@ ORDER BY UPPER(C.name)
<mode name="org_pkg_channel_ids">
<query params="org_id, pid">
-<!-- # PGPORT_1:NO Change # -->
SELECT C.id AS channel_id
FROM rhnChannel C2,
rhnChannel C,
@@ -122,7 +114,6 @@ ORDER BY UPPER(C.name)
<mode name="channels_owned_by_org"
class="com.redhat.rhn.frontend.dto.ChannelOverview">
<query params="org_id">
-<!-- # PGPORT_1:NO Change # -->
SELECT C.id, C.name, CC.original_id
FROM rhnChannel C left join
rhnChannelCloned CC on C.id = CC.id
@@ -133,7 +124,6 @@ ORDER BY C.org_id, C.name
<mode name="relevant_packages_for_channel_unpublished">
<query params="eid, cid">
-<!-- # PGPORT_1:NO Change # -->
SELECT DISTINCT P1.name_id
FROM rhnChannel C,
rhnChannelPackage CP,
@@ -152,7 +142,6 @@ SELECT DISTINCT P1.name_id
<mode name="relevant_packages_for_channel_published">
<query params="eid, cid">
-<!-- # PGPORT_1:NO Change # -->
SELECT DISTINCT P1.name_id
FROM rhnChannel C,
rhnChannelPackage CP,
@@ -171,7 +160,6 @@ SELECT DISTINCT P1.name_id
<mode name="system_channels">
<query params="sid">
-<!-- PGPORT_4:QUERY_REWRITE(ORDER BY)-->
SELECT
C.label as label,
C.name as name
@@ -186,7 +174,6 @@ ORDER BY C.parent_channel NULLS LAST, UPPER(C.name)
<mode name="channel_download_categories_by_type"
class="com.redhat.rhn.frontend.dto.ISOCategory">
<query params="channel_label, download_type, org_id">
-<!-- PGPORT_1:NO Change -->
SELECT RD.category AS CATEGORY, MIN(ordering) AS MIN_ORDER
FROM rhnDownloads RD,
rhnDownloadType DT,
@@ -207,7 +194,6 @@ ORDER BY MIN(ordering)
<mode name="channel_downloads_by_type"
class="com.redhat.rhn.frontend.dto.ISOImage">
<query params="channel_label, download_type, org_id" >
-<!-- PGPORT_1:NO Change -->
SELECT RD.name AS DOWNLOAD_NAME,
RF.path AS DOWNLOAD_PATH,
RF.md5sum AS DOWNLOAD_CHECKSUM,
@@ -241,7 +227,6 @@ SELECT FL.file_id id, FL.location LOCATIONS
<mode name="satellite_channel_download_categories_by_type"
class="com.redhat.rhn.frontend.dto.ISOCategory">
<query params="channel_label, download_type, org_id">
-<!-- PGPORT_1:NO Change -->
SELECT RD.category AS CATEGORY, MIN(ordering) AS MIN_ORDER
FROM rhnDownloads RD,
rhnDownloadType DT,
@@ -265,7 +250,6 @@ ORDER BY MIN(ordering)
<mode name="satellite_channel_downloads_by_type"
class="com.redhat.rhn.frontend.dto.ISOImage">
<query params="org_id, channel_label, download_type">
-<!-- PGPORT_1: NO Change-->
SELECT DISTINCT RF.id AS ID,
RD.name AS DOWNLOAD_NAME,
RF.path AS DOWNLOAD_PATH,
@@ -291,7 +275,6 @@ SELECT DISTINCT RF.id AS ID,
ORDER BY RD.ordering
</query>
<elaborator multiple="t">
-<!-- PGPORT_2: AS KEYWORD-->
SELECT FL.file_id id, L.label LOCATIONS
FROM rhnFileLocation FL,
rhnLocation L
@@ -302,7 +285,6 @@ SELECT FL.file_id id, L.label LOCATIONS
<mode name="user_subscribe_perms"
class="com.redhat.rhn.frontend.dto.ChannelPerms">
<query params="user_id, org_id">
-<!-- PGPORT_3: DECODE-->
SELECT AC.channel_id AS ID,
AC.channel_name AS NAME,
rhn_channel.user_role_check(AC.channel_id, :user_id, 'subscribe') AS
HAS_PERM,
@@ -320,7 +302,6 @@ ORDER BY UPPER(AC.channel_name)
<mode name="user_manage_perms"
class="com.redhat.rhn.frontend.dto.ChannelPerms">
<query params="user_id, org_id">
-<!-- PGPORT_1: NO Change -->
SELECT C.id AS ID,
C.name AS NAME,
rhn_channel.user_role_check(C.id, :user_id, 'manage') AS HAS_PERM
@@ -340,7 +321,6 @@ ORDER BY UPPER(C.name)
<mode name="channel_entitlements"
class="com.redhat.rhn.frontend.dto.ChannelOverview">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT CFO.id, CFO.name, CFO.label, CFO.current_members, CFO.max_members,
CFO.has_subscription, CFO.url
FROM rhnChannelFamilyOverview CFO
WHERE CFO.org_id = :org_id
@@ -350,7 +330,6 @@ SELECT CFO.id, CFO.name, CFO.label, CFO.current_members,
CFO.max_members, CFO.ha
<mode name="channel_entitlements_for_all_orgs"
class="com.redhat.rhn.frontend.dto.ChannelOverview">
<query params="">
-<!-- PGPORT_1:NO Change -->
SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members, CFO.max_members,
CFO.has_subscription, CFO.url
FROM rhnChannelFamilyOverview CFO
ORDER BY CFO.name DESC
@@ -359,7 +338,6 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members,
CFO.max_mem
<mode name="channel_entitlements_for_all_m_orgs"
class="com.redhat.rhn.frontend.dto.MultiOrgEntitlementsDto">
<query params="">
-<!-- PGPORT_1:NO Change -->
SELECT MAX(cfo.id) as id,
cfo.label,
cfo.name,
@@ -380,7 +358,6 @@ ORDER by cfo.name DESC
<mode name="channel_entitlement"
class="com.redhat.rhn.frontend.dto.ChannelOverview">
<query params="org_id, entitlement_id">
-<!-- PGPORT_1:NO Change -->
SELECT CFO.id, CFO.name, CFO.label, CFO.current_members, CFO.max_members,
CFO.has_subscription, CFO.url
FROM rhnChannelFamilyOverview CFO
WHERE CFO.org_id = :org_id
@@ -391,7 +368,6 @@ SELECT CFO.id, CFO.name, CFO.label, CFO.current_members,
CFO.max_members, CFO.ha
<mode name="channel_entitlement_for_all_orgs"
class="com.redhat.rhn.frontend.dto.ChannelOverview">
<query params="entitlement_id">
-<!-- PGPORT_1:NO Change -->
SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members, CFO.max_members,
CFO.has_subscription, CFO.url
FROM rhnChannelFamilyOverview CFO
WHERE CFO.id = :entitlement_id
@@ -402,7 +378,6 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members,
CFO.max_mem
<mode name="all_channel_tree"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id">
-<!-- PGPORT_1:NO Change -->
select Distinct C.id,
C.name,
C.label as channel_label,
@@ -424,7 +399,6 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members,
CFO.max_mem
<mode name="shared_channel_tree"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id">
-<!-- PGPORT_1:NO Change -->
select Distinct C.id,
C.name,
C.parent_channel as parent_id,
@@ -446,7 +420,6 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members,
CFO.max_mem
<mode name="popular_channel_tree"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id, server_count">
-<!-- PGPORT_1:NO Change -->
select Distinct C.id,
C.name,
C.parent_channel as parent_id,
@@ -474,8 +447,7 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members,
CFO.max_mem
<mode name="retired_channel_tree"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id">
-<!-- PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) -->
-select Distinct C.id,
+ select Distinct C.id,
C.name,
C.parent_channel as parent_id,
C.label as channel_label,
@@ -499,8 +471,6 @@ select Distinct C.id,
<mode name="redhat_channel_tree"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id">
-
-<!-- PGPORT_1:NO Change -->
select Distinct C.id,
C.name,
C.parent_channel as parent_id,
@@ -520,7 +490,6 @@ select Distinct C.id,
<mode name="my_channel_tree"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id, org_id">
-<!-- PGPORT_1:NO Change -->
select Distinct C.id,
C.name,
C.parent_channel as parent_id,
@@ -540,7 +509,6 @@ select Distinct C.id,
<mode name="trust_channel_consume"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="org_id, org_id2, user_id">
-<!-- PGPORT_1:NO Change -->
SELECT DISTINCT V.id,
V.name,
V.parent_channel as parent_id,
@@ -560,8 +528,6 @@ select Distinct C.id,
<mode name="protected_trust_channel"
class="com.redhat.rhn.frontend.dto.OrgChannelDto">
<query params="org_id, cid">
-
-<!-- PGPORT_3:ORAFCE(NVL) -->
SELECT wc.id, wc.name,
NVL((SELECT 1
FROM rhnchanneltrust rct
@@ -583,7 +549,6 @@ AND wc.id = rto.org_trust_id
<mode name="channel_family_tree"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id, family_id">
-<!-- PGPORT_1:NO Change -->
SELECT DISTINCT C.name NAME,
C.id ID,
C.parent_channel as parent_id,
@@ -614,7 +579,6 @@ SELECT DISTINCT C.name NAME,
<mode name="channels_with_downloads_tree_full"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id">
-<!-- PGPORT_1:NO Change -->
SELECT UACh.channel_name NAME,
UACh.channel_id ID,
UACh.channel_depth DEPTH,
@@ -642,7 +606,6 @@ ORDER BY rhn_channel.channel_priority(UACh.parent_or_self_id),
UACh.parent_or_
<mode name="channels_with_downloads_tree_supported"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id">
-<!-- PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) -->
SELECT UACh.channel_name NAME,
UACh.channel_id ID,
UACh.channel_depth DEPTH,
@@ -671,7 +634,6 @@ ORDER BY rhn_channel.channel_priority(UACh.parent_or_self_id),
UACh.parent_or_
<mode name="channels_with_downloads_tree_retired"
class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id">
-<!-- PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) -->
SELECT UACh.channel_name NAME,
UACh.channel_id ID,
UACh.channel_depth DEPTH,
@@ -700,9 +662,6 @@ ORDER BY rhn_channel.channel_priority(UACh.parent_or_self_id),
UACh.parent_or_
<mode name="channel_tree_ssm_install">
<query params="org_id, user_id">
-
-<!-- PGPORT_1:NO Change -->
-
SELECT ACh.channel_name NAME, ACh.channel_id ID, ACh.channel_depth DEPTH,
ACh.channel_arch_id, ACh.current_members, ACh.available_members, (SELECT COUNT(DISTINCT
CPN.name_id) FROM rhnChannelNewestPackage CPN WHERE CPN.channel_id = ACh.channel_id) AS
PACKAGE_COUNT, ACh.parent_or_self_label, ACh.channel_label
FROM rhnAvailableChannels ACh
WHERE ACh.org_id = :org_id
@@ -726,8 +685,6 @@ ORDER BY rhn_channel.channel_priority(ACh.parent_or_self_id),
ACh.parent_or_sel
<mode name="all_channels_tree">
<query params="user_id">
-<!-- PGPORT_1:NO Change -->
-
SELECT UACh.channel_name NAME,
UACh.channel_id ID,
UACh.channel_depth AS DEPTH,
@@ -755,8 +712,6 @@ ORDER BY rhn_channel.channel_priority(UACh.parent_or_self_id),
UACh.parent_or_s
<query name="visible_server_count" params="user_id, org_id">
-<!-- PGPORT_1:NO Change -->
-
SELECT SC.channel_id AS ID, count(SC.server_id) as system_count
FROM rhnServerChannel SC,
rhnServer S
@@ -769,8 +724,6 @@ GROUP BY SC.channel_id
<mode name="subscribable_base_channels_for_system">
<query params="org_id, server_id">
-<!-- PGPORT_1:NO Change -->
-
SELECT C.id, C.label, C.name
FROM rhnChannel C, rhnServerChannelArchCompat SCAC, rhnServer S
WHERE C.parent_channel IS NULL
@@ -784,8 +737,6 @@ SELECT C.id, C.label, C.name
<mode name="base_channels_for_org"
class="com.redhat.rhn.frontend.dto.EssentialChannelDto">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
-
SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM
FROM rhnChannel C
WHERE C.parent_channel IS NULL
@@ -802,8 +753,6 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM
<mode name="base_eus_channels_by_version_release_server_arch"
class="com.redhat.rhn.frontend.dto.EssentialChannelDto">
<query params="product_name_label, version, release, server_arch, user_id,
org_id">
-<!-- PGPORT_1:NO Change -->
-
select unique c.id,
c.label,
c.name,
@@ -834,8 +783,6 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM
<mode name="base_eus_channels_by_version_release_channel_arch"
class="com.redhat.rhn.frontend.dto.EssentialChannelDto">
<query params="product_name_label, version, release, channel_arch_id, user_id,
org_id">
-<!-- PGPORT_1:NO Change -->
-
select unique c.id,
c.label,
c.name,
@@ -861,8 +808,6 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM
<mode name="base_eus_channels_by_version_channel_arch"
class="com.redhat.rhn.frontend.dto.EssentialChannelDto">
<query params="product_name_label, version, channel_arch_id, user_id,
org_id">
-<!-- PGPORT_1:NO Change -->
-
select unique c.id,
c.label,
c.name,
@@ -887,8 +832,6 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM
<mode name="subscribable_channels">
<query params="server_id, user_id, base_channel_id">
-<!-- PGPORT_1:NO Change -->
-
SELECT DISTINCT C.id,
C.label,
C.name,
@@ -912,8 +855,6 @@ SELECT DISTINCT C.id,
<mode name="affected_by_errata"
class="com.redhat.rhn.domain.channel.Channel">
<query params="eid, org_id">
-<!-- PGPORT_1:NO Change -->
-
SELECT DISTINCT C.id, C.name
FROM rhnAvailableChannels AC, rhnChannel C, rhnChannelErrata CE
WHERE CE.errata_id = :eid
@@ -926,8 +867,6 @@ SELECT DISTINCT C.id, C.name
<mode name="child_channel_candidate">
<query params="label, sid">
-<!-- PGPORT_1:NO Change -->
-
SELECT 1
FROM rhnChannel C, rhnChannelFamilyMembers CFM, rhnChannelFamily CF
WHERE CF.label = :label
@@ -943,8 +882,6 @@ SELECT 1
<mode name="org_errata_channels">
<query params="org_id, eid">
-<!-- PGPORT_4:QUERY_REWRITE(ANSI JOIN) -->
-
SELECT C.id as channel_id,
C.id as id,
C.label as label,
@@ -971,14 +908,12 @@ ORDER BY UPPER(C.name)
<write-mode name="flag_server_channels_changed">
<query params="server_id">
-<!-- PGPORT_5:POSTGRES_VERSION_QUERY(SYSDATE) -->
-UPDATE rhnServer SET channels_changed = sysdate WHERE id = :server_id
+ UPDATE rhnServer SET channels_changed = sysdate WHERE id = :server_id
</query>
</write-mode>
<write-mode name="log_channel_history">
<query params="server_id, channel_id, channel_label, message">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnServerHistory (id, server_id, summary, details) (
SELECT rhn_event_id_seq.nextval,
:server_id,
@@ -1004,7 +939,6 @@ UPDATE rhnServer SET channels_changed = sysdate WHERE id =
:server_id
<mode name="is_package_in_channel"
class="com.redhat.rhn.frontend.dto.BooleanWrapper">
<query params="cid, evr_id, name_id">
-<!-- PGPORT_1:NO Change -->
SELECT 1 as bool
FROM rhnChannelPackage CP, rhnPackage P
WHERE CP.channel_id = :cid
@@ -1016,7 +950,6 @@ SELECT 1 as bool
<mode name="families_for_org_without_permissions"
class="com.redhat.rhn.frontend.dto.ChannelOverview">
<query params="org_id">
-<!-- PGPORT_1:NO Change -->
SELECT CF.id
FROM rhnChannelFamily CF
WHERE CF.org_id = :org_id
@@ -1031,7 +964,6 @@ ORDER BY CF.id
<write-mode name="insert_family_perms">
<query params="org_id, id">
-<!-- PGPORT_1:NO Change -->
INSERT INTO rhnPrivateChannelFamily
(channel_family_id, org_id, max_members, current_members)
VALUES (:id, :org_id, NULL, 0)
@@ -1042,7 +974,6 @@ INSERT INTO rhnPrivateChannelFamily
<!-- And negative logic SUCKS! -->
<mode name="is_not_globally_subscribable">
<query params="org_id, cid, label">
-<!-- PGPORT_1:NO Change -->
SELECT 1 as setting
FROM rhnOrgChannelSettings OCS, rhnOrgChannelSettingsType OCST
WHERE OCS.org_id = :org_id
@@ -1060,7 +991,6 @@ INSERT INTO rhnPrivateChannelFamily
<mode name="latest_package_equal">
<query params="cid, name">
-<!-- PGPORT_1:NO Change -->
SELECT CP.package_id, CP.name_id, CP.evr_id, CP.package_arch_id
FROM rhnPackageName PN, rhnChannelNewestPackage CP
WHERE CP.channel_id = :cid
@@ -1086,7 +1016,6 @@ SELECT CP.package_id, CP.name_id, CP.evr_id, CP.package_arch_id
<mode name="latest_package_like">
<query params="cid, name">
-<!-- PGPORT_1:NO Change -->
SELECT CP.package_id, CP.name_id, CP.evr_id
FROM rhnPackageName PN, rhnChannelNewestPackage CP
WHERE CP.channel_id = :cid
@@ -1097,7 +1026,6 @@ SELECT CP.package_id, CP.name_id, CP.evr_id
<mode name="channel_with_package">
<query params="parent, package">
-<!-- PGPORT_1:NO Change -->
SELECT DISTINCT C.id
FROM rhnChannel C, rhnChannelPackage CP, rhnPackage P, rhnPackageName PN
WHERE C.parent_channel = :parent
@@ -1110,7 +1038,6 @@ SELECT DISTINCT C.id
<mode name="channels_with_package">
<query params="package">
-<!-- PGPORT_1:NO Change -->
SELECT DISTINCT CP.channel_id as id
FROM rhnChannelPackage CP
inner join rhnPackage P on CP.package_id = P.id
@@ -1128,7 +1055,6 @@ SELECT DISTINCT CP.channel_id as id
<mode name="children_in_set"
class="com.redhat.rhn.frontend.dto.ChildChannelDto">
<query params="user_id">
-<!-- PGPORT_2:AS KEYWORD -->
select distinct id, name, label, 1 subscribable, parent_id from (
select c.id,
c.name,
@@ -1186,7 +1112,6 @@ where st.user_id = :user_id
<mode name="base_channels_in_set"
class="com.redhat.rhn.frontend.dto.SystemsPerChannelDto">
<query params="user_id">
-<!-- PGPORT_1:NO Change -->
SELECT C.id, C.name, COUNT(C.id) system_count
FROM rhnChannel C,
rhnServerChannel SC,