Fix default table name to be based on entity name. Fixes #218

datanucleus · May 24, 2017 · 24ad55f · 24ad55f
1 parent f0f6516
commit 24ad55f
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/src/main/java/org/datanucleus/store/schema/naming/JPANamingFactory.java b/src/main/java/org/datanucleus/store/schema/naming/JPANamingFactory.java
@@ -59,6 +59,33 @@ public JPANamingFactory(NucleusContext nucCtx)
         super(nucCtx);
     }
 
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.schema.naming.NamingFactory#getTableName(org.datanucleus.metadata.AbstractClassMetaData)
+     */
+    public String getTableName(AbstractClassMetaData cmd)
+    {
+        String name = null;
+        if (cmd.getTable() != null)
+        {
+            name = cmd.getTable();
+            // TODO This may have "catalog.schema.name"
+        }
+        if (name == null)
+        {
+            if (cmd.getEntityName() != null)
+            {
+                name = cmd.getEntityName();
+            }
+            else
+            {
+                name = cmd.getName();
+            }
+        }
+
+        // Apply any truncation necessary
+        return prepareIdentifierNameForUse(name, SchemaComponent.TABLE);
+    }
+
     /* (non-Javadoc)
      * @see org.datanucleus.store.schema.naming.NamingFactory#getTableName(org.datanucleus.metadata.AbstractMemberMetaData)
      */