Skip to content

Commit 8e17597

Browse files
authored
Move expression builders to Yiisoft\Db\Expression\Builder namespace (#1025)
1 parent 0435c5b commit 8e17597

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+89
-68
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
- Chg #1021: Move conjunction type from operator string value to `Like` condition constructor parameter (@vjik)
128128
- Chg #1023: Split `Like` condition to `Like` and `NotLike` (@vjik)
129129
- New #1024: Add `ColumnName` and `Value` expressions (@vjik)
130+
- Chg #1025: Move expression builders to `Yiisoft\Db\Expression\Builder` namespace (@vjik)
130131

131132
## 1.3.0 March 21, 2024
132133

UPGRADE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,3 +269,4 @@ Each table column has its own class in the `Yiisoft\Db\Schema\Column` namespace
269269
- Remove `Hash` condition;
270270
- Remove `AbstractTableSchema` and add `TableSchema` instead;
271271
- Remove `BetweenColumns` condition;
272+
- Move expression builders to `Yiisoft\Db\Expression\Builder` namespace;

src/Command/AbstractCommand.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Throwable;
99
use Yiisoft\Db\Connection\ConnectionInterface;
1010
use Yiisoft\Db\Exception\Exception;
11+
use Yiisoft\Db\Expression\Param;
1112
use Yiisoft\Db\Query\DataReaderInterface;
1213
use Yiisoft\Db\Query\QueryInterface;
1314
use Yiisoft\Db\QueryBuilder\DMLQueryBuilderInterface;

src/Command/CommandInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Yiisoft\Db\Exception\InvalidConfigException;
2020
use Yiisoft\Db\Exception\NotSupportedException;
2121
use Yiisoft\Db\Expression\ExpressionInterface;
22+
use Yiisoft\Db\Expression\Param;
2223
use Yiisoft\Db\Query\DataReaderInterface;
2324
use Yiisoft\Db\Query\QueryInterface;
2425
use Yiisoft\Db\QueryBuilder\DMLQueryBuilderInterface;

src/Driver/Pdo/AbstractPdoCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use Psr\Log\LogLevel;
1414
use Throwable;
1515
use Yiisoft\Db\Command\AbstractCommand;
16-
use Yiisoft\Db\Command\Param;
16+
use Yiisoft\Db\Expression\Param;
1717
use Yiisoft\Db\Connection\ConnectionInterface;
1818
use Yiisoft\Db\Exception\ConvertException;
1919
use Yiisoft\Db\Exception\Exception;

src/Expression/AbstractArrayExpressionBuilder.php renamed to src/Expression/Builder/AbstractArrayExpressionBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
declare(strict_types=1);
44

5-
namespace Yiisoft\Db\Expression;
5+
namespace Yiisoft\Db\Expression\Builder;
66

7+
use Yiisoft\Db\Expression\ArrayExpression;
8+
use Yiisoft\Db\Expression\ExpressionInterface;
79
use Yiisoft\Db\Query\QueryInterface;
810
use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
911
use Yiisoft\Db\Schema\Data\LazyArrayInterface;

src/Expression/AbstractStructuredExpressionBuilder.php renamed to src/Expression/Builder/AbstractStructuredExpressionBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
declare(strict_types=1);
44

5-
namespace Yiisoft\Db\Expression;
5+
namespace Yiisoft\Db\Expression\Builder;
66

77
use Yiisoft\Db\Exception\Exception;
88
use InvalidArgumentException;
99
use Yiisoft\Db\Exception\InvalidConfigException;
1010
use Yiisoft\Db\Exception\NotSupportedException;
11+
use Yiisoft\Db\Expression\ExpressionInterface;
12+
use Yiisoft\Db\Expression\StructuredExpression;
1113
use Yiisoft\Db\Helper\DbArrayHelper;
1214
use Yiisoft\Db\Query\QueryInterface;
1315
use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;

src/Expression/ArrayExpressionBuilder.php renamed to src/Expression/Builder/ArrayExpressionBuilder.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
declare(strict_types=1);
44

5-
namespace Yiisoft\Db\Expression;
5+
namespace Yiisoft\Db\Expression\Builder;
66

7-
use Yiisoft\Db\Command\Param;
7+
use Yiisoft\Db\Expression\Param;
88
use Yiisoft\Db\Constant\DataType;
9+
use Yiisoft\Db\Expression\ArrayExpression;
910
use Yiisoft\Db\Query\QueryInterface;
1011
use Yiisoft\Db\Schema\Data\JsonLazyArray;
1112
use Yiisoft\Db\Schema\Data\LazyArray;

src/Expression/CaseExpressionBuilder.php renamed to src/Expression/Builder/CaseExpressionBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
declare(strict_types=1);
44

5-
namespace Yiisoft\Db\Expression;
5+
namespace Yiisoft\Db\Expression\Builder;
66

77
use InvalidArgumentException;
88
use Yiisoft\Db\Constant\GettypeResult;
9+
use Yiisoft\Db\Expression\CaseExpression;
10+
use Yiisoft\Db\Expression\ExpressionInterface;
911
use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
1012

1113
use function gettype;

src/Expression/ColumnNameBuilder.php renamed to src/Expression/Builder/ColumnNameBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
declare(strict_types=1);
44

5-
namespace Yiisoft\Db\Expression;
5+
namespace Yiisoft\Db\Expression\Builder;
66

7+
use Yiisoft\Db\Expression\ColumnName;
8+
use Yiisoft\Db\Expression\ExpressionInterface;
79
use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
810

911
/**

0 commit comments

Comments
 (0)