Skip to content

Commit 66f841a

Browse files
wattnpapawattnpapa
committed
Optimize code / add tests
1 parent 9bba682 commit 66f841a

File tree

2 files changed

+186
-48
lines changed

2 files changed

+186
-48
lines changed

‎src/Snapshot.php

+84-48
Original file line numberDiff line numberDiff line change
@@ -96,71 +96,107 @@ protected function shouldIgnoreLine(string $line): bool
9696

9797
protected function loadStream(?string $connectionName = null): void
9898
{
99-
$directory = (new TemporaryDirectory(config('db-snapshots.temporary_directory_path')))->create();
99+
$temporaryDirectory = (new TemporaryDirectory(config('db-snapshots.temporary_directory_path')))->create();
100100

101+
$this->configureFilesystemDisk($temporaryDirectory->path());
102+
103+
$localDisk = $this->filesystemFactory->disk(self::class);
104+
105+
try {
106+
$this->processStream($localDisk, $connectionName);
107+
} finally {
108+
$temporaryDirectory->delete();
109+
}
110+
}
111+
112+
private function configureFilesystemDisk(string $path): void
113+
{
101114
config([
102115
'filesystems.disks.' . self::class => [
103116
'driver' => 'local',
104-
'root' => $directory->path(),
117+
'root' => $path,
105118
'throw' => false,
106-
]
119+
],
107120
]);
121+
}
108122

