bit-badger/myPrayerJournal
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 36 Activity

Much work on queries

Browse Source
This commit is contained in:
Daniel J. Summers 2023-08-26 17:18:05 -04:00
parent dc31b65be8
commit 7421f9c788
7 changed files with 66 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/Data.php
View File

@ -17,7 +17,7 @@ class Data
public static function configure() public static function configure()
{ {
Configuration::$connectionString = 'pgsql:host=localhost;port=5432;dbname=leafjson;user=leaf;password=leaf'; Configuration::$connectionString = 'pgsql:host=localhost;port=5432;dbname=leafjson;user=leaf;password=leaf';
//Configuration::$startUp = '\MyPrayerJournal\Data::startUp'; Configuration::$startUp = '\MyPrayerJournal\Data::startUp';
} }
/** /**
@ -103,12 +103,12 @@ class Data
*/ */
private static function getJournalByAnswered(string $userId, string $op): array private static function getJournalByAnswered(string $userId, string $op): array
{ {
$sql = Query::selectFromTable(self::REQ_TABLE) $isAnswered = str_replace(':path',
. ' WHERE ' . Query::whereDataContains('$1') . ' AND ' . Query::whereJsonPathMatches('$2'); "'$.history[*].action ? (@ $op \"" . RequestAction::Answered->name . "\")'",
$params = [ Query::whereJsonPathMatches(':path'));
Query::jsonbDocParam([ 'userId' => $userId ]), $sql = sprintf("%s WHERE %s AND $isAnswered", Query::selectFromTable(self::REQ_TABLE),
'$.history[*].action (@ ' . $op . ' "' . RequestAction::Answered->name . '")' Query::whereDataContains(':criteria'));
]; $params = [ ':criteria' => Query::jsonbDocParam([ 'userId' => $userId ]) ];
return self::mapToJournalRequest( return self::mapToJournalRequest(
Document::customList($sql, $params, Request::class, Document::mapFromJson(...)), true); Document::customList($sql, $params, Request::class, Document::mapFromJson(...)), true);
} }

23
src/app/documents/Configuration.php
View File

@ -3,8 +3,6 @@ declare(strict_types=1);
namespace BitBadger\PgSQL\Documents; namespace BitBadger\PgSQL\Documents;
use \PgSql\Connection;
/** /**
* Document table configuration * Document table configuration
*/ */
@ -16,9 +14,6 @@ class Configuration
/** @var ?\PDO $conn The active connection */ /** @var ?\PDO $conn The active connection */
private static ?\PDO $conn = null; private static ?\PDO $conn = null;
/** @var ?Connection $rawConn An active non-PDO PostgreSQL connection */
private static ?Connection $rawConn = null;
/** @var ?string $startUp The name of a function to run on first connection to the database */ /** @var ?string $startUp The name of a function to run on first connection to the database */
public static ?string $startUp = null; public static ?string $startUp = null;
@ -40,7 +35,7 @@ class Configuration
/** /**
* Get the database connection, connecting on first request * Get the database connection, connecting on first request
* *
* @return PDO The PDO object representing the connection * @return \PDO The PDO object representing the connection
*/ */
public static function getConn(): \PDO public static function getConn(): \PDO
{ {
@ -54,22 +49,6 @@ class Configuration
} }
return self::$conn; return self::$conn;
} }
/**
*
*/
public static function getRawConn(): Connection
{
if (is_null(self::$rawConn)) {
self::ensureConnectionString();
self::$rawConn = pg_connect(str_replace(';', ' ', self::$connectionString));
if (!is_null(self::$startUp)) {
call_user_func(self::$startUp);
}
}
return self::$rawConn;
}
} }
require('functions.php'); require('functions.php');

4
src/app/documents/Definition.php
View File

