Repository: openmeetings Updated Branches: refs/heads/3.3.x dab7f7e8d -> 3845aebfa
[OPENMEETINGS-1671] db table was renamed to resolve conflict Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3845aebf Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3845aebf Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3845aebf Branch: refs/heads/3.3.x Commit: 3845aebfa3de513394f600deae6fb57e4841454d Parents: dab7f7e Author: Maxim Solodovnik <[email protected]> Authored: Tue Oct 17 13:53:53 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Oct 17 13:54:18 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/db/entity/file/BaseFileItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3845aebf/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java index 7f30087..28874d5 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java @@ -62,7 +62,7 @@ import org.simpleframework.xml.Element; , @NamedQuery(name = "getFileItemsByIds", query = "SELECT f FROM BaseFileItem f" + " WHERE f.deleted = false AND f.id IN :ids") }) -@Table(name = "file") +@Table(name = "om_file") @Inheritance(strategy = InheritanceType.SINGLE_TABLE) public abstract class BaseFileItem implements IDataProviderEntity { private static final long serialVersionUID = 1L;
