Skip to content

Commit 847b93b

Browse files
byjgbyjg
committed
Update namespace references for byjg/anydataset-db compatibility
Refactor all references to use the new namespace structure from the updated byjg/anydataset-db dependency: - Update DbDriverInterface to Interfaces\DbDriverInterface - Replace DbFunctionsInterface with Interfaces\SqlDialectInterface - Update helper classes: DbSqliteFunctions → SqlDialect\SqliteDialect, DbMysqlFunctions → SqlDialect\MysqlDialect, DbPgsqlFunctions → SqlDialect\PgsqlDialect - Replace getDbHelper() method calls with getSqlDialect() This resolves 102 Psalm errors related to undefined classes and interfaces. All 324 tests passing.
1 parent 2464d9e commit 847b93b

19 files changed

Lines changed: 61 additions & 61 deletions

‎src/DeleteQuery.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace ByJG\MicroOrm;
44

5-
use ByJG\AnyDataset\Db\DbDriverInterface;
6-
use ByJG\AnyDataset\Db\DbFunctionsInterface;
5+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
6+
use ByJG\AnyDataset\Db\Interfaces\SqlDialectInterface;
77
use ByJG\AnyDataset\Db\SqlStatement;
88
use ByJG\MicroOrm\Exception\InvalidArgumentException;
99
use ByJG\MicroOrm\Interface\QueryBuilderInterface;
@@ -17,7 +17,7 @@ public static function getInstance(): DeleteQuery
1717
}
1818

