Skip to content

Commit 4ae07cc

Browse files
muhammetsafakmuhammetsafak
authored
Merge pull request #15 from InitPHP/v2.0.8
2.0.8
2 parents 5c5e758 + 5c65f63 commit 4ae07cc

File tree

11 files changed

+1346
-599
lines changed

11 files changed

+1346
-599
lines changed

‎src/Database.php‎

Lines changed: 134 additions & 381 deletions
Large diffs are not rendered by default.

‎src/Exceptions/QueryBuilderException.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
/**
3+
* Exceptions/QueryBuilderException
4+
*
5+
* This file is part of InitPHP Database.
6+
*
7+
* @author Muhammet ŞAFAK <info@muhammetsafak.com.tr>
8+
* @copyright Copyright © 2022 Muhammet ŞAFAK
9+
* @license ./LICENSE MIT
10+
* @version 2.0.8
11+
* @link https://www.muhammetsafak.com.tr
12+
*/
13+
14+
namespace InitPHP\Database\Exceptions;
15+
16+
class QueryBuilderException extends \Exception
17+
{
18+
}

‎src/Exceptions/QueryGeneratorException.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
/**
3+
* Exceptions/QueryGeneratorException
4+
*
5+
* This file is part of InitPHP Database.
6+
*
7+
* @author Muhammet ŞAFAK <info@muhammetsafak.com.tr>
8+
* @copyright Copyright © 2022 Muhammet ŞAFAK
9+
* @license ./LICENSE MIT
10+
* @version 2.0.8
11+
* @link https://www.muhammetsafak.com.tr
12+
*/
13+
14+
namespace InitPHP\Database\Exceptions;
15+
16+
class QueryGeneratorException extends QueryBuilderException
17+
{
18+
}

‎src/Exceptions/ValueException.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
/**
3+
* Exceptions/ValueException
4+
*
5+
* This file is part of InitPHP Database.
6+
*
7+
* @author Muhammet ŞAFAK <info@muhammetsafak.com.tr>
8+
* @copyright Copyright © 2022 Muhammet ŞAFAK
9+
* @license ./LICENSE MIT
10+
* @version 2.0.8
11+
* @link https://www.muhammetsafak.com.tr
12+
*/
13+
14+
namespace InitPHP\Database\Exceptions;
15+
16+
class ValueException extends QueryBuilderException
17+
{
18+
}

‎src/Helpers/Helper.php‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,21 @@
77
* @author Muhammet ŞAFAK <info@muhammetsafak.com.tr>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0.7
10+
* @version 2.0.8
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

1414
namespace InitPHP\Database\Helpers;
1515

