From 83b8008954bdceb14d6cc74f9f432f72be1c32af Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Thu, 19 Dec 2019 20:08:18 +0530
Subject: [PATCH] Fix method calls
---
src/Command/FixtureCommand.php | 2 +-
src/Command/ModelCommand.php | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Command/FixtureCommand.php b/src/Command/FixtureCommand.php
index 0a6c67201..d46a57cce 100644
--- a/src/Command/FixtureCommand.php
+++ b/src/Command/FixtureCommand.php
@@ -343,7 +343,7 @@ protected function _generateRecords(TableSchemaInterface $table, int $recordCoun
break;
case 'string':
case 'binary':
- $isPrimary = in_array($field, $table->primaryKey());
+ $isPrimary = in_array($field, $table->getPrimaryKey());
if ($isPrimary) {
$insert = Text::uuid();
} else {
diff --git a/src/Command/ModelCommand.php b/src/Command/ModelCommand.php
index feb4c6afa..1508033a3 100644
--- a/src/Command/ModelCommand.php
+++ b/src/Command/ModelCommand.php
@@ -302,7 +302,7 @@ public function findBelongsTo(Table $model, array $associations): array
{
$schema = $model->getSchema();
foreach ($schema->columns() as $fieldName) {
- if (!preg_match('/^.+_id$/', $fieldName) || ($schema->primaryKey() === [$fieldName])) {
+ if (!preg_match('/^.+_id$/', $fieldName) || ($schema->getPrimaryKey() === [$fieldName])) {
continue;
}
@@ -384,7 +384,7 @@ public function findTableReferencedBy(TableSchema $schema, string $keyField): ?s
public function findHasMany(Table $model, array $associations): array
{
$schema = $model->getSchema();
- $primaryKey = $schema->primaryKey();
+ $primaryKey = $schema->getPrimaryKey();
$tableName = $schema->name();
$foreignKey = $this->_modelKey($tableName);
@@ -600,7 +600,7 @@ public function getFields(Table $table, Arguments $args)
foreach ($table->associations() as $assoc) {
$fields[] = $assoc->getProperty();
}
- $primaryKey = $schema->primaryKey();
+ $primaryKey = $schema->getPrimaryKey();
return array_values(array_diff($fields, $primaryKey));
}
@@ -651,7 +651,7 @@ public function getValidation(Table $model, array $associations, Arguments $args
}
$validate = [];
- $primaryKey = $schema->primaryKey();
+ $primaryKey = $schema->getPrimaryKey();
$foreignKeys = [];
if (isset($associations['belongsTo'])) {
foreach ($associations['belongsTo'] as $assoc) {