kj/duckbrain
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: kj:ece32b9bbe5ce15245be59d862b353d17c926211
Branches Tags
kj:master
...
compare: kj:master
Branches Tags
kj:master

7 Commits
ece32b9bbe ... master

Author SHA1 Message Date
kj
ce03bdb27d fix(model): Fix postgresql search. 2025-10-27 15:16:54 -03:00
kj
b24598b118 fix(sqlite): Correct base table for RIGHT JOIN conversion 2025-10-27 15:15:45 -03:00
kj
5019b89cc0 docs(readme): Update PostgreSQL compatibility status 2025-10-27 10:27:18 -03:00
kj
d030e8d30e refactor(model)!: Allow groupBy to accept multiple args instead an array 2025-10-27 10:26:12 -03:00
kj
b2672ad92f fix(model): Remove ON clause from cross join 2025-10-27 10:24:25 -03:00
kj
4c57770b43 refactor(model): Remove backticks from column names 2025-10-27 10:23:55 -03:00
kj
8e84450f95 fix(query): Adjust LIMIT OFFSET clause syntax 2025-10-27 10:23:31 -03:00
2 changed files with 54 additions and 58 deletions
Expand all files Collapse all files

80
readme.org
View File

@@ -33,83 +33,85 @@ En la siguiente tabla se encuentra la lista de estados de los gestores de bases
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| method | MySQL/MariaDB | sqlite3 | postgreSQL | | method | MySQL/MariaDB | sqlite3 | postgreSQL |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| db | ok | ok | | | db | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| query | ok | ok | | | query | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| resetQuery | ok | ok | | | resetQuery | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| buildQuery | ok | ok | | | buildQuery | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| getInstance | ok | ok | | | getInstance | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| getVars | ok | ok | | | getVars | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| className | ok | ok | | | className | ok | ok | pk |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| table | ok | ok | | | table | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| update | ok | ok | | | update | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| beginTransaction | ok | ok | | | beginTransaction | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| rollBack | ok | ok | | | rollBack | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| commit | ok | ok | | | commit | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| add | ok | ok | | | add | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| save | ok | ok | | | save | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| delete | ok | ok | | | delete | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| select | ok | ok | | | select | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| from | ok | ok | | | from | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| where | ok | ok | | | where | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| whereIn | ok | ok | | | whereIn | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| whereNotIn | ok | ok | | | whereNotIn | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| whereNull | ok | ok | | | whereNull | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| whereNotNull | ok | ok | | | whereNotNull | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| whereExists | ok | ok | | | whereExists | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| whereNotExists | ok | ok | | | whereNotExists | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| leftJoin | ok | ok | | | leftJoin | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| rightJoin | ok | fixed | | | rightJoin | ok | fixed | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| innerJoin | ok | ok | | | innerJoin | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| and | ok | ok | | | crossJoin | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| or | ok | ok | | | and | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| groupBy | ok | ok | | | or | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| limit | ok | ok | | | groupBy | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| orderBy | ok | ok | | | limit | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| count | ok | ok | | | orderBy | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| getById | ok | ok | | | count | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| search | ok | ok | | | getById | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| get | ok | ok | | | search | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| getFirst | ok | ok | | | get | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| all | ok | ok | | | getFirst | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
| setNull | ok | ok | | | all | ok | ok | ok |
|------------------+---------------+---------+------------|
| setNull | ok | ok | ok |
|------------------+---------------+---------+------------| |------------------+---------------+---------+------------|
* Contacto * Contacto

32
src/Libs/Model.php
View File

@@ -453,7 +453,7 @@ class Model
foreach ($atts as $key => $value) { foreach ($atts as $key => $value) {
if (isset($value)) { if (isset($value)) {
$into[] = "`$key`"; $into[] = "$key";
$values[] = ":$key"; $values[] = ":$key";
static::$queryVars[":$key"] = $value; static::$queryVars[":$key"] = $value;
} }
@@ -822,7 +822,10 @@ class Model
} }
if (static::db()->getAttribute(PDO::ATTR_DRIVER_NAME) == 'sqlite') { if (static::db()->getAttribute(PDO::ATTR_DRIVER_NAME) == 'sqlite') {
return static::leftJoin($table, $columnB, $operatorOrColumnB, $columnA); $currentTable = empty(static::$querySelect['from']) ?
static::table() : static::$querySelect['from'];
static::$querySelect['from'] = $table;
return static::leftJoin($currentTable, $columnB, $operatorOrColumnB, $columnA);
} }
static::$querySelect['rightJoin'] .= ' RIGHT JOIN ' . $table . ' ON ' . "$columnA$operatorOrColumnB$columnB"; static::$querySelect['rightJoin'] .= ' RIGHT JOIN ' . $table . ' ON ' . "$columnA$operatorOrColumnB$columnB";
@@ -884,31 +887,22 @@ class Model
*/ */
public static function crossJoin( public static function crossJoin(
string $table, string $table,
string $columnA,
string $operatorOrColumnB,
?string $columnB = null
): static { ): static {
if (is_null($columnB)) { static::$querySelect['crossJoin'] .= ' CROSS JOIN ' . $table;
$columnB = $operatorOrColumnB;
$operatorOrColumnB = '=';
}
static::$querySelect['crossJoin'] .= ' CROSS JOIN ' . $table . ' ON ' . "$columnA$operatorOrColumnB$columnB";
return new static(); return new static();
} }
/** /**
* Defines GROUP BY in the SQL statement. * Defines GROUP BY in the SQL statement.
* *
* @param array $arr * @param array $columns
* Columns to group by. * Columns to group by.
* *
* @return static * @return static
*/ */
public static function groupBy(array $arr): static public static function groupBy(string ...$columns): static
{ {
static::$querySelect['groupBy'] = join(', ', $arr); static::$querySelect['groupBy'] = join(', ', $columns);
return new static(); return new static();
} }
@@ -928,7 +922,7 @@ class Model
if (is_null($quantity)) { if (is_null($quantity)) {
static::$querySelect['limit'] = $offsetOrQuantity; static::$querySelect['limit'] = $offsetOrQuantity;
} else { } else {
static::$querySelect['limit'] = $offsetOrQuantity . ', ' . $quantity; static::$querySelect['limit'] = $quantity . ' OFFSET ' . $offsetOrQuantity;
} }
return new static(); return new static();
@@ -1046,13 +1040,13 @@ class Model
$search = static::bind($search); $search = static::bind($search);
$where = []; $where = [];
if (static::db()->getAttribute(PDO::ATTR_DRIVER_NAME) == 'sqlite') { if (static::db()->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
foreach ($in as $row) { foreach ($in as $row) {
$where[] = "$row LIKE '%' || $search || '%'"; $where[] = "$row LIKE CONCAT('%', $search, '%')";
} }
} else { } else {
foreach ($in as $row) { foreach ($in as $row) {
$where[] = "$row LIKE CONCAT('%', $search, '%')"; $where[] = "CAST($row AS TEXT) LIKE '%' || $search || '%'";
} }
} }