java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 7deeb461ab632967cd41694f659603c575116bdc
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Sep 27 10:54:22 2013 +0200
DataSourceParserTest: fix Oracle case-depentent tests
Username queries on the all_catalog table on Oracle can return results in the
wrong case (in particular: uppercase). Test code assumes that usernames are
lowercase in config files (see DataSourceParser.java:96), so those tests will
fail if case does not match, and this was actually verified with a 11g XE
instance.
This patch adds LOWERCASE() calls to restore correct results.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
index 6b0e3e4..00c0a27 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
@@ -3,7 +3,7 @@
<query params="username">
SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
FROM all_users u
- WHERE u.username=:username
+ WHERE LOWER(u.username) = :username
</query>
<elaborator name="table_elaborator_or" column="username"
params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
@@ -36,7 +36,7 @@
<elaborator name="table_elaborator_or" column="username"
params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
- WHERE owner=:user_name
+ WHERE LOWER(owner) = :user_name
AND owner IN (%s)
AND table_type='TABLE'
GROUP BY owner
@@ -322,12 +322,12 @@ SELECT u.created as CREATED
<query params="username">
SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
FROM all_users u
- WHERE u.username=:username
+ WHERE LOWER(u.username) = :username
</query>
<elaborator name="table_elaborator_or" column="username"
params="username">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
- WHERE owner=:username
+ WHERE LOWER(owner) = :username
AND table_type='TABLE'
GROUP BY owner
</elaborator>
@@ -358,7 +358,7 @@ SELECT u.created as CREATED
<query name="external_elaborator_or" column="username"
params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
- WHERE owner=:user_name
+ WHERE LOWER(owner) = :user_name
AND table_type='TABLE'
GROUP BY owner
</query>
Show replies by date