Skip to content

Fix make method #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fix make method #55

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2999e0d
Fix make method to ensure it doesn’t save related models to db when c…
ryanrobertsname Feb 22, 2014
6e91fbc
Remove static for columns var.
ryanrobertsname Sep 19, 2014
0f59d7e
add assertMorphToMany() and assertMorphByMany()
ryanrobertsname Oct 1, 2014
f367311
update composer requirements for laravel 4.1
ryanrobertsname Oct 1, 2014
816047d
made third arg of assertMorphMany() not required since its not being …
ryanrobertsname Oct 2, 2014
63b94fe
add assertMorphOne(), correct assertMorphedByMany()
ryanrobertsname Oct 2, 2014
1fd4dc4
Fix to allow column overrides of type not matching database field
ryanrobertsname Oct 28, 2014
dc2f18b
Get table name from eloquent model instead of calculating
ryanrobertsname Oct 28, 2014
fc1aa91
Add support for Blob data type
ryanrobertsname Oct 28, 2014
b129644
add ability to override id column
ryanrobertsname Oct 31, 2014
f5da54b
allow column overrides to occur without existing db table
ryanrobertsname Nov 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Get table name from eloquent model instead of calculating 
Fixes issues with non standard table names
  • Loading branch information
@ryanrobertsname
ryanrobertsname committed Oct 28, 2014
commit dc2f18b31e8cdbf56d92a5e83f8aa0e48ee53bdf
15 changes: 1 addition & 14 deletions src/Way/Tests/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ protected static function setRootNamespace($class)
*/
public function fire($class, array $overrides = array())
{
$this->tableName = $this->parseTableName($class);
$this->class = $this->createModel($class);
$this->tableName = $this->class->getTable();

// First, we dynamically fetch the fields for the table
$columns = $this->getColumns($this->tableName);
Expand All @@ -153,19 +153,6 @@ public function fire($class, array $overrides = array())
return $this->class;
}

/**
* Calulate the table name
*
* @param string $class
* @return string
*/
protected function parseTableName($class)
{
return $this->isNamespaced($class)
? snake_case(str_plural(substr(strrchr($class, '\\'), 1)))
: snake_case(str_plural($class));
}

/**
* Initialize the given model
*
Expand Down