Compare commits

..

No commits in common. "stable" and "3.2.0" have entirely different histories.

2 changed files with 65 additions and 104 deletions

View File

@ -368,13 +368,8 @@ class database
* *
* @return array|null Readed records * @return array|null Readed records
*/ */
public function read( public function read(?callable $filter = null, ?callable $update = null, bool $delete = false, int $amount = 1, int $offset = 0): ?array
?callable $filter = null, {
?callable $update = null,
bool $delete = false,
int $amount = 1,
int $offset = 0
): ?array {
// Opening the database file // Opening the database file
$file = fopen($this->database, 'c+b'); $file = fopen($this->database, 'c+b');
@ -490,25 +485,6 @@ class database
return null; return null;
} }
/**
* Count
*
* @throws exception_runtime If the database is corrupted (counting result is float)
*
* @return int Amount of records
*/
public function count(): int
{
// Deleting the database file cache
clearstatcache(true, $this->database);
// Counting
$amount = $this->length > 0 && file_exists($this->database) ? filesize($this->database) / $this->length : 0;
// Exit (success/fail)
return is_int($amount) ? $amount : throw new exception_runtime('The database is corrupted');
}
/** /**
* Backups * Backups
* *

View File

@ -1,7 +1,5 @@
<?php <?php
declare(strict_types=1);
use mirzaev\baza\database, use mirzaev\baza\database,
mirzaev\baza\record, mirzaev\baza\record,
mirzaev\baza\column, mirzaev\baza\column,
@ -9,24 +7,11 @@ use mirzaev\baza\database,
mirzaev\baza\enumerations\type; mirzaev\baza\enumerations\type;
// Initializing path to the composer loader file (main project) // Initializing path to the composer loader file (main project)
$autoload = $autoload = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
__DIR__ . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR .
'vendor' . DIRECTORY_SEPARATOR .
'autoload.php';
// Reinitializing path to the composer loaded file (depencendy project) // Reinitializing path to the composer loaded file (depencendy project)
if (!file_exists($autoload)) if (!file_exists($autoload))
$autoload = $autoload = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'autoload.php';
__DIR__ . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR .
'autoload.php';
// Importing files of thr project and dependencies // Importing files of thr project and dependencies
require($autoload); require($autoload);