Repository: openmeetings Updated Branches: refs/heads/master e021186d1 -> c9406c6d8
[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/c9406c6d Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c9406c6d Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c9406c6d Branch: refs/heads/master Commit: c9406c6d882949acb0a2da62ce2e7a73baa70620 Parents: e021186 Author: Maxim Solodovnik <[email protected]> Authored: Tue Oct 17 13:53:53 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Oct 17 13:53:53 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/c9406c6d/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 2871a67..7461921 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 @@ -69,7 +69,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 extends HistoricalEntity { private static final long serialVersionUID = 1L;
