Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SQLite support has been added #42

Merged
merged 5 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Release Notes

## [v2.2.0](https://github.com/lapaliv/laravel-bulk-upsert/compare/2.1.1...2.2.0) - 2023-12-10

* SQLite support has been added. in https://github.com/lapaliv/laravel-bulk-upsert/pull/41
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ The documentation for version 1.x you can see [here](https://github.com/lapaliv/
- Database:
- MySQL: __5.7+__
- PostgreSQL __9.6+__
- SQLite __3.32+__
- PHP: __8.0+__
- Laravel: __8.0+__

Expand Down Expand Up @@ -768,8 +769,8 @@ class BulkRow {
* Bulk touching
* Bulk updating without updating timestamps
* Supporting `DB::raw()` as a value
* Supporting `SQLite`
* Support a custom database driver
* Update rows and return the number of updated ones

### Tests

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* @internal
*/
class MySqlDriverDelete
class MySqlDriverDeleteFeature
{
public function __construct(private MixedValueToSqlConverter $mixedValueToSqlConverter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* @internal
*/
class MySqlDriverInsertWithResult
class MySqlDriverInsertWithResultFeature
{
public function __construct(
private MixedValueToSqlConverter $mixedValueToSqlConverter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/**
* @internal
*/
class MySqlDriverQuietInsert
class MySqlDriverQuietInsertFeature
{
public function __construct(
private MixedValueToSqlConverter $mixedValueToSqlConverter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* @internal
*/
class MySqlDriverUpdate
class MySqlDriverUpdateFeature
{
public function __construct(private MixedValueToSqlConverter $mixedValueToSqlConverter)
{
Expand Down
24 changes: 12 additions & 12 deletions src/Drivers/MySqlBulkDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
use Lapaliv\BulkUpsert\Builders\UpdateBulkBuilder;
use Lapaliv\BulkUpsert\Contracts\BulkDriver;
use Lapaliv\BulkUpsert\Contracts\BulkInsertResult;
use Lapaliv\BulkUpsert\Drivers\MySql\MySqlDriverDelete;
use Lapaliv\BulkUpsert\Drivers\MySql\MySqlDriverInsertWithResult;
use Lapaliv\BulkUpsert\Drivers\MySql\MySqlDriverQuietInsert;
use Lapaliv\BulkUpsert\Drivers\MySql\MySqlDriverUpdate;
use Lapaliv\BulkUpsert\Drivers\MySql\MySqlDriverDeleteFeature;
use Lapaliv\BulkUpsert\Drivers\MySql\MySqlDriverInsertWithResultFeature;
use Lapaliv\BulkUpsert\Drivers\MySql\MySqlDriverQuietInsertFeature;
use Lapaliv\BulkUpsert\Drivers\MySql\MySqlDriverUpdateFeature;
use Throwable;

/**
Expand All @@ -20,10 +20,10 @@
class MySqlBulkDriver implements BulkDriver
{
public function __construct(
private MySqlDriverInsertWithResult $insertWithResult,
private MySqlDriverQuietInsert $quietInsert,
private MySqlDriverUpdate $update,
private MySqlDriverDelete $delete,
private MySqlDriverInsertWithResultFeature $insertWithResultFeature,
private MySqlDriverQuietInsertFeature $quietInsertFeature,
private MySqlDriverUpdateFeature $updateFeature,
private MySqlDriverDeleteFeature $deleteFeature,
) {
//
}
Expand All @@ -36,27 +36,27 @@ public function insertWithResult(
InsertBuilder $builder,
?string $primaryKeyName,
): BulkInsertResult {
return $this->insertWithResult->handle($connection, $builder, $primaryKeyName);
return $this->insertWithResultFeature->handle($connection, $builder, $primaryKeyName);
}

/**
* @throws Throwable
*/
public function quietInsert(ConnectionInterface $connection, InsertBuilder $builder): void
{
$this->quietInsert->handle($connection, $builder);
$this->quietInsertFeature->handle($connection, $builder);
}

/**
* @throws Throwable
*/
public function update(ConnectionInterface $connection, UpdateBulkBuilder $builder): int
{
return $this->update->handle($connection, $builder);
return $this->updateFeature->handle($connection, $builder);
}

public function forceDelete(ConnectionInterface $connection, DeleteBulkBuilder $builder): int
{
return $this->delete->handle($connection, $builder);
return $this->deleteFeature->handle($connection, $builder);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* @internal
*/
class PostgreSqlDriverDelete
class PostgreSqlDriverDeleteFeature
{
public function __construct(private MixedValueToSqlConverter $mixedValueToSqlConverter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
use Lapaliv\BulkUpsert\Entities\BulkPostgreSqlInsertResult;
use Lapaliv\BulkUpsert\Grammars\PostgreSqlGrammar;

class PostgreSqlDriverInsertWithResult
/**
* @internal
*/
class PostgreSqlDriverInsertWithResultFeature
{
public function __construct(
private MixedValueToSqlConverter $mixedValueToSqlConverter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
use Lapaliv\BulkUpsert\Converters\MixedValueToSqlConverter;
use Lapaliv\BulkUpsert\Grammars\PostgreSqlGrammar;

class PostgreSqlDriverQuietInsert
/**
* @internal
*/
class PostgreSqlDriverQuietInsertFeature
{
public function __construct(
private MixedValueToSqlConverter $mixedValueToSqlConverter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* @internal
*/
class PostgreSqlDriverUpdate
class PostgreSqlDriverUpdateFeature
{
public function __construct(private MixedValueToSqlConverter $mixedValueToSqlConverter)
{
Expand Down
24 changes: 12 additions & 12 deletions src/Drivers/PostgreSqlBulkDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
use Lapaliv\BulkUpsert\Builders\UpdateBulkBuilder;
use Lapaliv\BulkUpsert\Contracts\BulkDriver;
use Lapaliv\BulkUpsert\Contracts\BulkInsertResult;
use Lapaliv\BulkUpsert\Drivers\PostgreSql\PostgreSqlDriverDelete;
use Lapaliv\BulkUpsert\Drivers\PostgreSql\PostgreSqlDriverInsertWithResult;
use Lapaliv\BulkUpsert\Drivers\PostgreSql\PostgreSqlDriverQuietInsert;
use Lapaliv\BulkUpsert\Drivers\PostgreSql\PostgreSqlDriverUpdate;
use Lapaliv\BulkUpsert\Drivers\PostgreSql\PostgreSqlDriverDeleteFeature;
use Lapaliv\BulkUpsert\Drivers\PostgreSql\PostgreSqlDriverInsertWithResultFeature;
use Lapaliv\BulkUpsert\Drivers\PostgreSql\PostgreSqlDriverQuietInsertFeature;
use Lapaliv\BulkUpsert\Drivers\PostgreSql\PostgreSqlDriverUpdateFeature;

class PostgreSqlBulkDriver implements BulkDriver
{
public function __construct(
private PostgreSqlDriverInsertWithResult $insertWithResult,
private PostgreSqlDriverQuietInsert $quietInsert,
private PostgreSqlDriverUpdate $update,
private PostgreSqlDriverDelete $delete,
private PostgreSqlDriverInsertWithResultFeature $insertWithResultFeature,
private PostgreSqlDriverQuietInsertFeature $quietInsertFeature,
private PostgreSqlDriverUpdateFeature $updateFeature,
private PostgreSqlDriverDeleteFeature $deleteFeature,
) {
//
}
Expand All @@ -29,21 +29,21 @@ public function insertWithResult(
InsertBuilder $builder,
?string $primaryKeyName,
): BulkInsertResult {
return $this->insertWithResult->handle($connection, $builder);
return $this->insertWithResultFeature->handle($connection, $builder);
}

public function quietInsert(ConnectionInterface $connection, InsertBuilder $builder): void
{
$this->quietInsert->handle($connection, $builder);
$this->quietInsertFeature->handle($connection, $builder);
}

public function update(ConnectionInterface $connection, UpdateBulkBuilder $builder): int
{
return $this->update->handle($connection, $builder);
return $this->updateFeature->handle($connection, $builder);
}

public function forceDelete(ConnectionInterface $connection, DeleteBulkBuilder $builder): int
{
return $this->delete->handle($connection, $builder);
return $this->deleteFeature->handle($connection, $builder);
}
}
33 changes: 33 additions & 0 deletions src/Drivers/SqLite/SqLiteDriverForceDeleteFeature.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace Lapaliv\BulkUpsert\Drivers\SqLite;

use Illuminate\Database\ConnectionInterface;
use Lapaliv\BulkUpsert\Builders\DeleteBulkBuilder;
use Lapaliv\BulkUpsert\Converters\MixedValueToSqlConverter;
use Lapaliv\BulkUpsert\Grammars\SqLiteGrammar;

/**
* @internal
*/
class SqLiteDriverForceDeleteFeature
{
public function __construct(
private MixedValueToSqlConverter $mixedValueToSqlConverter,
) {
//
}

public function handle(
ConnectionInterface $connection,
DeleteBulkBuilder $builder,
): int {
$grammar = new SqLiteGrammar($this->mixedValueToSqlConverter);

$result = $connection->delete($grammar->delete($builder), $grammar->getBindings());

unset($grammar);

return $result;
}
}
51 changes: 51 additions & 0 deletions src/Drivers/SqLite/SqLiteDriverInsertWithResultFeature.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?php

namespace Lapaliv\BulkUpsert\Drivers\SqLite;

use Illuminate\Database\ConnectionInterface;
use Lapaliv\BulkUpsert\Builders\InsertBuilder;
use Lapaliv\BulkUpsert\Converters\MixedValueToSqlConverter;
use Lapaliv\BulkUpsert\Entities\BulkSqLiteInsertResult;
use Lapaliv\BulkUpsert\Grammars\SqLiteGrammar;

class SqLiteDriverInsertWithResultFeature
{
public function __construct(
private MixedValueToSqlConverter $mixedValueToSqlConverter,
) {
//
}

public function handle(
ConnectionInterface $connection,
InsertBuilder $builder,
?string $primaryKeyName,
): BulkSqLiteInsertResult {
$lastPrimaryBeforeInserting = null;

if ($primaryKeyName !== null) {
$lastRow = $connection->selectOne(
sprintf(
'select max(%s) as id from %s',
$primaryKeyName,
$builder->getInto()
)
);

$lastPrimaryBeforeInserting = $lastRow->id ?? 0;
}

$grammar = new SqLiteGrammar($this->mixedValueToSqlConverter);
$sql = $grammar->insert($builder);
$bindings = $grammar->getBindings();
$connection->insert($sql, $bindings);

unset($grammar);

return new BulkSqLiteInsertResult(
is_numeric($lastPrimaryBeforeInserting)
? (int) $lastPrimaryBeforeInserting
: null
);
}
}
33 changes: 33 additions & 0 deletions src/Drivers/SqLite/SqLiteDriverQuietInsertFeature.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

/** @noinspection PhpPluralMixedCanBeReplacedWithArrayInspection */

/** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */

namespace Lapaliv\BulkUpsert\Drivers\SqLite;

use Illuminate\Database\ConnectionInterface;
use Lapaliv\BulkUpsert\Builders\InsertBuilder;
use Lapaliv\BulkUpsert\Converters\MixedValueToSqlConverter;
use Lapaliv\BulkUpsert\Grammars\SqLiteGrammar;

/**
* @internal
*/
class SqLiteDriverQuietInsertFeature
{
public function __construct(
private MixedValueToSqlConverter $mixedValueToSqlConverter,
) {
//
}

public function handle(ConnectionInterface $connection, InsertBuilder $builder): void
{
$grammar = new SqLiteGrammar($this->mixedValueToSqlConverter);

$connection->insert($grammar->insert($builder), $grammar->getBindings());

unset($grammar);
}
}
33 changes: 33 additions & 0 deletions src/Drivers/SqLite/SqLiteDriverUpdateFeature.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace Lapaliv\BulkUpsert\Drivers\SqLite;

use Illuminate\Database\ConnectionInterface;
use Lapaliv\BulkUpsert\Builders\UpdateBulkBuilder;
use Lapaliv\BulkUpsert\Converters\MixedValueToSqlConverter;
use Lapaliv\BulkUpsert\Grammars\SqLiteGrammar;

/**
* @internal
*/
class SqLiteDriverUpdateFeature
{
public function __construct(
private MixedValueToSqlConverter $mixedValueToSqlConverter
) {
//
}

public function handle(
ConnectionInterface $connection,
UpdateBulkBuilder $builder,
): int {
$grammar = new SqLiteGrammar($this->mixedValueToSqlConverter);

$result = $connection->update($grammar->update($builder), $grammar->getBindings());

unset($grammar);

return $result;
}
}
Loading
Loading