From 7e2de9a996bcd68e5134d25070363bce93074714 Mon Sep 17 00:00:00 2001 From: Dominik Klapuch Date: Sat, 13 Jan 2018 16:42:38 +0100 Subject: [PATCH] SQL string everywhere --- Core/Clauses/AnsiFrom.php | 2 +- Core/Clauses/AnsiGroupBy.php | 2 +- Core/Clauses/AnsiHaving.php | 2 +- Core/Clauses/AnsiLimit.php | 2 +- Core/Clauses/AnsiOffset.php | 2 +- Core/Clauses/AnsiOrderBy.php | 2 +- Core/Clauses/AnsiSelect.php | 2 +- Core/Clauses/AnsiWhere.php | 2 +- Core/Clauses/ChainedWhere.php | 2 +- Core/Clauses/ConjunctWhere.php | 2 +- Core/Clauses/CustomJoin.php | 2 +- Core/Clauses/From.php | 2 +- Core/Clauses/GroupBy.php | 2 +- Core/Clauses/Having.php | 2 +- Core/Clauses/Join.php | 2 +- Core/Clauses/Limit.php | 2 +- Core/Clauses/Offset.php | 2 +- Core/Clauses/OrderBy.php | 2 +- Core/Clauses/Select.php | 2 +- Core/Clauses/Where.php | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Core/Clauses/AnsiFrom.php b/Core/Clauses/AnsiFrom.php index d92fce2..250d95c 100644 --- a/Core/Clauses/AnsiFrom.php +++ b/Core/Clauses/AnsiFrom.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class AnsiFrom implements Clause, From { +final class AnsiFrom implements From { private $clause; private $tables; diff --git a/Core/Clauses/AnsiGroupBy.php b/Core/Clauses/AnsiGroupBy.php index 693a56f..480f9eb 100644 --- a/Core/Clauses/AnsiGroupBy.php +++ b/Core/Clauses/AnsiGroupBy.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class AnsiGroupBy implements Clause, GroupBy { +final class AnsiGroupBy implements GroupBy { private $clause; private $columns; diff --git a/Core/Clauses/AnsiHaving.php b/Core/Clauses/AnsiHaving.php index 0ae8c1e..99561a5 100644 --- a/Core/Clauses/AnsiHaving.php +++ b/Core/Clauses/AnsiHaving.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class AnsiHaving implements Clause, Having { +final class AnsiHaving implements Having { private $clause; private $condition; diff --git a/Core/Clauses/AnsiLimit.php b/Core/Clauses/AnsiLimit.php index 4a69c87..0ddc5f3 100644 --- a/Core/Clauses/AnsiLimit.php +++ b/Core/Clauses/AnsiLimit.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class AnsiLimit implements Clause, Limit { +final class AnsiLimit implements Limit { private $clause; private $limit; diff --git a/Core/Clauses/AnsiOffset.php b/Core/Clauses/AnsiOffset.php index 6f15000..8bae398 100644 --- a/Core/Clauses/AnsiOffset.php +++ b/Core/Clauses/AnsiOffset.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class AnsiOffset implements Clause, Offset { +final class AnsiOffset implements Offset { private $clause; private $offset; diff --git a/Core/Clauses/AnsiOrderBy.php b/Core/Clauses/AnsiOrderBy.php index f1daf63..1ba6d2a 100644 --- a/Core/Clauses/AnsiOrderBy.php +++ b/Core/Clauses/AnsiOrderBy.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class AnsiOrderBy implements Clause, OrderBy { +final class AnsiOrderBy implements OrderBy { private $clause; private $orders; diff --git a/Core/Clauses/AnsiSelect.php b/Core/Clauses/AnsiSelect.php index e55f4e3..2a4b3b4 100644 --- a/Core/Clauses/AnsiSelect.php +++ b/Core/Clauses/AnsiSelect.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class AnsiSelect implements Clause, Select { +final class AnsiSelect implements Select { private $columns; public function __construct(array $columns) { diff --git a/Core/Clauses/AnsiWhere.php b/Core/Clauses/AnsiWhere.php index 852d65a..afe358a 100644 --- a/Core/Clauses/AnsiWhere.php +++ b/Core/Clauses/AnsiWhere.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class AnsiWhere implements Clause, Where { +final class AnsiWhere implements Where { private $condition; private $clause; diff --git a/Core/Clauses/ChainedWhere.php b/Core/Clauses/ChainedWhere.php index befaf69..4f88e52 100644 --- a/Core/Clauses/ChainedWhere.php +++ b/Core/Clauses/ChainedWhere.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -interface ChainedWhere { +interface ChainedWhere extends Clause { public function andWhere(string $condition): self; public function orWhere(string $condition): self; public function groupBy(array $columns): GroupBy; diff --git a/Core/Clauses/ConjunctWhere.php b/Core/Clauses/ConjunctWhere.php index 474a7b7..462e3d6 100644 --- a/Core/Clauses/ConjunctWhere.php +++ b/Core/Clauses/ConjunctWhere.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class ConjunctWhere implements Clause, ChainedWhere { +final class ConjunctWhere implements ChainedWhere { private $condition; private $clause; private $conjunct; diff --git a/Core/Clauses/CustomJoin.php b/Core/Clauses/CustomJoin.php index e297b78..b5c122b 100644 --- a/Core/Clauses/CustomJoin.php +++ b/Core/Clauses/CustomJoin.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -final class CustomJoin implements Clause, Join { +final class CustomJoin implements Join { private $clause; private $type; private $table; diff --git a/Core/Clauses/From.php b/Core/Clauses/From.php index af3108b..3501de8 100644 --- a/Core/Clauses/From.php +++ b/Core/Clauses/From.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -interface From { +interface From extends Clause { public function where(string $comparison): Where; public function join(string $type, string $table, string $condition): Join; public function groupBy(array $columns): GroupBy; diff --git a/Core/Clauses/GroupBy.php b/Core/Clauses/GroupBy.php index 050a529..cd76d77 100644 --- a/Core/Clauses/GroupBy.php +++ b/Core/Clauses/GroupBy.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -interface GroupBy { +interface GroupBy extends Clause { public function having(string $condition): Having; public function orderBy(array $orders): OrderBy; public function limit(int $limit): Limit; diff --git a/Core/Clauses/Having.php b/Core/Clauses/Having.php index 675f4ab..2187c76 100644 --- a/Core/Clauses/Having.php +++ b/Core/Clauses/Having.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -interface Having { +interface Having extends Clause { public function orderBy(array $orders): OrderBy; public function limit(int $limit): Limit; public function offset(int $offset): Offset; diff --git a/Core/Clauses/Join.php b/Core/Clauses/Join.php index d539f28..fc96490 100644 --- a/Core/Clauses/Join.php +++ b/Core/Clauses/Join.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -interface Join { +interface Join extends Clause { public function join(string $type, string $table, string $condition): self; public function where(string $comparison): Where; public function groupBy(array $columns): GroupBy; diff --git a/Core/Clauses/Limit.php b/Core/Clauses/Limit.php index 58c6a62..a8b8fd6 100644 --- a/Core/Clauses/Limit.php +++ b/Core/Clauses/Limit.php @@ -3,6 +3,6 @@ namespace Klapuch\Storage\Clauses; -interface Limit { +interface Limit extends Clause { public function offset(int $offset): Offset; } \ No newline at end of file diff --git a/Core/Clauses/Offset.php b/Core/Clauses/Offset.php index 6ed7759..9ffd16a 100644 --- a/Core/Clauses/Offset.php +++ b/Core/Clauses/Offset.php @@ -3,6 +3,6 @@ namespace Klapuch\Storage\Clauses; -interface Offset { +interface Offset extends Clause { public function limit(int $limit): Limit; } \ No newline at end of file diff --git a/Core/Clauses/OrderBy.php b/Core/Clauses/OrderBy.php index 98b1989..84a5755 100644 --- a/Core/Clauses/OrderBy.php +++ b/Core/Clauses/OrderBy.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -interface OrderBy { +interface OrderBy extends Clause { public function limit(int $limit): Limit; public function offset(int $offset): Offset; } \ No newline at end of file diff --git a/Core/Clauses/Select.php b/Core/Clauses/Select.php index 2a1a7fe..5c4a25e 100644 --- a/Core/Clauses/Select.php +++ b/Core/Clauses/Select.php @@ -3,6 +3,6 @@ namespace Klapuch\Storage\Clauses; -interface Select { +interface Select extends Clause { public function from(array $tables): From; } \ No newline at end of file diff --git a/Core/Clauses/Where.php b/Core/Clauses/Where.php index 58eb77a..7cdec90 100644 --- a/Core/Clauses/Where.php +++ b/Core/Clauses/Where.php @@ -3,7 +3,7 @@ namespace Klapuch\Storage\Clauses; -interface Where { +interface Where extends Clause { public function andWhere(string $condition): ChainedWhere; public function orWhere(string $condition): ChainedWhere; public function groupBy(array $columns): GroupBy;