16+
use InitPHP\Database\Exceptions\ModelRelationsException;
17+
use InitPHP\Database\Model;
18+
use InitPHP\Database\Raw;
19+
1620
final class Helper
1721
{
1822

23+
private static array $modelInstance = [];
24+
1925
public static function str_starts_with(string $haystack, string $needle): bool
2026
{
2127
if(\function_exists('str_starts_with')){
@@ -50,11 +56,12 @@ public static function str_ends_with(string $haystack, string $needle): bool
5056

5157
public static function isSQLParameterOrFunction($value): bool
5258
{
53-
return (\is_string($value)) && (
59+
return ((\is_string($value)) && (
5460
$value === '?'
5561
|| (bool)\preg_match('/^:[\w]+$/', $value)
62+
|| (bool)\preg_match('/^[a-zA-Z_\.]+$/', $value)
5663
|| (bool)\preg_match('/^[a-zA-Z_]+\(\)$/', $value)
57-
);
64+
)) || ($value instanceof Raw) || \is_int($value);
5865
}
5966

6067
public static function isSQLParameter($value): bool
@@ -91,4 +98,26 @@ public static function snakeCaseToPascalCase($snake_case): string
9198
return $camelCase;
9299
}
93100

101+
public static function getModelInstance($model): Model
102+
{
103+
if ($model instanceof Model) {
104+
$class = \get_class($model);
105+
return self::$modelInstance[$class] = $model;
106+
} elseif (\is_string($model) && \class_exists($model)) {
107+
if (isset(self::$modelInstance[$model])) {
108+
return self::$modelInstance[$model];
109+
}
110+
} else {
111+
throw new \InvalidArgumentException();
112+
}
113+
114+
$reflection = new \ReflectionClass($model);
115+
if ($reflection->isSubclassOf(Model::class) === FALSE) {
116+
throw new ModelRelationsException('The target class must be a subclass of \\InitPHP\\Database\\Model.');
117+
}
118+
$class = $reflection->getName();
119+
120+
return self::$modelInstance[$class] = $reflection->newInstance();
121+
}
122+
94123
}

‎src/Helpers/Parameters.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
* @author Muhammet ŞAFAK <info@muhammetsafak.com.tr>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0.7
10+
* @version 2.0.8
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

1414
namespace InitPHP\Database\Helpers;
1515

16+
use InitPHP\Database\Raw;
17+
1618
final class Parameters
1719
{
1820

@@ -33,8 +35,14 @@ public static function set(string $key, $value): void
3335
self::$parameters[$key] = $value;
3436
}
3537

36-
public static function add(string $key, $value): string
38+
public static function add($key, $value): string
3739
{
40+
if ($value === null) {
41+
return 'NULL';
42+
}
43+
if ($key instanceof Raw) {
44+
$key = \md5((string)$key);
45+
}
3846
$originKey = \ltrim(\str_replace('.', '', $key), ':');
3947
$i = 0;
4048
do{

‎src/Helpers/Validation.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
use InitPHP\Database\Database;
1717
use InitPHP\Database\Exceptions\ValidationException;
18+
use InitPHP\Database\Raw;
1819

1920
final class Validation
2021
{
@@ -109,6 +110,9 @@ public function validation(string $column, $schemaID = null): bool
109110
}
110111

111112
$data = $this->data[$column] ?? null;
113+
if ($data instanceof Raw) {
114+
return true;
115+
}
112116

113117
if(Helper::isSQLParameter($data)){
114118
$data = Parameters::getParam($data);

‎src/Init.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
* @author Muhammet ŞAFAK <info@muhammetsafak.com.tr>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0.7
10+
* @version 2.0.8
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

1414

15-
declare(strict_types=1);
1615
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Helpers/Helper.php';
1716
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Helpers/Parameters.php';
1817
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Helpers/Validation.php';
@@ -26,6 +25,7 @@
2625
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Exceptions/UpdatableException.php';
2726
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Exceptions/ValidationException.php';
2827
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Exceptions/WritableException.php';
28+
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Exceptions/ValueException.php';
2929
require_once __DIR__ . DIRECTORY_SEPARATOR . 'QueryBuilder.php';
3030
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Facade/DB.php';
3131
require_once __DIR__ . DIRECTORY_SEPARATOR . 'Database.php';

‎src/Model.php‎

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <info@muhammetsafak.com.tr>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0.7
10+
* @version 2.0.8
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

@@ -20,6 +20,7 @@
2020
ReadableException,
2121
UpdatableException,
2222
WritableException};
23+
use InitPHP\Database\Helpers\Helper;
2324
use InitPHP\Database\Helpers\Parameters;
2425

2526
abstract class Model extends Database
@@ -457,58 +458,41 @@ final public function purgeDeleted(): bool
457458
}
458459

459460
/**
461+
* İki model arasında bir JOIN ilişkisi kurar.
462+
*
460463
* @param string|Model $model
461-
* @param string|null $fromColumn
462-
* @param string|null $targetColumn
464+
* @param string|null $foreignKey
465+
* @param string|null $localKey
463466
* @param string $joinType
464467
* @return $this
465-
* @throws \ReflectionException
466468
*/
467-
final public function relation($model, ?string $fromColumn = null, ?string $targetColumn = null, string $joinType = 'INNER'): self
469+
final public function relation($model, ?string $foreignKey = null, ?string $localKey = null, string $joinType = 'INNER'): self
468470
{
469471
$from = [
470472
'tableSchema' => $this->getSchema(),
471473
'tableSchemaID' => $this->getSchemaID(),
472474
];
473-
$ref = new \ReflectionClass($model);
474-
if($ref->isSubclassOf(Model::class) === FALSE){
475-
throw new ModelRelationsException('The target class must be a subclass of \\InitPHP\\Database\\Model.');
476-
}
477-
if(\defined('PHP_VERSION_ID') && \PHP_VERSION_ID >= 80000){
478-
$target = $ref->getProperty('table');
479-
$targetPrimaryKey = $ref->getProperty('primaryKey');
480-
if(($targetSchema = $target->getDefaultValue()) === null){
481-
$targetSchema = \strtolower($ref->getShortName());
482-
}
483-
$targetSchemaID = $targetPrimaryKey->getDefaultValue();
484-
$target = [
485-
'tableSchema' => $targetSchema,
486-
'tableSchemaID' => $targetSchemaID,
487-
];
488-
}else{
489-
if(!\is_object($model)){
490-
$model = $ref->newInstance();
491-
}
492-
$target = [
493-
'tableSchema' => $model->getSchema(),
494-
'tableSchemaID' => $model->getSchemaID(),
495-
];
496-
}
497-
if($fromColumn === null || $fromColumn === '{primaryKey}'){
475+
$target = $this->getModelTableNameAndPrimaryKeyColumn($model);
476+
477+
if($localKey === null || $localKey === '{primaryKey}'){
498478
if(empty($from['tableSchemaID'])){
499479
throw new ModelRelationsException('To use relationships, the model must have a primary key column.');
500480
}
501481
}else{
502-
$from['tableSchemaID'] = $fromColumn;
482+
$from['tableSchemaID'] = $localKey;
503483
}
504-
if($targetColumn === null || $targetColumn === '{primaryKey}'){
484+
if($foreignKey === null) {
485+
$target['tableSchemaID'] = (Helper::str_ends_with($from['tableSchema'], 's') ? \substr($from['tableSchema'], -1) : $from['tableSchema'])
486+
. '_' . $from['tableSchemaID'];
487+
} elseif ($foreignKey === '{primaryKey}') {
505488
if(empty($target['tableSchemaID'])){
506489
throw new ModelRelationsException('To use relationships, the model must have a primary key column.');
507490
}
508491
}else{
509-
$target['tableSchemaID'] = $targetColumn;
492+
$target['tableSchemaID'] = $foreignKey;
510493
}
511494
$this->join($target['tableSchema'], ($from['tableSchema'] . '.' . $from['tableSchemaID'] . ' = ' . $target['tableSchema'] . '.' . $target['tableSchemaID']), $joinType);
495+
512496
return $this;
513497
}
514498

@@ -603,4 +587,35 @@ private function callbacksFunctionHandler(array $data, string $method)
603587
return $data;
604588
}
605589

590+
private function getModelTableNameAndPrimaryKeyColumn($model): array
591+
{
592+
$reflection = new \ReflectionClass($model);
593+
if ($reflection->isSubclassOf(Model::class) === FALSE) {
594+
throw new ModelRelationsException('The target class must be a subclass of \\InitPHP\\Database\\Model.');
595+
}
596+
if (\defined('PHP_VERSION_ID') && \PHP_VERSION_ID >= 80000) {
597+
$tableReflection = $reflection->getProperty('table');
598+
$primaryKeyReflection = $reflection->getProperty('primaryKey');
599+
if (null === $tableName = $tableReflection->getDefaultValue()) {
600+
$tableName = \strtolower($reflection->getShortName());
601+
}
602+
$primaryKey = $primaryKeyReflection->getDefaultValue();
603+
604+
return [
605+
'tableSchema' => $tableName,
606+
'tableSchemaID' => $primaryKey,
607+
];
608+
}
609+
610+
/** @var $model Model */
611+
if (!\is_object($model)) {
612+
$model = $reflection->newInstance();
613+
}
614+
615+
return [
616+
'tableSchema' => $model->getSchema(),
617+
'tableSchemaID' => $model->getSchemaID(),
618+
];
619+
}
620+
606621
}

0 commit comments

Comments
 (0)