Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
simcaq-node
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
simcaq
simcaq-node
Commits
1a4af79b
There was a problem fetching the pipeline summary.
Commit
1a4af79b
authored
8 years ago
by
Vytor Calixto
Browse files
Options
Downloads
Patches
Plain Diff
Change hsaJoined hash in RQF to use table name
parent
282249c9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!116
Release v1.0.0
,
!34
Db simcaq dev2
Pipeline
#
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/libs/middlewares/reqQueryFields.js
+2
-14
2 additions, 14 deletions
src/libs/middlewares/reqQueryFields.js
with
2 additions
and
14 deletions
src/libs/middlewares/reqQueryFields.js
+
2
−
14
View file @
1a4af79b
...
...
@@ -113,15 +113,11 @@ class ReqQueryFields {
let
params
=
[];
// f é o campo
let
f
=
this
.
fields
[
key
];
log
.
debug
(
'
f
'
);
log
.
debug
(
f
);
// Unimos os valores parametros globalmente com os aceitos apenas pelo campo
let
values
=
_
.
merge
(
this
.
fieldValues
,
f
.
values
);
// Fazemos um foreach nos parametros aceitos
Object
.
keys
(
values
).
map
((
k
,
i
)
=>
{
let
value
=
values
[
k
];
log
.
debug
(
'
value
'
);
log
.
debug
(
value
);
// Pushamos o parametro
params
.
push
(
value
.
name
);
});
...
...
@@ -186,18 +182,11 @@ class ReqQueryFields {
// Fazemos um foreach nos parametros dentro do atributo
Object
.
keys
(
param
).
forEach
((
k
)
=>
{
let
values
=
_
.
merge
(
this
.
fieldValues
,
field
.
values
);
// log.debug('ValueS');
// log.debug(values);
// log.debug('k');
// log.debug(k);
if
(
typeof
values
[
k
]
!==
'
undefined
'
)
{
// Clonamos para não alterar o original
let
value
=
_
.
clone
(
values
[
k
]);
// log.debug('value');
// log.debug(value);
// log.debug(hasJoined);
// Checa se não fizemos o join para este valor e se é necessário fazer
if
(
!
hasJoined
[
value
.
nam
e
]
&&
typeof
value
.
join
!==
'
undefined
'
)
{
if
(
!
hasJoined
[
value
.
tabl
e
]
&&
typeof
value
.
join
!==
'
undefined
'
)
{
let
foreignTable
=
''
;
if
(
value
.
join
.
foreignTable
)
foreignTable
=
value
.
join
.
foreignTable
+
'
.
'
;
// Fazemos o join
...
...
@@ -215,8 +204,7 @@ class ReqQueryFields {
}
req
.
sql
.
join
(
value
.
table
,
null
,
onClause
);
// Marcamos o join como feito para não ter problemas
hasJoined
[
value
.
name
]
=
true
;
// values[k].hasJoined = true;
hasJoined
[
value
.
table
]
=
true
;
}
// Se o valor é um campo a ser incluído no SELECT
if
(
typeof
field
.
field
!==
'
undefined
'
&&
field
.
field
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment