Skip to content

Commit

Permalink
git subrepo pull uno
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "uno"
  merged:   "d1faab9"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "d1faab9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
  • Loading branch information
prrvchr committed Jan 22, 2024
1 parent fa9a201 commit ee1af0e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions uno/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/prrvchr/uno.git
branch = main
commit = 67a17a47c21a6825a0f5198424b5b61878f56f3b
parent = edc0530ac72241c9dd7a8a4e53f78356386f2b5c
commit = d1faab959e801b9780eb6e2aed95c2ee30309b4e
parent = fa9a201ed999b278a5b4e089da1b699df255c86a
method = merge
cmdver = 0.4.3
12 changes: 8 additions & 4 deletions uno/lib/uno/card/dbqueries.py
Original file line number Diff line number Diff line change
Expand Up @@ -740,14 +740,18 @@ def getSqlQuery(ctx, name, format=None):
# The getTypes query allows to obtain the right label (column) for typed properties
elif name == 'createSelectTypes':
query = """\
CREATE PROCEDURE "SelectTypes"()
CREATE PROCEDURE "SelectTypes"(IN COMPOSE BOOLEAN)
SPECIFIC "SelectTypes_1"
READS SQL DATA
DYNAMIC RESULT SETS 1
BEGIN ATOMIC
DECLARE Rslt CURSOR WITH RETURN FOR
SELECT R."Path", R."Name", P."Path",
ARRAY_AGG(JSON_OBJECT(T."Path" || P2."Path": COALESCE(T."Name", '') || P2."Name"))
CASE WHEN COMPOSE THEN
ARRAY_AGG(JSON_OBJECT(T."Path" || P2."Path": COALESCE(T."Name", '') || P2."Name"))
ELSE
ARRAY_AGG(JSON_OBJECT(T."Path": COALESCE(T."Name", '') || P2."Name"))
END
FROM "Resources" AS R
INNER JOIN "Properties" AS P ON R."Resource"=P."Resource"
INNER JOIN "Resources" AS R2 ON R."Resource"=R2."Resource"
Expand Down Expand Up @@ -795,7 +799,7 @@ def getSqlQuery(ctx, name, format=None):

elif name == 'createSelectGroups':
query = """\
CREATE PROCEDURE "SelectGroups"(IN Aid Integer)
CREATE PROCEDURE "SelectGroups"(IN Aid INTEGER)
SPECIFIC "SelectGroups_1"
READS SQL DATA
DYNAMIC RESULT SETS 1
Expand Down Expand Up @@ -983,7 +987,7 @@ def getSqlQuery(ctx, name, format=None):
elif name == 'getLists':
query = 'CALL "SelectLists"()'
elif name == 'getTypes':
query = 'CALL "SelectTypes"()'
query = 'CALL "SelectTypes"(?)'
elif name == 'getMaps':
query = 'CALL "SelectMaps"()'
elif name == 'getTmps':
Expand Down

0 comments on commit ee1af0e

Please sign in to comment.