Skip to content

Commit a257936

Browse files
muhammetsafakmuhammetsafak
authored
Merge pull request #16 from InitPHP/v2.1
2.1
2 parents 4ae07cc + c37622c commit a257936

File tree

7 files changed

+95
-61
lines changed

7 files changed

+95
-61
lines changed

‎README.md‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -262,19 +262,6 @@ namespace App\Model;
262262
class Posts extends \InitPHP\Database\Model
263263
{
264264

265-
/**
266-
* Only if you don't have global connectivity.
267-
*
268-
* @var array|string[]
269-
*/
270-
protected array $connection = [
271-
'dsn' => '', // Database connection address.
272-
'username' => '', // Username with required privileges in the database.
273-
'password' => '', // The password of the database user.
274-
'charset' => 'utf8mb4', // The character set to use in the database.
275-
'collation' => 'utf8mb4_general_ci', // Collection set to use in database
276-
];
277-
278265
/**
279266
* If not specified, \InitPHP\Database\Entity::class is used by default.
280267
*

‎src/Database.php‎

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

@@ -295,29 +295,6 @@ final public function escape_str($value)
295295
return false;
296296
}
297297

298-
/**
299-
* @param string $key
300-
* @param string|int|float|bool|null $value
301-
* @return $this
302-
*/
303-
final public function setParameter(string $key, $value): self
304-
{
305-
Parameters::set($key, $value);
306-
return $this;
307-
}
308-
309-
/**
310-
* @param array $parameters
311-
* @return $this
312-
*/
313-
final public function setParameters(array $parameters = []): self
314-
{
315-
foreach ($parameters as $key => $value) {
316-
Parameters::set($key, $value);
317-
}
318-
return $this;
319-
}
320-
321298
/**
322299
* @param string $sqlQuery
323300
* @param array $parameters
@@ -358,7 +335,7 @@ final public function query(string $sqlQuery, array $parameters = []): Result
358335
case self::ARRAY:
359336
return $this->_last->asArray();
360337
case self::ENTITY:
361-
return $this->_last->asEntity();
338+
return $this->_last->asEntity($this->_credentials['entity'] ?? Entity::class);
362339
case self::OBJECT:
363340
return $this->_last->asObject();
364341
case self::LAZY:

‎src/Entity.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
class Entity
1919
{
2020

21-
private array $_Attributes = [];
21+
protected array $__attributes = [];
2222

23-
private array $_OriginalAttributes = [];
23+
protected array $__attributesOriginal = [];
2424

2525
public function __construct(?array $data = [])
2626
{
@@ -35,10 +35,10 @@ public function __call($name, $arguments)
3535
switch (\substr($name, 0, 3)) {
3636
case 'get':
3737
$attr = Helper::camelCaseToSnakeCase(\substr($name, 3, -9));
38-
return $this->_Attributes[$attr] ?? null;
38+
return $this->__attributes[$attr] ?? null;
3939
case 'set':
4040
$attr = Helper::camelCaseToSnakeCase(\substr($name, 3, -9));
41-
return $this->_Attributes[$attr] = $arguments[0];
41+
return $this->__attributes[$attr] = $arguments[0];
4242
default:
4343
throw new \RuntimeException('There is no "' . $name . '" method.');
4444
}
@@ -51,7 +51,7 @@ public function __set($name, $value)
5151
$this->{$methodName}($value);
5252
return $value;
5353
}
54-
return $this->_Attributes[$name] = $value;
54+
return $this->__attributes[$name] = $value;
5555
}
5656

5757
public function __get($name)
@@ -60,29 +60,29 @@ public function __get($name)
6060
if(\method_exists($this, $methodName)){
6161
return $this->{$methodName}();
6262
}
63-
return $this->_Attributes[$name] ?? null;
63+
return $this->__attributes[$name] ?? null;
6464
}
6565

6666
public function __isset($name)
6767
{
68-
return isset($this->_Attributes[$name]);
68+
return isset($this->__attributes[$name]);
6969
}
7070

7171
public function __unset($name)
7272
{
73-
if(isset($this->_Attributes[$name])){
74-
unset($this->_Attributes[$name]);
73+
if(isset($this->__attributes[$name])){
74+
unset($this->__attributes[$name]);
7575
}
7676
}
7777

7878
public function __debugInfo()
7979
{
80-
return $this->_Attributes;
80+
return $this->__attributes;
8181
}
8282

8383
public function toArray(): array
8484
{
85-
return $this->_Attributes;
85+
return $this->__attributes;
8686
}
8787

8888
public function getAttributes(): array
@@ -109,7 +109,7 @@ protected function fill(?array $data = null): self
109109

110110
protected function syncOriginal(): self
111111
{
112-
$this->_OriginalAttributes = $this->_Attributes;
112+
$this->__attributesOriginal = $this->__attributes;
113113
return $this;
114114
}
115115

‎src/Helpers/Helper.php‎

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

@@ -59,7 +59,7 @@ public static function isSQLParameterOrFunction($value): bool
5959
return ((\is_string($value)) && (
6060
$value === '?'
6161
|| (bool)\preg_match('/^:[\w]+$/', $value)
62-
|| (bool)\preg_match('/^[a-zA-Z_\.]+$/', $value)
62+
|| (bool)\preg_match('/^[a-zA-Z_]+[\.]+[a-zA-Z_]+$/', $value)
6363
|| (bool)\preg_match('/^[a-zA-Z_]+\(\)$/', $value)
6464
)) || ($value instanceof Raw) || \is_int($value);
6565
}

‎src/Model.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0.8
10+
* @version 2.1
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
13+
declare(strict_types=1);
1314

1415
namespace InitPHP\Database;
1516

@@ -226,6 +227,7 @@ public function __construct()
226227
$credentials['updatable'] = $this->updatable ?? true;
227228
$credentials['deletable'] = $this->deletable ?? true;
228229
$credentials['writable'] = $this->writable ?? true;
230+
$credentials['return'] = $this->return ?? self::ENTITY;
229231
parent::__construct($credentials);
230232
}
231233

‎src/QueryBuilder.php‎

Lines changed: 47 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0.8
10+
* @version 2.1
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
13+
declare(strict_types=1);
1314

1415
namespace InitPHP\Database;
1516

16-
use InitPHP\Database\Helpers\{Helper, Parameters, Validation};
17-
use InitPHP\Database\Exceptions\QueryBuilderException;
18-
use InitPHP\Database\Exceptions\QueryGeneratorException;
19-
use \InitPHP\Database\Exceptions\ValueException;
17+
use \InitPHP\Database\Helpers\{Helper, Parameters};
18+
use \InitPHP\Database\Exceptions\{QueryBuilderException, QueryGeneratorException, ValueException};
2019

2120
class QueryBuilder
2221
{
@@ -65,6 +64,29 @@ public function exportQB(): array
6564
return $this->_STRUCTURE;
6665
}
6766

67+
/**
68+
* @param string $key
69+
* @param string|int|float|bool|null $value
70+
* @return $this
71+
*/
72+
final public function setParameter(string $key, $value): self
73+
{
74+
Parameters::set($key, $value);
75+
return $this;
76+
}
77+
78+
/**
79+
* @param array $parameters
80+
* @return $this
81+
*/
82+
final public function setParameters(array $parameters = []): self
83+
{
84+
foreach ($parameters as $key => $value) {
85+
Parameters::set($key, $value);
86+
}
87+
return $this;
88+
}
89+
6890
/**
6991
* @param string|Raw ...$columns
7092
* @return $this
@@ -368,7 +390,7 @@ final public function join($table, $onStmt = null, string $type = 'INNER'): self
368390
$this->_STRUCTURE['join'][$table] = 'NATURAL JOIN ' . $table;
369391
break;
370392
default:
371-
$this->_STRUCTURE['join'][$table] = $type . ' JOIN ' . $table . ' ON ' . $onStmt;
393+
$this->_STRUCTURE['join'][$table] = \trim(($type . ' JOIN ' . $table . ' ON ' . $onStmt));
372394
}
373395
return $this;
374396
}
@@ -1124,6 +1146,23 @@ final public function raw(string $rawQuery): Raw
11241146
return new Raw($rawQuery);
11251147
}
11261148

1149+
final public function subQuery(\Closure $closure, ?string $alias = null, bool $isIntervalQuery = true): Raw
1150+
{
1151+
$queryBuilder = new self();
1152+
\call_user_func_array($closure, [$queryBuilder]);
1153+
1154+
if ($alias !== null && $isIntervalQuery !== TRUE) {
1155+
throw new QueryBuilderException('To define alias to a subquery, it must be an inner query.');
1156+
}
1157+
1158+
$rawQuery = ($isIntervalQuery === TRUE ? '(' : '')
1159+
. $queryBuilder->generateSelectQuery()
1160+
. ($isIntervalQuery === TRUE ? ')' : '')
1161+
. ($alias !== null ? ' AS ' . $alias : '');
1162+
1163+
return $this->raw($rawQuery);
1164+
}
1165+
11271166
final public function generateInsertQuery(): string
11281167
{
11291168
if (!empty($this->_STRUCTURE['table'])) {
@@ -1533,15 +1572,15 @@ private function whereOrHavingStatementPrepare($column, $value, string $mark = '
15331572
}
15341573
$values[] = Helper::isSQLParameterOrFunction($val) ? $val : Parameters::add($column, $val);
15351574
}
1536-
$value = \implode(', ', \array_unique($values));
1575+
$value = '(' . \implode(', ', \array_unique($values)) . ')';
15371576
} elseif (Helper::isSQLParameterOrFunction($value)) {
15381577
$value = (string)$value;
15391578
}else{
15401579
throw new ValueException('An incorrect value was defined.');
15411580
}
15421581
return $column
15431582
. ($searchMark === 'NOTIN' ? ' NOT ' : ' ')
1544-
. 'IN (' . $value . ')';
1583+
. 'IN ' . $value;
15451584
case 'FINDINSET':
15461585
case 'NOTFINDINSET':
15471586
if(\is_array($value)){

‎tests/QueryBuilderUnitTest.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,4 +420,33 @@ public function testJoinClosureGive()
420420
$this->db->reset();
421421
}
422422

423+
public function testSubQuery()
424+
{
425+
Parameters::reset();
426+
$this->db->select('u.name')
427+
->from('users AS u')
428+
->in('u.id', $this->db->subQuery(function (QueryBuilder $builder) {
429+
$builder->select('id')
430+
->from('roles')
431+
->where('name', 'admin');
432+
}));
433+
$expected = 'SELECT u.name FROM users AS u WHERE u.id IN (SELECT id FROM roles WHERE name = :name)';
434+
$this->assertEquals($expected, $this->db->generateSelectQuery());
435+
$this->db->reset();
436+
437+
438+
Parameters::reset();
439+
$this->db->select('u.name, p.title')
440+
->from('users AS u')
441+
->join($this->db->subQuery(function (QueryBuilder $builder) {
442+
$builder->select('id, title, user_id')
443+
->from('posts')
444+
->where('user_id', 5);
445+
}, 'p'), 'p.user_id = u.id', '');
446+
447+
$expected = 'SELECT u.name, p.title FROM users AS u JOIN (SELECT id, title, user_id FROM posts WHERE user_id = 5) AS p ON p.user_id = u.id WHERE 1';
448+
$this->assertEquals($expected, $this->db->generateSelectQuery());
449+
$this->db->reset();
450+
}
451+
423452
}

0 commit comments

Comments
 (0)