-
Notifications
You must be signed in to change notification settings - Fork 27
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.
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
Remove Out-commented Code in Erfurt #140
base: develop
Are you sure you want to change the base?
Conversation
Remove commented out code and apply coding standards of Erfurt_Store_Adapter_EfZendDb
Tests: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But blocked by #138
@@ -268,10 +174,7 @@ public function queryModel(Erfurt_Sparql_Query $query, $resultform = 'plain') | |||
|
|||
$this->ts = new Erfurt_Sparql_EngineDb_TypeSorter($this->query, $this); | |||
|
|||
$this->_setOptions(); | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This method is removed from Line 367
library/Erfurt/Sparql/Query2.php
Outdated
//$this->setOffset(0); | ||
//$this->order = new Erfurt_Sparql_Query2_OrderClause(); | ||
//$this->distinctReducedMode = 0; | ||
//$this->projectionVars = array(); | ||
break; | ||
case self::typeDescribe: | ||
break; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove the breaks for select and ask, such that select, ask and describe result in one common break
, (still they should not go to default
)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok this is a change request ;-)
# 'st' => $subjectIs, | ||
# 'ot' => $objectIs | ||
#); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here we have the same problem as in #138
# 'st' => $subjectIs, | ||
# 'ot' => $objectIs | ||
#); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change comes from #138
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry there was one change request
library/Erfurt/Sparql/Query2.php
Outdated
//$this->setOffset(0); | ||
//$this->order = new Erfurt_Sparql_Query2_OrderClause(); | ||
//$this->distinctReducedMode = 0; | ||
//$this->projectionVars = array(); | ||
break; | ||
case self::typeDescribe: | ||
break; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok this is a change request ;-)
Please also run tests for MySQL backend |
979de57
to
3d5e8b0
Compare
done @white-gecko |
…ommentedCode Conflicts: library/Erfurt/Sparql/Query2.php library/Erfurt/Store/Adapter/Mssql.php library/Erfurt/Syntax/RdfParser/Adapter/RdfXml.php
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just want to get this out of my inbox... sorry
This Pull Request removes all (or most) of the outcommented code in erfurt.
This Pull Request is based on #138 , which already started removing outcommented code in one file, so this request should be merged after it.