Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Curriculum-Request
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tim Steiner
Curriculum-Request
Commits
c9c4c2f4
Commit
c9c4c2f4
authored
10 years ago
by
Roger W Feese
Browse files
Options
Downloads
Patches
Plain Diff
Modified table names in queries to match camel-case capitalization.
parent
0fd15d01
Branches
Branches containing commit
No related tags found
1 merge request
!6
Projects Task 27
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
application/modules/courses/models/CourseModel.php
+10
-10
10 additions, 10 deletions
application/modules/courses/models/CourseModel.php
with
10 additions
and
10 deletions
application/modules/courses/models/CourseModel.php
+
10
−
10
View file @
c9c4c2f4
...
...
@@ -140,8 +140,8 @@ class Courses_CourseModel extends Unl_Model
//INNER JOIN creq.creqcourseacerecertifyquestions AS q ON a.questionId = q.courseAceRecertifyQuestionId
//WHERE a.recertificationId = 785 ORDER BY q.questionSort;
$select
=
new
Zend_Db_Select
(
$db
);
$select
->
from
(
array
(
'a'
=>
'creq
c
ourse
a
ce
r
ecertify
a
nswers'
));
$select
->
joinInner
(
array
(
'q'
=>
'creq
c
ourse
a
ce
r
ecertify
q
uestions'
),
'a.questionId = q.courseAceRecertifyQuestionId'
);
$select
->
from
(
array
(
'a'
=>
'creq
C
ourse
A
ce
R
ecertify
A
nswers'
));
$select
->
joinInner
(
array
(
'q'
=>
'creq
C
ourse
A
ce
R
ecertify
Q
uestions'
),
'a.questionId = q.courseAceRecertifyQuestionId'
);
$select
->
where
(
'a.recertificationId = ?'
,
$record
[
'courseAceRecertificationId'
]);
$select
->
order
(
'q.questionSort'
);
$recordsRecertQA
=
$select
->
query
()
->
fetchAll
();
...
...
@@ -152,8 +152,8 @@ class Courses_CourseModel extends Unl_Model
//INNER JOIN creq.creqcourseacerecertifyquestions AS q ON s.courseAceRecertifyQuestionSetId = q.questionSetId
//WHERE s.dateRetired IS NULL ORDER BY q.questionSort;
$select
=
new
Zend_Db_Select
(
$db
);
$select
->
from
(
array
(
's'
=>
'creq
c
ourse
a
ce
r
ecertify
q
uestion
s
ets'
));
$select
->
joinInner
(
array
(
'q'
=>
'creq
c
ourse
a
ce
r
ecertify
q
uestions'
),
's.courseAceRecertifyQuestionSetId = q.questionSetId'
);
$select
->
from
(
array
(
's'
=>
'creq
C
ourse
A
ce
R
ecertify
Q
uestion
S
ets'
));
$select
->
joinInner
(
array
(
'q'
=>
'creq
C
ourse
A
ce
R
ecertify
Q
uestions'
),
's.courseAceRecertifyQuestionSetId = q.questionSetId'
);
$select
->
where
(
's.dateRetired IS NULL'
);
$select
->
order
(
'q.questionSort'
);
$recordsRecertQA
=
$select
->
query
()
->
fetchAll
();
...
...
@@ -2968,12 +2968,12 @@ class Courses_CourseModel extends Unl_Model
{
if
(
!
is_array
(
$this
->
_data
[
'aceRecertification'
]))
{
// load current empty question set
//SELECT q.* FROM creq.creq
c
ourse
a
ce
r
ecertify
q
uestion
s
ets as s
//INNER JOIN creq.creq
c
ourse
a
ce
r
ecertify
q
uestions AS q ON s.courseAceRecertifyQuestionSetId = q.questionSetId
//SELECT q.* FROM creq.creq
C
ourse
A
ce
R
ecertify
Q
uestion
S
ets as s
//INNER JOIN creq.creq
C
ourse
A
ce
R
ecertify
Q
uestions AS q ON s.courseAceRecertifyQuestionSetId = q.questionSetId
//WHERE s.dateRetired IS NULL ORDER BY q.questionSort;
$select
=
new
Zend_Db_Select
(
$db
);
$select
->
from
(
array
(
's'
=>
'creq
c
ourse
a
ce
r
ecertify
q
uestion
s
ets'
));
$select
->
joinInner
(
array
(
'q'
=>
'creq
c
ourse
a
ce
r
ecertify
q
uestions'
),
's.courseAceRecertifyQuestionSetId = q.questionSetId'
);
$select
->
from
(
array
(
's'
=>
'creq
C
ourse
A
ce
R
ecertify
Q
uestion
S
ets'
));
$select
->
joinInner
(
array
(
'q'
=>
'creq
C
ourse
A
ce
R
ecertify
Q
uestions'
),
's.courseAceRecertifyQuestionSetId = q.questionSetId'
);
$select
->
where
(
's.dateRetired IS NULL'
);
$select
->
order
(
'q.questionSort'
);
$recordsRecertQA
=
$select
->
query
()
->
fetchAll
();
...
...
@@ -3001,11 +3001,11 @@ class Courses_CourseModel extends Unl_Model
}
if
(
$questionIds
!=
""
)
{
//SELECT q.* FROM creq.creq
c
ourse
a
ce
r
ecertify
q
uestions AS q
//SELECT q.* FROM creq.creq
C
ourse
A
ce
R
ecertify
Q
uestions AS q
//WHERE q.courseAceRecertifyQuestionId IN (1,2,3,4,5) ORDER BY q.questionSort;
$db
=
Zend_Registry
::
get
(
'db'
);
$select
=
new
Zend_Db_Select
(
$db
);
$select
->
from
(
array
(
'q'
=>
'creq
c
ourse
a
ce
r
ecertify
q
uestions'
));
$select
->
from
(
array
(
'q'
=>
'creq
C
ourse
A
ce
R
ecertify
Q
uestions'
));
$select
->
where
(
'q.courseAceRecertifyQuestionId IN (?)'
,
$questionIds
);
$select
->
order
(
'q.questionSort'
);
$result
=
$select
->
query
()
->
fetchAll
();
...
...
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