Eniity table name generated as eloquent, entity_table will be removed…

… in 1.0.0 sunel#24
oxytoxin · Dec 11, 2018 · a12335f · a12335f
1 parent ef6128c
commit a12335f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 40 deletions.
diff --git a/src/Attribute.php b/src/Attribute.php
@@ -471,7 +471,7 @@ public function getBackendTable()
         if ($this->dataTable === null) {
             $backendTable = trim($this->getAttribute('backend_table'));
             if (empty($backendTable)) {
-                $backendTable  = $this->entity()->entityTableName().'_'.strtolower($this->getAttribute('backend_type'));
+                $backendTable  = $this->entity()->code().'_'.strtolower($this->getAttribute('backend_type'));
             }
             $this->dataTable = $backendTable;
         }

diff --git a/src/Attribute/Backend.php b/src/Attribute/Backend.php
@@ -71,12 +71,8 @@ public function tableName()
             $attribute = $this->attribute();
             if ($attribute->isStatic()) {
                 $this->table = $attribute->entityType()->entityTableName();
-            } elseif ($attribute->backendTable()) {
-                $this->table = $this->attribute()->backendTable();
             } else {
-                $entity = $attribute->entity();
-                $tableName = sprintf('%s_%s', $entity->entityTableName(), $this->type());
-                $this->table = $tableName;
+                $this->table = $this->type();
             }
         }
 

diff --git a/src/Entity.php b/src/Entity.php
@@ -123,24 +123,6 @@ public function setEntityKey(string $key)
         return $this;
     }
 
-    /**
-     * @alias getEntityCustomTable()
-     */
-    public function entityCustomTable()
-    {
-        return $this->getEntityCustomTable();
-    }
-
-    /**
-     * Get the table name for the Entity.
-     *
-     * @return string
-     */
-    public function getEntityCustomTable()
-    {
-        return $this->entityCustomTable;
-    }
-
     /**
      * Set the table name for the Entity.
      *
@@ -178,13 +160,13 @@ public function entityTableName()
      */
     public function getEntityTableName()
     {
-        $tableName = $this->getAttribute('entity_code');
-
-        $tablePrefix = $this->getConnection()->getTablePrefix();
-        if ($tablePrefix != '') {
-            $tableName = "$tablePrefix.$tableName";
+        if(!is_null($this->entityCustomTable)) {
+            return $this->entityCustomTable;
         }
-        return $tableName;
+
+        return str_replace(
+            '\\', '', Str::snake(Str::plural(class_basename($this->entity_class)))
+        );
     }
 
     /**

diff --git a/src/Flat/Entity/Complier.php b/src/Flat/Entity/Complier.php
@@ -32,9 +32,9 @@ public function __construct(Entity $entity, Filesystem $files, Command $console)
 
     public function compile()
     {
-        $this->console->info("\t Creating flat table for `{$this->entity->entity_table}`.");
+        $this->console->info("\t Creating flat table for `{$this->entity->code()}`.");
 
-        $path = $this->getPath($this->entity->entity_table.'_flat');
+        $path = $this->getPath($this->entity->entityTableName().'_flat');
 
         $this->console->info("\t in {$path}");
 
@@ -44,7 +44,7 @@ public function compile()
 
         $this->files->requireOnce($path);
 
-        $this->console->info("\t Migrating `{$this->entity->entity_table}` flat schema.");
+        $this->console->info("\t Migrating `{$this->entity->code()}` flat schema.");
 
         $this->runUp($path);
     }
@@ -84,7 +84,7 @@ protected function resolve($file)
 
     protected function buildSchema()
     {
-        $table = $this->describe($this->entity->entity_table)->map(function ($attribute) {
+        $table = $this->describe($this->entity->entityTableName())->map(function ($attribute) {
             if ($attribute['COLUMN_KEY'] == 'PRI') {
                 $schema = "{$attribute['COLUMN_NAME']}:{$this->getColumn($attribute['DATA_TYPE'])}:unsigned";
             } else {
@@ -122,15 +122,15 @@ protected function buildSchema()
         $tableCache = Collection::make([]);
 
         $this->collectAttributes()->chunk(500, function ($chunk, $page) use ($attributes, $tableCache) {
-            $chunk->map(function ($attribute) use ($attributes, $tableCache) {
+            $chunk->map(function ($attribute) use ($attributes, $tableCache) {                
                 $table = $tableCache->get($attribute->backendTable(), function () use ($attribute, $tableCache) {
                     $key = $attribute->backendTable();
                     return $tableCache->put($key, $this->describe($key, function ($query) {
                         return $query->where('COLUMN_NAME', 'value');
                     })->first())->get($key);
                 });
 
-                $schema = "{$attribute->getAttributeCode()}";
+                $schema = $attribute->getAttributeCode();
 
                 $backendTable = $attribute->getBackendType();
 
@@ -236,7 +236,7 @@ protected function compileMigrationStub()
      */
     protected function replaceClassName(&$stub)
     {
-        $className = ucwords(camel_case($this->entity->entity_table.'_flat'));
+        $className = ucwords(camel_case($this->entity->entityTableName().'_flat'));
         $stub = str_replace('{{class}}', $className, $stub);
         return $this;
     }
@@ -248,7 +248,7 @@ protected function replaceClassName(&$stub)
      */
     protected function replaceTableName(&$stub)
     {
-        $table = $this->entity->entity_table.'_flat';
+        $table = $this->entity->entityTableName().'_flat';
         $stub = str_replace('{{table}}', $table, $stub);
         return $this;
     }

diff --git a/tests/Feature/AttributeTest.php b/tests/Feature/AttributeTest.php
@@ -166,7 +166,7 @@ public function it_must_have_a_table()
         $sku = $this->addSku();
 
         $this->assertEquals(
-            $this->entity->entityTableName().'_string',
+            $this->entity->code().'_string',
             $sku->backendTable()
         );
     }

diff --git a/tests/Feature/EntityTest.php b/tests/Feature/EntityTest.php
@@ -98,7 +98,7 @@ public function it_can_detect_entity_table_name()
 
         $entity = $eloquent->baseEntity();
 
-        $this->assertEquals($entity->entityCustomTable(), $eloquent->getTable());
+        $this->assertEquals($entity->entityTableName(), $eloquent->getTable());
     }
 
     /** @test */