Skip to content

Use Eloquent model getters for retrieving primary key name & incrementing boolean #126

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
riesjart wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use Eloquent model getters for retrieving primary key name & incrementing boolean #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/Sushi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ public function createTable(string $tableName, $firstRow)
{
$this->createTableSafely($tableName, function ($table) use ($firstRow) {
// Add the "id" column if it doesn't already exist in the rows.
if ($this->incrementing && ! array_key_exists($this->primaryKey, $firstRow)) {
$table->increments($this->primaryKey);
if ($this->getIncrementing() && ! array_key_exists($this->getKeyName(), $firstRow)) {
$table->increments($this->getKeyName());
}

foreach ($firstRow as $column => $value) {
Expand All @@ -171,8 +171,8 @@ public function createTable(string $tableName, $firstRow)
$type = 'string';
}

if ($column === $this->primaryKey && $type == 'integer') {
$table->increments($this->primaryKey);
if ($column === $this->getKeyName() && $type == 'integer') {
$table->increments($this->getKeyName());
continue;
}

Expand Down Expand Up @@ -201,13 +201,13 @@ public function createTableWithNoData(string $tableName)
$this->createTableSafely($tableName, function ($table) {
$schema = $this->getSchema();

if ($this->incrementing && ! in_array($this->primaryKey, array_keys($schema))) {
$table->increments($this->primaryKey);
if ($this->getIncrementing() && ! in_array($this->getKeyName(), array_keys($schema))) {
$table->increments($this->getKeyName());
}

foreach ($schema as $name => $type) {
if ($name === $this->primaryKey && $type == 'integer') {
$table->increments($this->primaryKey);
if ($name === $this->getKeyName() && $type == 'integer') {
$table->increments($this->getKeyName());
continue;
}

Expand Down
Loading