1919
#[Override]
20-
public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement
20+
public function build(SqlDialectInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement
2121
{
2222
$whereStr = $this->getWhere();
2323
if (is_null($whereStr)) {
@@ -35,7 +35,7 @@ public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHel
3535
}
3636

3737
#[Override]
38-
public function convert(?DbFunctionsInterface $dbHelper = null): QueryBuilderInterface
38+
public function convert(?SqlDialectInterface $dbHelper = null): QueryBuilderInterface
3939
{
4040
$query = Query::getInstance()
4141
->table($this->table);

‎src/InsertBulkQuery.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace ByJG\MicroOrm;
44

5-
use ByJG\AnyDataset\Db\DbDriverInterface;
6-
use ByJG\AnyDataset\Db\DbFunctionsInterface;
5+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
6+
use ByJG\AnyDataset\Db\Interfaces\SqlDialectInterface;
77
use ByJG\AnyDataset\Db\SqlStatement;
88
use ByJG\MicroOrm\Exception\OrmInvalidFieldsException;
99
use ByJG\MicroOrm\Interface\QueryBuilderInterface;
@@ -61,19 +61,19 @@ public function values(array $values, bool $allowNonMatchFields = true): static
6161
}
6262

6363
/**
64-
* @param DbDriverInterface|DbFunctionsInterface|null $dbDriverOrHelper
64+
* @param DbDriverInterface|SqlDialectInterface|null $dbDriverOrHelper
6565
* @return SqlStatement
6666
* @throws OrmInvalidFieldsException
6767
*/
6868
#[Override]
69-
public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement
69+
public function build(SqlDialectInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement
7070
{
7171
if (empty($this->fields)) {
7272
throw new OrmInvalidFieldsException('You must specify the fields for insert');
7373
}
7474

7575
if ($dbDriverOrHelper instanceof DbDriverInterface) {
76-
$dbDriverOrHelper = $dbDriverOrHelper->getDbHelper();
76+
$dbDriverOrHelper = $dbDriverOrHelper->getSqlDialect();
7777
}
7878

7979
$tableStr = $this->table;
@@ -127,7 +127,7 @@ public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHel
127127
}
128128

129129
#[Override]
130-
public function convert(?DbFunctionsInterface $dbHelper = null): QueryBuilderInterface
130+
public function convert(?SqlDialectInterface $dbHelper = null): QueryBuilderInterface
131131
{
132132
throw new InvalidArgumentException('It is not possible to convert an InsertBulkQuery to a Query');
133133
}

‎src/InsertQuery.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace ByJG\MicroOrm;
44

5-
use ByJG\AnyDataset\Db\DbDriverInterface;
6-
use ByJG\AnyDataset\Db\DbFunctionsInterface;
5+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
6+
use ByJG\AnyDataset\Db\Interfaces\SqlDialectInterface;
77
use ByJG\AnyDataset\Db\SqlStatement;
88
use ByJG\MicroOrm\Exception\InvalidArgumentException;
99
use ByJG\MicroOrm\Exception\OrmInvalidFieldsException;
@@ -68,19 +68,19 @@ public function defineFields(array $fields): static
6868
}
6969

7070
/**
71-
* @param DbDriverInterface|DbFunctionsInterface|null $dbDriverOrHelper
71+
* @param DbDriverInterface|SqlDialectInterface|null $dbDriverOrHelper
7272
* @return SqlStatement
7373
* @throws OrmInvalidFieldsException
7474
*/
7575
#[Override]
76-
public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement
76+
public function build(SqlDialectInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement
7777
{
7878
if (empty($this->values)) {
7979
throw new OrmInvalidFieldsException('You must specify the fields for insert');
8080
}
8181

8282
if ($dbDriverOrHelper instanceof DbDriverInterface) {
83-
$dbDriverOrHelper = $dbDriverOrHelper->getDbHelper();
83+
$dbDriverOrHelper = $dbDriverOrHelper->getSqlDialect();
8484
}
8585

8686
$fieldsStr = array_keys($this->values); // get the fields from the first element only
@@ -109,7 +109,7 @@ public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHel
109109
* @throws \ByJG\Serializer\Exception\InvalidArgumentException
110110
*/
111111
#[Override]
112-
public function convert(?DbFunctionsInterface $dbHelper = null): QueryBuilderInterface
112+
public function convert(?SqlDialectInterface $dbHelper = null): QueryBuilderInterface
113113
{
114114
$query = Query::getInstance()
115115
->fields(array_keys($this->values))

‎src/InsertSelectQuery.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace ByJG\MicroOrm;
44

5-
use ByJG\AnyDataset\Db\DbDriverInterface;
6-
use ByJG\AnyDataset\Db\DbFunctionsInterface;
5+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
6+
use ByJG\AnyDataset\Db\Interfaces\SqlDialectInterface;
77
use ByJG\AnyDataset\Db\SqlStatement;
88
use ByJG\MicroOrm\Exception\OrmInvalidFieldsException;
99
use ByJG\MicroOrm\Interface\QueryBuilderInterface;
@@ -52,12 +52,12 @@ public function fromSqlStatement(SqlStatement $sqlStatement): static
5252
}
5353

5454
/**
55-
* @param DbDriverInterface|DbFunctionsInterface|null $dbDriverOrHelper
55+
* @param DbDriverInterface|SqlDialectInterface|null $dbDriverOrHelper
5656
* @return SqlStatement
5757
* @throws OrmInvalidFieldsException
5858
*/
5959
#[Override]
60-
public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement
60+
public function build(SqlDialectInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement
6161
{
6262
if (empty($this->fields)) {
6363
throw new OrmInvalidFieldsException('You must specify the fields for insert');
@@ -67,7 +67,7 @@ public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHel
6767
$dbHelper = $dbDriverOrHelper;
6868
if ($dbDriverOrHelper instanceof DbDriverInterface) {
6969
$dbDriver = $dbDriverOrHelper;
70-
$dbHelper = $dbDriverOrHelper->getDbHelper();
70+
$dbHelper = $dbDriverOrHelper->getSqlDialect();
7171
}
7272

7373
if (empty($this->query) && empty($this->sqlStatement)) {
@@ -100,7 +100,7 @@ public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHel
100100
}
101101

102102
#[Override]
103-
public function convert(?DbFunctionsInterface $dbHelper = null): QueryBuilderInterface
103+
public function convert(?SqlDialectInterface $dbHelper = null): QueryBuilderInterface
104104
{
105105
throw new InvalidArgumentException('It is not possible to convert an InsertSelectQuery to a Query');
106106
}

‎src/Interface/QueryBuilderInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use ByJG\AnyDataset\Core\GenericIterator;
66
use ByJG\AnyDataset\Db\DatabaseExecutor;
7-
use ByJG\AnyDataset\Db\DbDriverInterface;
7+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
88
use ByJG\AnyDataset\Db\SqlStatement;
99
use ByJG\MicroOrm\CacheQueryResult;
1010

‎src/Interface/UpdateBuilderInterface.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
namespace ByJG\MicroOrm\Interface;
44

55
use ByJG\AnyDataset\Db\DatabaseExecutor;
6-
use ByJG\AnyDataset\Db\DbDriverInterface;
7-
use ByJG\AnyDataset\Db\DbFunctionsInterface;
6+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
7+
use ByJG\AnyDataset\Db\Interfaces\SqlDialectInterface;
88
use ByJG\AnyDataset\Db\SqlStatement;
99

1010
interface UpdateBuilderInterface
1111
{
12-
public function build(DbFunctionsInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement;
12+
public function build(SqlDialectInterface|DbDriverInterface|null $dbDriverOrHelper = null): SqlStatement;
1313

1414
public function buildAndExecute(DatabaseExecutor $executor, $params = []);
1515

16-
public function convert(?DbFunctionsInterface $dbHelper = null): QueryBuilderInterface;
16+
public function convert(?SqlDialectInterface $dbHelper = null): QueryBuilderInterface;
1717
}

‎src/ObserverProcessorInternal.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace ByJG\MicroOrm;
44

5-
use ByJG\AnyDataset\Db\DbDriverInterface;
5+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
66
use ByJG\MicroOrm\Interface\ObserverProcessorInterface;
77

88
class ObserverProcessorInternal

‎src/Query.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace ByJG\MicroOrm;
44

5-
use ByJG\AnyDataset\Db\DbDriverInterface;
5+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
66
use ByJG\AnyDataset\Db\SqlStatement;
77
use ByJG\MicroOrm\Exception\InvalidArgumentException;
88
use Override;
@@ -124,7 +124,7 @@ protected function addForUpdate(?DbDriverInterface $dbDriver, string $sql): stri
124124
throw new InvalidArgumentException('To get FOR UPDATE working you have to pass the DbDriver');
125125
}
126126

127-
return $dbDriver->getDbHelper()->forUpdate($sql);
127+
return $dbDriver->getSqlDialect()->forUpdate($sql);
128128
}
129129

130130
/**
@@ -143,7 +143,7 @@ protected function addTop(?DbDriverInterface $dbDriver, string $sql): string
143143
throw new InvalidArgumentException('To get Limit and Top working you have to pass the DbDriver');
144144
}
145145

146-
return $dbDriver->getDbHelper()->top($sql, $this->top);
146+
return $dbDriver->getSqlDialect()->top($sql, $this->top);
147147
}
148148

149149
/**
@@ -162,7 +162,7 @@ protected function addLimit(?DbDriverInterface $dbDriver, string $sql): string
162162
throw new InvalidArgumentException('To get Limit and Top working you have to pass the DbDriver');
163163
}
164164

165-
return $dbDriver->getDbHelper()->limit($sql, $this->limitStart, $this->limitEnd);
165+
return $dbDriver->getSqlDialect()->limit($sql, $this->limitStart, $this->limitEnd);
166166
}
167167

168168
/**

‎src/QueryBasic.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use ByJG\AnyDataset\Core\GenericIterator;
66
use ByJG\AnyDataset\Db\DatabaseExecutor;
7-
use ByJG\AnyDataset\Db\DbDriverInterface;
7+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
88
use ByJG\AnyDataset\Db\SqlStatement;
99
use ByJG\MicroOrm\Exception\InvalidArgumentException;
1010
use ByJG\MicroOrm\Interface\QueryBuilderInterface;

‎src/QueryRaw.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use ByJG\AnyDataset\Core\GenericIterator;
66
use ByJG\AnyDataset\Db\DatabaseExecutor;
7-
use ByJG\AnyDataset\Db\DbDriverInterface;
7+
use ByJG\AnyDataset\Db\Interfaces\DbDriverInterface;
88
use ByJG\AnyDataset\Db\SqlStatement;
99
use ByJG\MicroOrm\Interface\QueryBuilderInterface;
1010
use Override;

0 commit comments

Comments
 (0)