Skip to content

Поддерживаем в условиях для orm массивы #119

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.

Sign up for GitHub

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

Merged
unhandled-exception merged 1 commit into from
Feb 11, 2025
Merged

Поддерживаем в условиях для orm массивы #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions lib/sql/models/sql_table.p
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ pfClass
^if($aField is string){
$aField[$self._fields.[$aField]]
}
$result[^self._builder.array[$aField;$aValues;$aOptions $.valueFunction[$self.fieldValue]]]
$result[^self._builder.array[$aField;$aValues;^hash::create[$aOptions] $.valueFunction[$self.fieldValue]]]

@sqlFieldName[aFieldName]
^self.assert(^self._fields.contains[$aFieldName]){Неизвестное поле «${aFieldName}».}
Expand Down Expand Up @@ -737,8 +737,8 @@ pfClass
}(^self._plurals.contains[$match.1]
|| (^self._fields.contains[$match.1] && ($match.2 eq "in" || $match.2 eq "!in"))
){
# $.[field [!]in][hash|table|values string]
# $.[plural [not]][hash|table|values string]
# $.[field [!]in][hash|table|array[hash or string value]|values string]
# $.[plural [not]][hash|table|array[hash or string value]|values string]
$lRes.[^lRes._count[]][^self._condArrayField[$aConds;$match.1;^match.2.lower[];$v]]
}($match.1 eq "OR" || $match.1 eq "AND" || $match.1 eq "NOT"){
# Рекурсивный вызов логического блока
Expand Down Expand Up @@ -1188,8 +1188,8 @@ pfClass

@array[aField;aValue;aOptions]
## Строит массив значений
## aValue[table|hash|csv-string]
## aOptions.column[$aField.name] — имя колонки в таблице
## aValue[table|hash|array|csv-string]
## aOptions.column[$aField.name] — имя колонки в таблице или массиве
## aOptions.emptyValue[null] — значение массива, если в aValue нет данных
## aOptions.valueFunction[fieldValue] — функция форматирования значения поля
^self.cleanMethodArgument[]
Expand All @@ -1198,14 +1198,21 @@ pfClass
$lEmptyValue[^if(^aOptions.contains[emptyValue]){$aOptions.emptyValue}{null}]
$lColumn[^if(def $aOptions.column){$aOptions.column}{$aField.name}]
^switch(true){
^case($aValue is hash){$result[^aValue.foreach[k;_]{^lValueFunction[$aField;$k]}[, ]]}
^case($aValue is table){$result[^aValue.menu{^lValueFunction[$aField;$aValue.[$lColumn]]}[, ]]}
^case($aValue is hash){
$result[^aValue.foreach[k;]{^lValueFunction[$aField;$k]}[, ]]
}
^case($aValue is table){
$result[^aValue.menu{^lValueFunction[$aField;$aValue.[$lColumn]]}[, ]]
}
^case($aValue is array){
$result[^aValue.foreach[;v]{^if($v is hash){^lValueFunction[$aField;$v.[$lColumn]]}{^lValueFunction[$aField;$v]}}[, ]]
}
^case($aValue is string){
$lItems[^self._parseCSVString[$aValue]]
$result[^lItems.foreach[_;v]{^lValueFunction[$aField;$v]}[, ]]
}
^case[DEFAULT]{
^throw[pfSQLBuilder.bad.array.values;Значениями массива может быть хеш, таблица или csv-строка. (Поле: $aField.name, тип значения: $aValue.CLASS_NAME)]
^throw[pfSQLBuilder.bad.array.values;Значениями массива может быть хеш, таблица, массив или csv-строка. (Поле: $aField.name, тип значения: $aValue.CLASS_NAME)]
}
}]
^if(!def $result && def $lEmptyValue){
Expand Down
1 change: 1 addition & 0 deletions lib/tests/unittest.p
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,7 @@ $aException.file (${aException.lineno}:$aException.colno)]
^self.fail[Duration $lDuration <= $aDurationInSeconds]
}


@assertHashEquals[aActual;aExpected;aOptions]
## aOptions.nestedAssert(false) — рекурсивный вызов
$aActual[^hash::create[$aActual]]
Expand Down
25 changes: 25 additions & 0 deletions ut/sql/sql_table/orm_test.p
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,31 @@ t1,50,10}[$.separator[,]]

^self.assert($lUser.userID == 1)[UserID is $lUser.userID]

@testConditions_arraysOfHashes[]
^self._createTestUsers(50)

$lRes[^sut.all[
$.[userID in][^sut.all[
$.asArray(true)
$.where[
$sut.userID % 5 = 0
]
]]
$.asArray(true)
]]

^self.assertEq[^lRes.foreach[;v]{$v.userID}[,]][5,10,15,20,25,30,35,40,45,50]

@testConditions_arraysOfHashesColumn[]
^self._createTestUsers(50)

$lRes[^sut.all[
$.[userID in][^array::create[5;15;25;35;45]]
$.asArray(true)
]]

^self.assertEq[^lRes.foreach[;v]{$v.userID}[,]][5,15,25,35,45]

#----------------------------------------------------------------------------------------------------------------------

@CLASS
Expand Down