@ -28,8 +28,8 @@ class Definition
*/ */
public static function createIndex(string $name, DocumentIndex $type): string public static function createIndex(string $name, DocumentIndex $type): string
{ {
$extraOps = $type == DocumentIndex::Full ? "" : " jsonb_path_ops"; $extraOps = $type == DocumentIndex::Full ? '' : ' jsonb_path_ops';
$schemaAndTable = explode(".", $name); $schemaAndTable = explode('.', $name);
$tableName = end($schemaAndTable); $tableName = end($schemaAndTable);
return "CREATE INDEX IF NOT EXISTS idx_$tableName ON $name USING GIN (data$extraOps)"; return "CREATE INDEX IF NOT EXISTS idx_$tableName ON $name USING GIN (data$extraOps)";
} }

83
src/app/documents/Document.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace BitBadger\PgSQL\Documents; namespace BitBadger\PgSQL\Documents;
use PDOStatement; use PDOStatement;
use PgSql\Result;
/** Document manipulation functions */ /** Document manipulation functions */
class Document class Document
@ -12,6 +11,9 @@ class Document
/** JSON Mapper instance to use for creating a domain type instance from a document */ /** JSON Mapper instance to use for creating a domain type instance from a document */
private static ?\JsonMapper $mapper = null; private static ?\JsonMapper $mapper = null;
/** Attribute that prevents PDO from attempting its own PREPARE on a query */
private const NO_PREPARE = [ \PDO::ATTR_EMULATE_PREPARES => false ];
/** /**
* Map a domain type from the JSON document retrieved * Map a domain type from the JSON document retrieved
* *
@ -52,9 +54,9 @@ class Document
*/ */
private static function executeNonQuery(string $query, string $docId, array|object $document) private static function executeNonQuery(string $query, string $docId, array|object $document)
{ {
$nonQuery = pdo()->prepare($query); $nonQuery = pdo()->prepare($query, self::NO_PREPARE);
$nonQuery->bindParam('@id', $docId); $nonQuery->bindParam(':id', $docId);
$nonQuery->bindParam('@data', Query::jsonbDocParam($document)); $nonQuery->bindParam(':data', Query::jsonbDocParam($document));
$nonQuery->execute(); $nonQuery->execute();
} }
@ -103,8 +105,8 @@ class Document
*/ */
public static function countByContains(string $tableName, array|object $criteria): int public static function countByContains(string $tableName, array|object $criteria): int
{ {
$query = pdo()->prepare(Query::countByContains($tableName)); $query = pdo()->prepare(Query::countByContains($tableName), self::NO_PREPARE);
$query->bindParam('@criteria', Query::jsonbDocParam($criteria)); $query->bindParam(':criteria', Query::jsonbDocParam($criteria));
$query->execute(); $query->execute();
$result = $query->fetch(\PDO::FETCH_ASSOC); $result = $query->fetch(\PDO::FETCH_ASSOC);
return intval($result['it']); return intval($result['it']);
@ -119,8 +121,8 @@ class Document
*/ */
public static function countByJsonPath(string $tableName, string $jsonPath): int public static function countByJsonPath(string $tableName, string $jsonPath): int
{ {
$query = pdo()->prepare(Query::countByContains($tableName)); $query = pdo()->prepare(Query::countByContains($tableName), self::NO_PREPARE);
$query->bindParam('@path', $jsonPath); $query->bindParam(':path', $jsonPath);
$query->execute(); $query->execute();
$result = $query->fetch(\PDO::FETCH_ASSOC); $result = $query->fetch(\PDO::FETCH_ASSOC);
return intval($result['it']); return intval($result['it']);
@ -135,8 +137,8 @@ class Document
*/ */
public static function existsById(string $tableName, string $docId): bool public static function existsById(string $tableName, string $docId): bool
{ {
$query = pdo()->prepare(Query::existsById($tableName)); $query = pdo()->prepare(Query::existsById($tableName), self::NO_PREPARE);
$query->bindParam('@id', $docId); $query->bindParam(':id', $docId);
$query->execute(); $query->execute();
$result = $query->fetch(\PDO::FETCH_ASSOC); $result = $query->fetch(\PDO::FETCH_ASSOC);
return boolval($result['it']); return boolval($result['it']);
@ -151,8 +153,8 @@ class Document
*/ */
public static function existsByContains(string $tableName, array|object $criteria): bool public static function existsByContains(string $tableName, array|object $criteria): bool
{ {
$query = pdo()->prepare(Query::existsByContains($tableName)); $query = pdo()->prepare(Query::existsByContains($tableName), self::NO_PREPARE);
$query->bindParam('@criteria', Query::jsonbDocParam($criteria)); $query->bindParam(':criteria', Query::jsonbDocParam($criteria));
$query->execute(); $query->execute();
$result = $query->fetch(\PDO::FETCH_ASSOC); $result = $query->fetch(\PDO::FETCH_ASSOC);
return boolval($result['it']); return boolval($result['it']);
@ -167,8 +169,8 @@ class Document
*/ */
public static function existsByJsonPath(string $tableName, string $jsonPath): bool public static function existsByJsonPath(string $tableName, string $jsonPath): bool
{ {
$query = pdo()->prepare(Query::existsByJsonPath($tableName)); $query = pdo()->prepare(Query::existsByJsonPath($tableName), self::NO_PREPARE);
$query->bindParam('@path', $jsonPath); $query->bindParam(':path', $jsonPath);
$query->execute(); $query->execute();
$result = $query->fetch(\PDO::FETCH_ASSOC); $result = $query->fetch(\PDO::FETCH_ASSOC);
return boolval($result['it']); return boolval($result['it']);
@ -208,7 +210,7 @@ class Document
*/ */
public static function findById(string $tableName, string $docId, string $className): mixed public static function findById(string $tableName, string $docId, string $className): mixed
{ {
$query = pdo()->prepare(Query::findById($tableName)); $query = pdo()->prepare(Query::findById($tableName), self::NO_PREPARE);
$query->bindParam(':id', $docId); $query->bindParam(':id', $docId);
$query->execute(); $query->execute();
$result = $query->fetch(\PDO::FETCH_ASSOC); $result = $query->fetch(\PDO::FETCH_ASSOC);
@ -224,8 +226,8 @@ class Document
*/ */
private static function queryByContains(string $tableName, array|object $criteria): \PDOStatement private static function queryByContains(string $tableName, array|object $criteria): \PDOStatement
{ {
$query = pdo()->prepare(Query::findByContains($tableName)); $query = pdo()->prepare(Query::findByContains($tableName), self::NO_PREPARE);
$query->bindParam('@criteria', Query::jsonbDocParam($criteria)); $query->bindParam(':criteria', Query::jsonbDocParam($criteria));
$query->execute(); $query->execute();
return $query; return $query;
} }
@ -267,8 +269,8 @@ class Document
*/ */
private static function queryByJsonPath(string $tableName, string $jsonPath): \PDOStatement private static function queryByJsonPath(string $tableName, string $jsonPath): \PDOStatement
{ {
$query = pdo()->prepare(Query::findByJsonPath($tableName)); $query = pdo()->prepare(Query::findByJsonPath($tableName), self::NO_PREPARE);
$query->bindParam('@path', $jsonPath); $query->bindParam(':path', $jsonPath);
$query->execute(); $query->execute();
return $query; return $query;
} }
@ -334,9 +336,9 @@ class Document
*/ */
public static function updatePartialByContains(string $tableName, array|object $criteria, array|object $document) public static function updatePartialByContains(string $tableName, array|object $criteria, array|object $document)
{ {
$query = pdo()->prepare(Query::updatePartialByContains($tableName)); $query = pdo()->prepare(Query::updatePartialByContains($tableName), self::NO_PREPARE);
$query->bindParam('@data', Query::jsonbDocParam($document)); $query->bindParam(':data', Query::jsonbDocParam($document));
$query->bindParam('@criteria', Query::jsonbDocParam($criteria)); $query->bindParam(':criteria', Query::jsonbDocParam($criteria));
$query->execute(); $query->execute();
} }
@ -349,9 +351,9 @@ class Document
*/ */
public static function updatePartialByJsonPath(string $tableName, string $jsonPath, array|object $document) public static function updatePartialByJsonPath(string $tableName, string $jsonPath, array|object $document)
{ {
$query = pdo()->prepare(Query::updatePartialByContains($tableName)); $query = pdo()->prepare(Query::updatePartialByContains($tableName), self::NO_PREPARE);
$query->bindParam('@data', Query::jsonbDocParam($document)); $query->bindParam(':data', Query::jsonbDocParam($document));
$query->bindParam('@path', $jsonPath); $query->bindParam(':path', $jsonPath);
$query->execute(); $query->execute();
} }
@ -374,8 +376,8 @@ class Document
*/ */
public static function deleteByContains(string $tableName, array|object $criteria) public static function deleteByContains(string $tableName, array|object $criteria)
{ {
$query = pdo()->prepare(Query::deleteByContains($tableName)); $query = pdo()->prepare(Query::deleteByContains($tableName), self::NO_PREPARE);
$query->bindParam('@criteria', Query::jsonbDocParam($criteria)); $query->bindParam(':criteria', Query::jsonbDocParam($criteria));
$query->execute(); $query->execute();
} }
@ -387,8 +389,8 @@ class Document
*/ */
public static function deleteByJsonPath(string $tableName, string $jsonPath) public static function deleteByJsonPath(string $tableName, string $jsonPath)
{ {
$query = pdo()->prepare(Query::deleteByJsonPath($tableName)); $query = pdo()->prepare(Query::deleteByJsonPath($tableName), self::NO_PREPARE);
$query->bindParam('@path', $jsonPath); $query->bindParam(':path', $jsonPath);
$query->execute(); $query->execute();
} }
@ -403,16 +405,8 @@ class Document
*/ */
private static function createCustomQuery(string $sql, array $params): PDOStatement private static function createCustomQuery(string $sql, array $params): PDOStatement
{ {
$result = pg_query_params(pgconn(), $sql, $params); $query = pdo()->prepare($sql, self::NO_PREPARE);
echo "Preparing statement for $sql\n"; array_walk($params, fn ($value, $name) => $query->bindParam($name, $value));
foreach ($params as $name => $value) {
echo "Binding $name to $value\n";
}
$query = pdo()->prepare($sql);
foreach ($params as $name => $value) {
echo "Binding $name to $value\n";
$query->bindParam($name, $value);
}
$query->execute(); $query->execute();
return $query; return $query;
} }
@ -428,14 +422,9 @@ class Document
*/ */
public static function customList(string $sql, array $params, string $className, callable $mapFunc): array public static function customList(string $sql, array $params, string $className, callable $mapFunc): array
{ {
$data = pg_query_params(pgconn(), $sql, $params); return array_map(
$result = []; fn ($it) => $mapFunc($it, $className),
if (!$data) return $result; Document::createCustomQuery($sql, $params)->fetchAll(\PDO::FETCH_ASSOC));
while ($row = pg_fetch_array($data, mode: PGSQL_ASSOC)) {
array_push($result, $mapFunc($row, $className));
}
pg_free_result($data);
return $result;
} }
/** /**

38
src/app/documents/Query.php
View File

@ -25,7 +25,7 @@ class Query
*/ */
public static function whereDataContains(string $paramName): string public static function whereDataContains(string $paramName): string
{ {
return "data @> $paramName"; return "data @> $paramName::jsonb";
} }
/** /**
@ -36,7 +36,7 @@ class Query
*/ */
public static function whereJsonPathMatches(string $paramName): string public static function whereJsonPathMatches(string $paramName): string
{ {
return "data @? {$paramName}::jsonpath"; return "data @?? {$paramName}::jsonpath";
} }
/** /**
@ -62,7 +62,7 @@ class Query
*/ */
public static function insert(string $tableName): string public static function insert(string $tableName): string
{ {
return "INSERT INTO $tableName (id, data) VALUES (@id, @data)"; return "INSERT INTO $tableName (id, data) VALUES (:id, :data)";
} }
/** /**
@ -73,7 +73,7 @@ class Query
*/ */
public static function save(string $tableName): string public static function save(string $tableName): string
{ {
return "INSERT INTO $tableName (id, data) VALUES (@id, @data) return "INSERT INTO $tableName (id, data) VALUES (:id, :data)
ON CONFLICT (id) DO UPDATE SET data = EXCLUDED.data"; ON CONFLICT (id) DO UPDATE SET data = EXCLUDED.data";
} }
@ -96,7 +96,7 @@ class Query
*/ */
public static function countByContains(string $tableName): string public static function countByContains(string $tableName): string
{ {
return "SELECT COUNT(*) AS it FROM $tableName WHERE " . self::whereDataContains('@criteria'); return sprintf("SELECT COUNT(*) AS it FROM $tableName WHERE %s", self::whereDataContains(':criteria'));
} }
/** /**
@ -107,7 +107,7 @@ class Query
*/ */
public static function countByJsonPath(string $tableName): string public static function countByJsonPath(string $tableName): string
{ {
return "SELECT COUNT(*) AS it FROM $tableName WHERE " . self::whereJsonPathMatches('@path'); return sprintf("SELECT COUNT(*) AS it FROM $tableName WHERE %s", self::whereJsonPathMatches(':path'));
} }
/** /**
@ -118,7 +118,7 @@ class Query
*/ */
public static function existsById(string $tableName): string public static function existsById(string $tableName): string
{ {
return "SELECT EXISTS (SELECT 1 FROM $tableName WHERE id = @id) AS it"; return "SELECT EXISTS (SELECT 1 FROM $tableName WHERE id = :id) AS it";
} }
/** /**
@ -129,7 +129,7 @@ class Query
*/ */
public static function existsByContains(string $tableName): string public static function existsByContains(string $tableName): string
{ {
return "SELECT EXISTS (SELECT 1 FROM $tableName WHERE " . self::whereDataContains('@criteria') . ' AS it'; return sprintf("SELECT EXISTS (SELECT 1 FROM $tableName WHERE %s AS it", self::whereDataContains(':criteria'));
} }
/** /**
@ -140,7 +140,7 @@ class Query
*/ */
public static function existsByJsonPath(string $tableName): string public static function existsByJsonPath(string $tableName): string
{ {
return "SELECT EXISTS (SELECT 1 FROM $tableName WHERE " . self::whereJsonPathMatches('@path') . ' AS it'; return sprintf("SELECT EXISTS (SELECT 1 FROM $tableName WHERE %s AS it", self::whereJsonPathMatches(':path'));
} }
/** /**
@ -151,7 +151,7 @@ class Query
*/ */
public static function findById(string $tableName): string public static function findById(string $tableName): string
{ {
return self::selectFromTable($tableName) . ' WHERE id = :id'; return sprintf('%s WHERE id = :id', self::selectFromTable($tableName));
} }
/** /**
@ -162,7 +162,7 @@ class Query
*/ */
public static function findByContains(string $tableName): string public static function findByContains(string $tableName): string
{ {
return self::selectFromTable($tableName) . ' WHERE ' . self::whereDataContains('@criteria'); return sprintf('%s WHERE %s', self::selectFromTable($tableName), self::whereDataContains(':criteria'));
} }
/** /**
@ -173,7 +173,7 @@ class Query
*/ */
public static function findByJsonPath(string $tableName): string public static function findByJsonPath(string $tableName): string
{ {
return self::selectFromTable($tableName) . ' WHERE ' . self::whereJsonPathMatches('@path'); return sprintf('%s WHERE %s', self::selectFromTable($tableName), self::whereJsonPathMatches(':path'));
} }
/** /**
@ -184,7 +184,7 @@ class Query
*/ */
public static function updateFull(string $tableName): string public static function updateFull(string $tableName): string
{ {
return "UPDATE $tableName SET data = @data WHERE id = @id"; return "UPDATE $tableName SET data = :data WHERE id = :id";
} }
/** /**
@ -195,7 +195,7 @@ class Query
*/ */
public static function updatePartialById(string $tableName): string public static function updatePartialById(string $tableName): string
{ {
return "UPDATE $tableName SET data = data || @data WHERE id = @id"; return "UPDATE $tableName SET data = data || :data WHERE id = :id";
} }
/** /**
@ -206,7 +206,7 @@ class Query
*/ */
public static function updatePartialByContains(string $tableName): string public static function updatePartialByContains(string $tableName): string
{ {
return "UPDATE $tableName SET data = data || @data WHERE " . self::whereDataContains('@criteria'); return sprintf("UPDATE $tableName SET data = data || :data WHERE %s", self::whereDataContains(':criteria'));
} }
/** /**
@ -217,7 +217,7 @@ class Query
*/ */
public static function updatePartialByJsonPath(string $tableName): string public static function updatePartialByJsonPath(string $tableName): string
{ {
return "UPDATE $tableName SET data = data || @data WHERE " . self::whereJsonPathMatches('@path'); return sprintf("UPDATE $tableName SET data = data || :data WHERE %s", self::whereJsonPathMatches(':path'));
} }
/** /**
@ -228,7 +228,7 @@ class Query
*/ */
public static function deleteById(string $tableName): string public static function deleteById(string $tableName): string
{ {
return "DELETE FROM $tableName WHERE id = @id"; return "DELETE FROM $tableName WHERE id = :id";
} }
/** /**
@ -239,7 +239,7 @@ class Query
*/ */
public static function deleteByContains(string $tableName): string public static function deleteByContains(string $tableName): string
{ {
return "DELETE FROM $tableName WHERE " . self::whereDataContains('@criteria'); return sprintf("DELETE FROM $tableName WHERE %s", self::whereDataContains(':criteria'));
} }
/** /**
@ -250,6 +250,6 @@ class Query
*/ */
public static function deleteByJsonPath(string $tableName): string public static function deleteByJsonPath(string $tableName): string
{ {
return "DELETE FROM $tableName WHERE " . self::whereJsonPathMatches('@path'); return sprintf("DELETE FROM $tableName WHERE %s", self::whereJsonPathMatches(':path'));
} }
} }

11
src/app/documents/functions.php
View File

@ -13,14 +13,3 @@ if (!function_exists('pdo')) {
return Configuration::getConn(); return Configuration::getConn();
} }
} }
if (!function_exists('pgconn')) {
/**
* Return the active PostgreSQL connection
*
* @return \PgSql\Connection The open PostgreSQL connection
*/
function pgconn()
{
return Configuration::getRawConn();
}
}

8
src/app/index.php
View File

@ -5,10 +5,6 @@ require __DIR__ . '/vendor/autoload.php';
use MyPrayerJournal\Data; use MyPrayerJournal\Data;
Data::configure(); Data::configure();
//Data::findFullRequestById('abc', 'def');
//echo "Returned from req\n";
//Data::getAnsweredRequests('abc');
app()->template->config('path', './pages'); app()->template->config('path', './pages');
app()->template->config('params', [ app()->template->config('params', [
@ -37,10 +33,8 @@ function renderPage(string $template, array $params, string $pageTitle)
response()->markup(app()->template->render('layout/full', $params)); response()->markup(app()->template->render('layout/full', $params));
} }
Data::getAnsweredRequests('abc');
app()->get('/', function () { app()->get('/', function () {
phpinfo(); renderPage('home', [], 'Welcome');
//renderPage('home', [], 'Welcome');
}); });
app()->get('/legal/privacy-policy', function () { app()->get('/legal/privacy-policy', function () {