Skip to content

В lib/sql/models/sql_table.p@pfSQLTable@_allOrder добавил опцию __orderByContext #136

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
Aug 28, 2026
Merged

В lib/sql/models/sql_table.p@pfSQLTable@_allOrder добавил опцию __orderByContext #136

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
2 changes: 1 addition & 1 deletion .github/workflows/ut.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
ln -fs `pwd`/parser3.cgi $HOME/bin/
ln -fs `pwd`/lib $HOME/bin/lib

- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: "Prepare MySQL 8 drivers"
run: |
Expand Down
3 changes: 2 additions & 1 deletion lib/sql/models/sql_table.p
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,12 +646,13 @@ pfClass

@_allOrder[aOptions]
## aOptions.orderBy
## aOptions.__orderByContext[group] — новый контекст для выражения, чтобы явно поменять дефолтный group (_allOrder[$.orderBy[$lOrderBy] $.__orderByContext[select]]))
^if(^aOptions.contains[orderBy]){
$lOrder[$aOptions.orderBy]
}(def $self._defaultOrderBy){
$lOrder[$self._defaultOrderBy]
}
^self.asContext[group]{
^self.asContext[^ifdef[$aOptions.__orderByContext]{group}]{
^switch(true){
^case($lOrder is hash){
$result[^lOrder.foreach[k;v]{^if(^self._fields.contains[$k]){^self.sqlFieldName[$k] ^switch[^v.lower[]]{^case[desc;-]{DESC} ^case[asc;+]{ASC}}}}[, ]]}
Expand Down
25 changes: 25 additions & 0 deletions ut/sql/sql_table/common_test.p
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,31 @@ pfTestCase
^sut.sqlFieldName[unexistant]
}

@test_allOrder__orderByContext_option[]
^self.sut.addFields[
$.simple[]
$.dbField[$.dbField[db_field]]
$.exField[$.expression[sum(db_field_1)]]
$.exDBField[$.expression[max(db_field_2)] $.dbField[db_field_2]]
$.fexField[$.expression[min(db_field_3)] $.fieldExpression[db_field_3]]
]

$self.sut._defaultOrderBy[
$.simple[]
$.dbField[]
$.exField[]
$.exDBField[]
$.fexField[]
]

# Без опции сортируем по алиасам
^self.assertEq[^self.sut._allOrder[];"test_table"."simple" , "test_table"."db_field" , "exField" , "exDBField" , "fexField" ]
^self.assertEq[^self.sut._allOrder[$.__orderByContext[]];"test_table"."simple" , "test_table"."db_field" , "exField" , "exDBField" , "fexField" ]

# С опцией сортируем с учётом контекста
^self.assertEq[^self.sut._allOrder[$.__orderByContext[select]];"test_table"."simple" , "test_table"."db_field" , sum(db_field_1) , max(db_field_2) , min(db_field_3) ]
^self.assertEq[^self.sut._allOrder[$.__orderByContext[group]];"test_table"."simple" , "test_table"."db_field" , "exField" , "exDBField" , "fexField" ]

@test_sql_json_processors[]
^self.sut.addFields[
$.j1[$.processor[json]]
Expand Down