Skip to content

add validate instaceof Model and fix current in sync method for Hybrid relation #2276

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
juniohyago wants to merge 8 commits into
base: 5.x
Choose a base branch
from
Open

add validate instaceof Model and fix current in sync method for Hybrid relation #2276

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e5e81e
add validate instaceof Model
juniohyago Jun 21, 2021
7aa00bc
fix current in sync method for Hybrid
juniohyago Jun 21, 2021
a6ae7ac
add test sync hybrid
juniohyago Jul 2, 2021
74fba08
fix to styleci
juniohyago Jul 2, 2021
0c96f80
fix styleci again
juniohyago Jul 2, 2021
978fe2b
fix test sync hybrid
juniohyago Jul 2, 2021
e59a8e5
fix syleci
juniohyago Jul 2, 2021
26e77f6
fix syle
juniohyago Jul 2, 2021
File filter

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
fix syleci
  • Loading branch information
@juniohyago
juniohyago committed Jul 2, 2021
commit e59a8e5d720548b56b0666ff78f9fbd680bc0255
5 changes: 3 additions & 2 deletions tests/HybridRelationsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ public function testHybridWith()
$this->assertEquals($user->id, $user->books->count());
});
}

public function testHybridSync()
{
$user = new MysqlUser;
Expand Down Expand Up @@ -226,15 +227,15 @@ public function testHybridSync()
$this->assertEquals(2, $client->usersMysql->count());

// sync 2 Clients
$user->clients()->sync([$client->_id,$otherClient->_id ]);
$user->clients()->sync([$client->_id, $otherClient->_id ]);
$user = MysqlUser::find($user->id);
$this->assertEquals(2, $user->clients->count());
// Sync 1 Client
$user->clients()->sync([$client->_id]);
$user = MysqlUser::find($user->id);
$this->assertEquals(1, $user->clients->count());
// Sync 2 Clients again
$user->clients()->sync([$client->_id,$otherClient->_id ]);
$user->clients()->sync([$client->_id, $otherClient->_id ]);
$user = MysqlUser::find($user->id);
$this->assertEquals(2, $user->clients->count());
}
Expand Down
4 changes: 2 additions & 2 deletions tests/models/MysqlUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function mysqlBooks(): HasMany

public function clients()
{
return $this->belongsToMany('Client',null,'mysql_users_id','clients');
return $this->belongsToMany('Client', null, 'mysql_users_id', 'clients');
}

/**
Expand All @@ -55,7 +55,7 @@ public static function executeSchema(): void
Schema::connection('mysql')->create('client_mysql_user', function (Blueprint $table) {
$table->integer('mysql_user_id')->unsigned();
$table->string('client_id');
$table->primary(['mysql_user_id','client_id']);
$table->primary(['mysql_user_id', 'client_id']);
});
}
}
Expand Down