Skip to content
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

Jump to bottom

4008 hotfix for Sql queries #4088

Merged
merged 2 commits into from
Sep 22, 2020
Merged

4008 hotfix for Sql queries #4088

merged 2 commits into from
Sep 22, 2020

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented Sep 21, 2020

Pull request overview

Pull Request Author

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

  • Model API Changes / Additions
  • Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate)
  • Model API methods are tested (in src/model/test)
  • EnergyPlus ForwardTranslator Tests (in src/energyplus/Test)
  • If a new object or method, added a test in NREL/OpenStudio-resources: Add Link
  • If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp)
  • Checked behavior in OpenStudioApplication, adjusted policies as needed (src/openstudio_lib/library/OpenStudioPolicy.xml)
  • Verified that C# bindings built fine on Windows, partial classes used as needed, etc.
  • All new and existing tests passes
  • If methods have been deprecated, update rest of code to use the new methods

Labels:

  • If change to an IDD file, add the label IDDChange
  • If breaking existing API, add the label APIChange
  • If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • Code Style, strip trailing whitespace, etc.
  • All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
  • Labeling is ok
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified

@jmarrec jmarrec added component - Utilities Other Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. labels Sep 21, 2020
@jmarrec jmarrec self-assigned this Sep 21, 2020
@jmarrec jmarrec changed the title 4008 hotfix 4008 hotfix for Sql queries Sep 21, 2020
jmarrec
jmarrec commented Sep 21, 2020
View reviewed changes
src/utilities/sql/SqlFile_Impl.cpp
@@ -849,7 +849,7 @@ namespace openstudio{
const std::string rowName = t_monthOfYear.valueDescription();


const std::string& s = R"(SELECT Value FROM TabularDataWithStrings WHERE
const std::string& s = R"(SELECT Value FROM TabularDataWithStrings
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First double WHERE

src/utilities/sql/SqlFile_Impl.cpp
@@ -870,7 +870,7 @@ namespace openstudio{
" {AT MAX/MIN}";
const std::string rowName = t_monthOfYear.valueDescription();

const std::string& s = R"(SELECT Value FROM TabularDataWithStrings WHERE
const std::string& s = R"(SELECT Value FROM TabularDataWithStrings
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second double where.

src/utilities/sql/SqlFile_Impl.cpp
return execAndReturnFirstDouble(s);
}


OptionalDouble SqlFile_Impl::annualTotalCost(const FuelType& fuel) const
{
if (fuel == FuelType::Electricity){
return execAndReturnFirstDouble("SELECT Value from tabulardatawithstrings where (reportname = 'Economics Results Summary Report') and (ReportForString = 'Entire Facility') and (TableName = 'Annual Cost') and (ColumnName ='Electricity') and (((RowName = 'Cost') and (Units = '~~$~~')) or (RowName = 'Cost (~~$~~)'))");
return execAndReturnFirstDouble("SELECT Value from TabularDataWithStrings where (reportname = 'Economics Results Summary Report') and (ReportForString = 'Entire Facility') and (TableName = 'Annual Cost') and (ColumnName ='Electricity') and (((RowName = 'Cost') and (Units = '~~$~~')) or (RowName = 'Cost (~~$~~)'))");
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Starting here it's just casing for tabulardatawithstrings -> TabularDataWithStrings

joseph-robertson
joseph-robertson approved these changes Sep 21, 2020
View reviewed changes
Copy link
Collaborator

@joseph-robertson joseph-robertson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ci-commercialbuildings
Copy link
Collaborator

ci-commercialbuildings commented Sep 21, 2020 •
edited
Loading

CI Results for a754624:

@tijcolem tijcolem merged commit 4e5b621 into develop Sep 22, 2020
@tijcolem tijcolem deleted the 4008_Hotfix branch September 22, 2020 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joseph-robertson joseph-robertson joseph-robertson approved these changes

@DavidGoldwasser DavidGoldwasser Awaiting requested review from DavidGoldwasser

Assignees

@jmarrec jmarrec

Labels
component - Utilities Other Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jmarrec @ci-commercialbuildings @joseph-robertson @tijcolem