Author: solomax
Date: Thu Apr 9 06:40:20 2015
New Revision: 1672247
URL: http://svn.apache.org/r1672247
Log:
[OPENMEETINGS-1196] sql query is fixed
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java?rev=1672247&r1=1672246&r2=1672247&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
Thu Apr 9 06:40:20 2015
@@ -80,8 +80,8 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE
u.user_id = :id"),
@NamedQuery(name = "getUsersByIds", query = "select c from User c where
c.user_id IN :ids"),
- @NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId
= 0 AND domainId IS NULL) OR (:domainId > 0 AND domainId = :domainId))"),
- @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.adresses.email = :email AND
((:domainId = 0 AND domainId IS NULL) OR (:domainId > 0 AND domainId =
:domainId))"),
+ @NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId
= 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
+ @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.adresses.email = :email AND
((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId =
:domainId))"),
@NamedQuery(name = "getUserByHash", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.resethash = :resethash"),
@NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM
User u WHERE u.deleted = false AND u.adresses.email = :email AND u.type = :type
AND u.ownerId = :ownerId"),
@NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select
count(c.user_id) from User c "
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1672247&r1=1672246&r2=1672247&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
Thu Apr 9 06:40:20 2015
@@ -79,8 +79,8 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE
u.id = :id"),
@NamedQuery(name = "getUsersByIds", query = "select c from User c where
c.id IN :ids"),
- @NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId
= 0 AND domainId IS NULL) OR (:domainId > 0 AND domainId = :domainId))"),
- @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.adresses.email = :email AND
((:domainId = 0 AND domainId IS NULL) OR (:domainId > 0 AND domainId =
:domainId))"),
+ @NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId
= 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
+ @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.adresses.email = :email AND
((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId =
:domainId))"),
@NamedQuery(name = "getUserByHash", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.resethash = :resethash"),
@NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM
User u WHERE u.deleted = false AND u.adresses.email = :email AND u.type = :type
AND u.ownerId = :ownerId"),
@NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select
count(c.id) from User c "