109-
$localDisk = $this->filesystemFactory->disk(self::class);
123+
private function processStream($localDisk, ?string $connectionName): void
124+
{
125+
$this->copyStreamToLocalDisk($localDisk);
126+
127+
$stream = $this->openStream($localDisk);
110128

111129
try {
112-
LazyCollection::make(function () use ($localDisk) {
113-
$localDisk->writeStream($this->fileName, $this->disk->readStream($this->fileName));
114-
115-
$stream = $this->compressionExtension === 'gz'
116-
? gzopen($localDisk->path($this->fileName), 'r')
117-
: $localDisk->readStream($this->fileName);
118-
119-
$statement = '';
120-
while (!feof($stream)) {
121-
$chunk = $this->compressionExtension === 'gz'
122-
? gzread($stream, self::STREAM_BUFFER_SIZE)
123-
: fread($stream, self::STREAM_BUFFER_SIZE);
124-
125-
$lines = explode("\n", $chunk);
126-
foreach ($lines as $idx => $line) {
127-
if ($this->shouldIgnoreLine($line)) {
128-
continue;
129-
}
130-
131-
$statement .= $line;
132-
133-
// Carry-over the last line to the next chunk since it
134-
// is possible that this chunk finished mid-line right on
135-
// a semi-colon.
136-
if (count($lines) == $idx + 1) {
137-
break;
138-
}
139-
140-
if (str_ends_with(trim($statement), ';')) {
141-
yield $statement;
142-
$statement = '';
143-
}
144-
}
130+
$this->processStatements($stream, $connectionName);
131+
} finally {
132+
$this->closeStream($stream);
133+
}
134+
}
135+
136+
private function copyStreamToLocalDisk($localDisk): void
137+
{
138+
$localDisk->writeStream($this->fileName, $this->disk->readStream($this->fileName));
139+
}
140+
141+
private function openStream($localDisk)
142+
{
143+
return $this->compressionExtension === 'gz'
144+
? gzopen($localDisk->path($this->fileName), 'r')
145+
: $localDisk->readStream($this->fileName);
146+
}
147+
148+
private function closeStream($stream): void
149+
{
150+
$this->compressionExtension === 'gz' ? gzclose($stream) : fclose($stream);
151+
}
152+
153+
private function processStatements($stream, ?string $connectionName): void
154+
{
155+
$statement = '';
156+
while (!feof($stream)) {
157+
$chunk = $this->readChunk($stream);
158+
$lines = explode("\n", $chunk);
159+
160+
foreach ($lines as $idx => $line) {
161+
if ($this->shouldIgnoreLine($line)) {
162+
continue;
145163
}
146164

147-
if (str_ends_with(trim($statement), ';')) {
148-
yield $statement;
165+
$statement .= $line;
166+
167+
if ($this->isLastLineOfChunk($lines, $idx)) {
168+
break;
149169
}
150170

151-
if ($this->compressionExtension === 'gz') {
152-
gzclose($stream);
153-
} else {
154-
fclose($stream);
171+
if ($this->isCompleteStatement($statement)) {
172+
DB::connection($connectionName)->unprepared($statement);
173+
$statement = '';
155174
}
156-
})->each(function (string $statement) use ($connectionName) {
157-
DB::connection($connectionName)->unprepared($statement);
158-
});
159-
} finally {
160-
$directory->delete();
175+
}
176+
}
177+
178+
if ($this->isCompleteStatement($statement)) {
179+
DB::connection($connectionName)->unprepared($statement);
161180
}
162181
}
163182

183+
private function readChunk($stream): string
184+
{
185+
return $this->compressionExtension === 'gz'
186+
? gzread($stream, self::STREAM_BUFFER_SIZE)
187+
: fread($stream, self::STREAM_BUFFER_SIZE);
188+
}
189+
190+
private function isLastLineOfChunk(array $lines, int $idx): bool
191+
{
192+
return count($lines) === $idx + 1;
193+
}
194+
195+
private function isCompleteStatement(string $statement): bool
196+
{
197+
return str_ends_with(trim($statement), ';');
198+
}
199+
164200
public function delete(): void
165201
{
166202
event(new DeletingSnapshot($this));

‎tests/Commands/LoadTest.php

+102
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
<?php
22

3+
use Carbon\Carbon;
4+
use Illuminate\Filesystem\FilesystemAdapter;
35
use Illuminate\Support\Facades\Artisan;
46
use Illuminate\Support\Facades\DB;
7+
use Illuminate\Support\Facades\Event;
58
use Mockery as m;
69

10+
use Spatie\DbSnapshots\Events\DeletedSnapshot;
11+
use Spatie\DbSnapshots\Snapshot;
712
use function Pest\Laravel\assertDatabaseCount;
813
use function PHPUnit\Framework\assertEquals;
914
use function PHPUnit\Framework\assertNotEquals;
@@ -143,3 +148,100 @@ function getNameOfLoadedSnapshot(): string
143148

144149
assertSnapshotLoaded('snapshot4');
145150
});
151+
152+
it('throws an error when snapshot does not exist', function () {
153+
$this->expectException(Exception::class);
154+
155+
$disk = m::mock(FilesystemAdapter::class);
156+
$disk->shouldReceive('exists')
157+
->with('nonexistent.sql')
158+
->andReturn(false);
159+
160+
$snapshot = new Snapshot($disk, 'nonexistent.sql');
161+
$snapshot->load();
162+
});
163+
164+
it('throws an error for invalid SQL in snapshot', function () {
165+
$disk = m::mock(FilesystemAdapter::class);
166+
$disk->shouldReceive('get')
167+
->andReturn("INVALID SQL;\n");
168+
169+
$snapshot = new Snapshot($disk, 'invalid.sql');
170+
171+
$this->expectException(Exception::class);
172+
$snapshot->load();
173+
});
174+
175+
it('deletes the snapshot and triggers event', function () {
176+
Event::fake();
177+
178+
$disk = m::mock(FilesystemAdapter::class);
179+
$disk->shouldReceive('delete')
180+
->once()
181+
->with('snapshot.sql')
182+
->andReturn(true);
183+
184+
$snapshot = new Snapshot($disk, 'snapshot.sql');
185+
$snapshot->delete();
186+
187+
Event::assertDispatched(DeletedSnapshot::class, function ($event) use ($snapshot) {
188+
return $event->fileName === $snapshot->fileName && $event->disk === $snapshot->disk;
189+
});
190+
});
191+
192+
it('returns the correct size of the snapshot', function () {
193+
$disk = m::mock(FilesystemAdapter::class);
194+
$disk->shouldReceive('size')
195+
->andReturn(2048);
196+
197+
$snapshot = new Snapshot($disk, 'snapshot.sql');
198+
199+
assertEquals(2048, $snapshot->size());
200+
});
201+
202+
it('returns the correct creation date of the snapshot', function () {
203+
$timestamp = Carbon::now()->timestamp;
204+
205+
$disk = m::mock(FilesystemAdapter::class);
206+
$disk->shouldReceive('lastModified')
207+
->andReturn($timestamp);
208+
209+
$snapshot = new Snapshot($disk, 'snapshot.sql');
210+
211+
assertEquals(Carbon::createFromTimestamp($timestamp), $snapshot->createdAt());
212+
});
213+
214+
it('handles empty snapshots gracefully', function () {
215+
$disk = m::mock(FilesystemAdapter::class);
216+
$disk->shouldReceive('get')
217+
->andReturn("");
218+
219+
$snapshot = new Snapshot($disk, 'empty.sql');
220+
221+
$snapshot->load();
222+
223+
// Expect no SQL to be executed
224+
DB::shouldReceive('unprepared')
225+
->never();
226+
});
227+
228+
it('drops all current tables when requested', function () {
229+
$schemaBuilderMock = m::mock();
230+
$schemaBuilderMock->shouldReceive('dropAllTables')
231+
->once();
232+
233+
DB::shouldReceive('connection')
234+
->andReturnSelf();
235+
DB::shouldReceive('getSchemaBuilder')
236+
->andReturn($schemaBuilderMock);
237+
DB::shouldReceive('reconnect')
238+
->once();
239+
240+
$snapshot = new Snapshot(m::mock(FilesystemAdapter::class), 'snapshot.sql');
241+
242+
// Zugriff auf die geschützte Methode mit Reflection
243+
$reflection = new ReflectionMethod(Snapshot::class, 'dropAllCurrentTables');
244+
$reflection->setAccessible(true);
245+
246+
$reflection->invoke($snapshot);
247+
});

0 commit comments

Comments
 (0)