You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/07/07 10:13:48 UTC
openmeetings git commit: [OPENMEETINGS-1666] typos in queries are
fixed
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x a122e1056 -> e77cd1d30
[OPENMEETINGS-1666] typos in queries are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e77cd1d3
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e77cd1d3
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e77cd1d3
Branch: refs/heads/3.3.x
Commit: e77cd1d30f055fe0f78555f11dae86e7d820fe85
Parents: a122e10
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jul 7 17:13:40 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jul 7 17:13:40 2017 +0700
----------------------------------------------------------------------
.../apache/openmeetings/db/entity/room/Room.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e77cd1d3/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index 36cfd33..becb29f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -65,13 +65,12 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Room r WHERE r.deleted = false"),
@NamedQuery(name = "getPublicRooms", query = "SELECT r from Room r WHERE r.ispublic = true and r.deleted = false and r.type = :type"),
- @NamedQuery(name = "getRoomByOwnerAndTypeId", query = "select c from Room as c where c.ownerId = :ownerId "
- + "AND c.type = :type AND c.deleted = false"),
- @NamedQuery(name = "selectMaxFromRooms", query = "select count(c.id) from Room c "
- + "where c.deleted = false AND c.name LIKE :search "),
- @NamedQuery(name = "getRoomByExternalId", query = "select r from Room as r "
- + "where r.externalId = :externalId AND c.externalType = :externalType "
- + "AND r.type = :type AND c.deleted = false"),
+ @NamedQuery(name = "getRoomByOwnerAndTypeId", query = "SELECT r FROM Room as r WHERE r.ownerId = :ownerId "
+ + "AND r.type = :type AND r.deleted = false"),
+ @NamedQuery(name = "selectMaxFromRooms", query = "SELECT COUNT(r.id) from Room r WHERE r.deleted = false AND r.name LIKE :search "),
+ @NamedQuery(name = "getRoomByExternalId", query = "SELECT r FROM Room as r "
+ + "WHERE r.externalId = :externalId AND r.externalType = :externalType "
+ + "AND r.type = :type AND r.deleted = false"),
@NamedQuery(name = "getPublicRoomsOrdered", query = "SELECT r from Room r WHERE r.ispublic= true AND r.deleted= false AND r.appointment = false ORDER BY r.name ASC"),
@NamedQuery(name = "getRoomById", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.id = :id"),
@NamedQuery(name = "getRoomsByIds", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.id IN :ids"),
@@ -79,9 +78,9 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Room r WHERE r.deleted = false"),
@NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r ORDER BY r.id"),
@NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT SUM(r.numberOfPartizipants) FROM Room r WHERE r.deleted = false AND r.id IN :ids")
- , @NamedQuery(name = "getGroupRooms", query = "SELECT DISTINCT c.room FROM RoomGroup c LEFT JOIN FETCH c.room "
- + "WHERE c.group.id = :groupId AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false "
- + "AND c.group.deleted = false ORDER BY c.room.name ASC")
+ , @NamedQuery(name = "getGroupRooms", query = "SELECT DISTINCT r.room FROM RoomGroup r LEFT JOIN FETCH r.room "
+ + "WHERE r.group.id = :groupId AND r.deleted = false AND r.room.deleted = false AND r.room.appointment = false "
+ + "AND r.group.deleted = false ORDER BY r.room.name ASC")
})
@Table(name = "room")
@Root(name = "room")