Skip to content

P
PERFORMA_REPLICA
Commit 7ffe7d23 by Harsh Shah
Options

Table prefix changed to 'tl_' (Talentology)

parent 5a5ca51d
Showing with 1472 additions and 1458 deletions
cmsWebApp/sql/Answer.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_answer</tableName> <tableName factory="String">tl_answer</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
<column name="quest_number" type="Long" length="11" nullable="true"/> <column name="quest_number" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_answer" indexName="idx_rs_answer_candidate_id" isUnique="false"><column name="candidate_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_answer" indexName="idx_tl_answer_candidate_id" isUnique="false"><column name="candidate_id"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/Candidate.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_candidate</tableName> <tableName factory="String">tl_candidate</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
<column name="test_input_id" type="Long" length="11" nullable="true"/> <column name="test_input_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_candidate" indexName="idx_rs_candidate_test_input_id" isUnique="false"><column name="test_input_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_candidate" indexName="idx_tl_candidate_test_input_id" isUnique="false"><column name="test_input_id"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/CultureElement.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_culture_element</tableName> <tableName factory="String">tl_culture_element</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
......
cmsWebApp/sql/CultureElementQuestion.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_culture_element_quest</tableName> <tableName factory="String">tl_culture_element_quest</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
<column name="culture_element_number" type="Long" length="11" nullable="true"/> <column name="culture_element_number" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_culture_element_quest" indexName="idx_rs_culture_element_quest_culture_element_number" isUnique="false"><column name="culture_element_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_culture_element_quest" indexName="idx_tl_culture_element_quest_culture_element_number" isUnique="false"><column name="culture_element_number"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/CultureElementRating.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_culture_element_rating</tableName> <tableName factory="String">tl_culture_element_rating</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
<column name="culture_element_number" type="Long" length="11" nullable="true"/> <column name="culture_element_number" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_culture_element_rating" indexName="idx_rs_culture_element_rating_culture_element_number" isUnique="false"><column name="culture_element_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_culture_element_rating" indexName="idx_tl_culture_element_rating_culture_element_number" isUnique="false"><column name="culture_element_number"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/CultureNarrative.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_culture_narrative</tableName> <tableName factory="String">tl_culture_narrative</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<column name="culture_element_rating_id" type="Long" length="11" nullable="true"/> <column name="culture_element_rating_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_culture_narrative" indexName="idx_rs_culture_narrative_culture_element_number" isUnique="false"><column name="culture_element_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_culture_narrative" indexName="idx_tl_culture_narrative_culture_element_number" isUnique="false"><column name="culture_element_number"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_culture_narrative" indexName="idx_rs_culture_narrative_culture_element_quest_id" isUnique="false"><column name="culture_element_quest_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_culture_narrative" indexName="idx_tl_culture_narrative_culture_element_quest_id" isUnique="false"><column name="culture_element_quest_id"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_culture_narrative" indexName="idx_rs_culture_narrative_culture_element_rating_id" isUnique="false"><column name="culture_element_rating_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_culture_narrative" indexName="idx_tl_culture_narrative_culture_element_rating_id" isUnique="false"><column name="culture_element_rating_id"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/Factor.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_factor</tableName> <tableName factory="String">tl_factor</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
......
cmsWebApp/sql/FactorLevelLink.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_factor_hdr</tableName> <tableName factory="String">tl_factor_hdr</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<column name="factor_number" type="Long" length="11" nullable="true"/> <column name="factor_number" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_factor_hdr" indexName="idx_rs_factor_hdr_level_number" isUnique="false"><column name="level_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_factor_hdr" indexName="idx_tl_factor_hdr_level_number" isUnique="false"><column name="level_number"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_factor_hdr" indexName="idx_rs_factor_hdr_factor_number" isUnique="false"><column name="factor_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_factor_hdr" indexName="idx_tl_factor_hdr_factor_number" isUnique="false"><column name="factor_number"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/FactorQuestionLink.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_factor_lin</tableName> <tableName factory="String">tl_factor_lin</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<column name="quest_number" type="Long" length="11" nullable="true"/> <column name="quest_number" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_factor_lin" indexName="idx_rs_factor_lin_factor_number" isUnique="false"><column name="factor_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_factor_lin" indexName="idx_tl_factor_lin_factor_number" isUnique="false"><column name="factor_number"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_factor_lin" indexName="idx_rs_factor_lin_quest_number" isUnique="false"><column name="quest_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_factor_lin" indexName="idx_tl_factor_lin_quest_number" isUnique="false"><column name="quest_number"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/FactorScore.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_score</tableName> <tableName factory="String">tl_score</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
<column name="narrative_id" type="Long" length="11" nullable="true"/> <column name="narrative_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_score" indexName="idx_rs_score_test_analysis_id" isUnique="false"><column name="test_analysis_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_score" indexName="idx_tl_score_test_analysis_id" isUnique="false"><column name="test_analysis_id"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_score" indexName="idx_rs_score_narrative_id" isUnique="false"><column name="narrative_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_score" indexName="idx_tl_score_narrative_id" isUnique="false"><column name="narrative_id"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/FactorScoreResult.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_level_factor</tableName> <tableName factory="String">tl_level_factor</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
<column name="narrative_id" type="Long" length="11" nullable="true"/> <column name="narrative_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_level_factor" indexName="idx_rs_level_factor_factor_number" isUnique="false"><column name="factor_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_level_factor" indexName="idx_tl_level_factor_factor_number" isUnique="false"><column name="factor_number"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_level_factor" indexName="idx_rs_level_factor_level_number" isUnique="false"><column name="level_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_level_factor" indexName="idx_tl_level_factor_level_number" isUnique="false"><column name="level_number"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_level_factor" indexName="idx_rs_level_factor_narrative_id" isUnique="false"><column name="narrative_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_level_factor" indexName="idx_tl_level_factor_narrative_id" isUnique="false"><column name="narrative_id"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/Level.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_level</tableName> <tableName factory="String">tl_level</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
......
cmsWebApp/sql/Narrative.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_narrative</tableName> <tableName factory="String">tl_narrative</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
<column name="level_number" type="Long" length="11" nullable="true"/> <column name="level_number" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_narrative" indexName="idx_rs_narrative_level_number" isUnique="false"><column name="level_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_narrative" indexName="idx_tl_narrative_level_number" isUnique="false"><column name="level_number"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/Question.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_quest_lin</tableName> <tableName factory="String">tl_quest_lin</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
<column name="section_number" type="Long" length="11" nullable="true"/> <column name="section_number" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_quest_lin" indexName="idx_rs_quest_lin_section_number" isUnique="false"><column name="section_number"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_quest_lin" indexName="idx_tl_quest_lin_section_number" isUnique="false"><column name="section_number"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/Section.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_quest_hdr</tableName> <tableName factory="String">tl_quest_hdr</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
......
cmsWebApp/sql/TestAnalysis.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_test_analysis</tableName> <tableName factory="String">tl_test_analysis</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<column name="candidate_id" type="Long" length="11" nullable="true"/> <column name="candidate_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_test_analysis" indexName="idx_rs_test_analysis_level_id" isUnique="false"><column name="level_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_test_analysis" indexName="idx_tl_test_analysis_level_id" isUnique="false"><column name="level_id"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_test_analysis" indexName="idx_rs_test_analysis_candidate_id" isUnique="false"><column name="candidate_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_test_analysis" indexName="idx_tl_test_analysis_candidate_id" isUnique="false"><column name="candidate_id"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/ms/Answer.sql
-- DROP TABLE rs_answer; -- DROP TABLE tl_answer;
CREATE TABLE rs_answer ( CREATE TABLE tl_answer (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -16,13 +16,13 @@ CREATE TABLE rs_answer ( ...@@ -16,13 +16,13 @@ CREATE TABLE rs_answer (
ALTER TABLE rs_answer ADD ALTER TABLE tl_answer ADD
CONSTRAINT PK_rs_answer PRIMARY KEY CONSTRAINT PK_tl_answer PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_answer_candidate_id CREATE INDEX idx_tl_answer_candidate_id
ON rs_answer (candidate_id); ON tl_answer (candidate_id);
cmsWebApp/sql/ms/Candidate.sql
-- DROP TABLE rs_candidate; -- DROP TABLE tl_candidate;
CREATE TABLE rs_candidate ( CREATE TABLE tl_candidate (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -14,13 +14,13 @@ CREATE TABLE rs_candidate ( ...@@ -14,13 +14,13 @@ CREATE TABLE rs_candidate (
ALTER TABLE rs_candidate ADD ALTER TABLE tl_candidate ADD
CONSTRAINT PK_rs_candidate PRIMARY KEY CONSTRAINT PK_tl_candidate PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_candidate_test_input_id CREATE INDEX idx_tl_candidate_test_input_id
ON rs_candidate (test_input_id); ON tl_candidate (test_input_id);
cmsWebApp/sql/ms/CultureElement.sql
-- DROP TABLE rs_culture_element; -- DROP TABLE tl_culture_element;
CREATE TABLE rs_culture_element ( CREATE TABLE tl_culture_element (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -14,8 +14,8 @@ CREATE TABLE rs_culture_element ( ...@@ -14,8 +14,8 @@ CREATE TABLE rs_culture_element (
ALTER TABLE rs_culture_element ADD ALTER TABLE tl_culture_element ADD
CONSTRAINT PK_rs_culture_element PRIMARY KEY CONSTRAINT PK_tl_culture_element PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/ms/CultureElementQuestion.sql
-- DROP TABLE rs_culture_element_quest; -- DROP TABLE tl_culture_element_quest;
CREATE TABLE rs_culture_element_quest ( CREATE TABLE tl_culture_element_quest (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -14,13 +14,13 @@ CREATE TABLE rs_culture_element_quest ( ...@@ -14,13 +14,13 @@ CREATE TABLE rs_culture_element_quest (
ALTER TABLE rs_culture_element_quest ADD ALTER TABLE tl_culture_element_quest ADD
CONSTRAINT PK_rs_culture_element_quest PRIMARY KEY CONSTRAINT PK_tl_culture_element_quest PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_element_quest_culture_element_number CREATE INDEX idx_tl_culture_element_quest_culture_element_number
ON rs_culture_element_quest (culture_element_number); ON tl_culture_element_quest (culture_element_number);
cmsWebApp/sql/ms/CultureElementRating.sql
-- DROP TABLE rs_culture_element_rating; -- DROP TABLE tl_culture_element_rating;
CREATE TABLE rs_culture_element_rating ( CREATE TABLE tl_culture_element_rating (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -14,13 +14,13 @@ CREATE TABLE rs_culture_element_rating ( ...@@ -14,13 +14,13 @@ CREATE TABLE rs_culture_element_rating (
ALTER TABLE rs_culture_element_rating ADD ALTER TABLE tl_culture_element_rating ADD
CONSTRAINT PK_rs_culture_element_rating PRIMARY KEY CONSTRAINT PK_tl_culture_element_rating PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_element_rating_culture_element_number CREATE INDEX idx_tl_culture_element_rating_culture_element_number
ON rs_culture_element_rating (culture_element_number); ON tl_culture_element_rating (culture_element_number);
cmsWebApp/sql/ms/CultureNarrative.sql
-- DROP TABLE rs_culture_narrative; -- DROP TABLE tl_culture_narrative;
CREATE TABLE rs_culture_narrative ( CREATE TABLE tl_culture_narrative (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -17,19 +17,19 @@ CREATE TABLE rs_culture_narrative ( ...@@ -17,19 +17,19 @@ CREATE TABLE rs_culture_narrative (
ALTER TABLE rs_culture_narrative ADD ALTER TABLE tl_culture_narrative ADD
CONSTRAINT PK_rs_culture_narrative PRIMARY KEY CONSTRAINT PK_tl_culture_narrative PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_narrative_culture_element_number CREATE INDEX idx_tl_culture_narrative_culture_element_number
ON rs_culture_narrative (culture_element_number); ON tl_culture_narrative (culture_element_number);
CREATE INDEX idx_rs_culture_narrative_culture_element_quest_id CREATE INDEX idx_tl_culture_narrative_culture_element_quest_id
ON rs_culture_narrative (culture_element_quest_id); ON tl_culture_narrative (culture_element_quest_id);
CREATE INDEX idx_rs_culture_narrative_culture_element_rating_id CREATE INDEX idx_tl_culture_narrative_culture_element_rating_id
ON rs_culture_narrative (culture_element_rating_id); ON tl_culture_narrative (culture_element_rating_id);
cmsWebApp/sql/ms/Factor.sql
-- DROP TABLE rs_factor; -- DROP TABLE tl_factor;
CREATE TABLE rs_factor ( CREATE TABLE tl_factor (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -13,8 +13,8 @@ CREATE TABLE rs_factor ( ...@@ -13,8 +13,8 @@ CREATE TABLE rs_factor (
ALTER TABLE rs_factor ADD ALTER TABLE tl_factor ADD
CONSTRAINT PK_rs_factor PRIMARY KEY CONSTRAINT PK_tl_factor PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/ms/FactorLevelLink.sql
-- DROP TABLE rs_factor_hdr; -- DROP TABLE tl_factor_hdr;
CREATE TABLE rs_factor_hdr ( CREATE TABLE tl_factor_hdr (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -20,16 +20,16 @@ CREATE TABLE rs_factor_hdr ( ...@@ -20,16 +20,16 @@ CREATE TABLE rs_factor_hdr (
ALTER TABLE rs_factor_hdr ADD ALTER TABLE tl_factor_hdr ADD
CONSTRAINT PK_rs_factor_hdr PRIMARY KEY CONSTRAINT PK_tl_factor_hdr PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_factor_hdr_level_number CREATE INDEX idx_tl_factor_hdr_level_number
ON rs_factor_hdr (level_number); ON tl_factor_hdr (level_number);
CREATE INDEX idx_rs_factor_hdr_factor_number CREATE INDEX idx_tl_factor_hdr_factor_number
ON rs_factor_hdr (factor_number); ON tl_factor_hdr (factor_number);
cmsWebApp/sql/ms/FactorQuestionLink.sql
-- DROP TABLE rs_factor_lin; -- DROP TABLE tl_factor_lin;
CREATE TABLE rs_factor_lin ( CREATE TABLE tl_factor_lin (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -15,16 +15,16 @@ CREATE TABLE rs_factor_lin ( ...@@ -15,16 +15,16 @@ CREATE TABLE rs_factor_lin (
ALTER TABLE rs_factor_lin ADD ALTER TABLE tl_factor_lin ADD
CONSTRAINT PK_rs_factor_lin PRIMARY KEY CONSTRAINT PK_tl_factor_lin PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_factor_lin_factor_number CREATE INDEX idx_tl_factor_lin_factor_number
ON rs_factor_lin (factor_number); ON tl_factor_lin (factor_number);
CREATE INDEX idx_rs_factor_lin_quest_number CREATE INDEX idx_tl_factor_lin_quest_number
ON rs_factor_lin (quest_number); ON tl_factor_lin (quest_number);
cmsWebApp/sql/ms/FactorScore.sql
-- DROP TABLE rs_score; -- DROP TABLE tl_score;
CREATE TABLE rs_score ( CREATE TABLE tl_score (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -19,16 +19,16 @@ CREATE TABLE rs_score ( ...@@ -19,16 +19,16 @@ CREATE TABLE rs_score (
ALTER TABLE rs_score ADD ALTER TABLE tl_score ADD
CONSTRAINT PK_rs_score PRIMARY KEY CONSTRAINT PK_tl_score PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_score_test_analysis_id CREATE INDEX idx_tl_score_test_analysis_id
ON rs_score (test_analysis_id); ON tl_score (test_analysis_id);
CREATE INDEX idx_rs_score_narrative_id CREATE INDEX idx_tl_score_narrative_id
ON rs_score (narrative_id); ON tl_score (narrative_id);
cmsWebApp/sql/ms/FactorScoreResult.sql
-- DROP TABLE rs_level_factor; -- DROP TABLE tl_level_factor;
CREATE TABLE rs_level_factor ( CREATE TABLE tl_level_factor (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -18,19 +18,19 @@ CREATE TABLE rs_level_factor ( ...@@ -18,19 +18,19 @@ CREATE TABLE rs_level_factor (
ALTER TABLE rs_level_factor ADD ALTER TABLE tl_level_factor ADD
CONSTRAINT PK_rs_level_factor PRIMARY KEY CONSTRAINT PK_tl_level_factor PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_level_factor_factor_number CREATE INDEX idx_tl_level_factor_factor_number
ON rs_level_factor (factor_number); ON tl_level_factor (factor_number);
CREATE INDEX idx_rs_level_factor_level_number CREATE INDEX idx_tl_level_factor_level_number
ON rs_level_factor (level_number); ON tl_level_factor (level_number);
CREATE INDEX idx_rs_level_factor_narrative_id CREATE INDEX idx_tl_level_factor_narrative_id
ON rs_level_factor (narrative_id); ON tl_level_factor (narrative_id);
cmsWebApp/sql/ms/Level.sql
-- DROP TABLE rs_level; -- DROP TABLE tl_level;
CREATE TABLE rs_level ( CREATE TABLE tl_level (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -15,8 +15,8 @@ CREATE TABLE rs_level ( ...@@ -15,8 +15,8 @@ CREATE TABLE rs_level (
ALTER TABLE rs_level ADD ALTER TABLE tl_level ADD
CONSTRAINT PK_rs_level PRIMARY KEY CONSTRAINT PK_tl_level PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/ms/Narrative.sql
-- DROP TABLE rs_narrative; -- DROP TABLE tl_narrative;
CREATE TABLE rs_narrative ( CREATE TABLE tl_narrative (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -21,13 +21,13 @@ CREATE TABLE rs_narrative ( ...@@ -21,13 +21,13 @@ CREATE TABLE rs_narrative (
ALTER TABLE rs_narrative ADD ALTER TABLE tl_narrative ADD
CONSTRAINT PK_rs_narrative PRIMARY KEY CONSTRAINT PK_tl_narrative PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_narrative_level_number CREATE INDEX idx_tl_narrative_level_number
ON rs_narrative (level_number); ON tl_narrative (level_number);
cmsWebApp/sql/ms/Question.sql
-- DROP TABLE rs_quest_lin; -- DROP TABLE tl_quest_lin;
CREATE TABLE rs_quest_lin ( CREATE TABLE tl_quest_lin (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -14,13 +14,13 @@ CREATE TABLE rs_quest_lin ( ...@@ -14,13 +14,13 @@ CREATE TABLE rs_quest_lin (
ALTER TABLE rs_quest_lin ADD ALTER TABLE tl_quest_lin ADD
CONSTRAINT PK_rs_quest_lin PRIMARY KEY CONSTRAINT PK_tl_quest_lin PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_quest_lin_section_number CREATE INDEX idx_tl_quest_lin_section_number
ON rs_quest_lin (section_number); ON tl_quest_lin (section_number);
cmsWebApp/sql/ms/Section.sql
-- DROP TABLE rs_quest_hdr; -- DROP TABLE tl_quest_hdr;
CREATE TABLE rs_quest_hdr ( CREATE TABLE tl_quest_hdr (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -14,8 +14,8 @@ CREATE TABLE rs_quest_hdr ( ...@@ -14,8 +14,8 @@ CREATE TABLE rs_quest_hdr (
ALTER TABLE rs_quest_hdr ADD ALTER TABLE tl_quest_hdr ADD
CONSTRAINT PK_rs_quest_hdr PRIMARY KEY CONSTRAINT PK_tl_quest_hdr PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/ms/TestAnalysis.sql
-- DROP TABLE rs_test_analysis; -- DROP TABLE tl_test_analysis;
CREATE TABLE rs_test_analysis ( CREATE TABLE tl_test_analysis (
object_id int NOT NULL , object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
...@@ -14,16 +14,16 @@ CREATE TABLE rs_test_analysis ( ...@@ -14,16 +14,16 @@ CREATE TABLE rs_test_analysis (
ALTER TABLE rs_test_analysis ADD ALTER TABLE tl_test_analysis ADD
CONSTRAINT PK_rs_test_analysis PRIMARY KEY CONSTRAINT PK_tl_test_analysis PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_test_analysis_level_id CREATE INDEX idx_tl_test_analysis_level_id
ON rs_test_analysis (level_id); ON tl_test_analysis (level_id);
CREATE INDEX idx_rs_test_analysis_candidate_id CREATE INDEX idx_tl_test_analysis_candidate_id
ON rs_test_analysis (candidate_id); ON tl_test_analysis (candidate_id);
cmsWebApp/sql/oracle/Answer.sql
-- DROP TABLE rs_answer; -- DROP TABLE tl_answer;
CREATE TABLE rs_answer ( CREATE TABLE tl_answer (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -17,13 +17,13 @@ CREATE TABLE rs_answer ( ...@@ -17,13 +17,13 @@ CREATE TABLE rs_answer (
ALTER TABLE rs_answer ADD ALTER TABLE tl_answer ADD
CONSTRAINT PK_rs_answer PRIMARY KEY CONSTRAINT PK_tl_answer PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_answer_candidate_id CREATE INDEX idx_tl_answer_candidate_id
ON rs_answer (candidate_id); ON tl_answer (candidate_id);
cmsWebApp/sql/oracle/Candidate.sql
-- DROP TABLE rs_candidate; -- DROP TABLE tl_candidate;
CREATE TABLE rs_candidate ( CREATE TABLE tl_candidate (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -15,13 +15,13 @@ CREATE TABLE rs_candidate ( ...@@ -15,13 +15,13 @@ CREATE TABLE rs_candidate (
ALTER TABLE rs_candidate ADD ALTER TABLE tl_candidate ADD
CONSTRAINT PK_rs_candidate PRIMARY KEY CONSTRAINT PK_tl_candidate PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_candidate_test_input_id CREATE INDEX idx_tl_candidate_test_input_id
ON rs_candidate (test_input_id); ON tl_candidate (test_input_id);
cmsWebApp/sql/oracle/CultureElement.sql
-- DROP TABLE rs_culture_element; -- DROP TABLE tl_culture_element;
CREATE TABLE rs_culture_element ( CREATE TABLE tl_culture_element (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -15,8 +15,8 @@ CREATE TABLE rs_culture_element ( ...@@ -15,8 +15,8 @@ CREATE TABLE rs_culture_element (
ALTER TABLE rs_culture_element ADD ALTER TABLE tl_culture_element ADD
CONSTRAINT PK_rs_culture_element PRIMARY KEY CONSTRAINT PK_tl_culture_element PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/oracle/CultureElementQuestion.sql
-- DROP TABLE rs_culture_element_quest; -- DROP TABLE tl_culture_element_quest;
CREATE TABLE rs_culture_element_quest ( CREATE TABLE tl_culture_element_quest (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -15,13 +15,13 @@ CREATE TABLE rs_culture_element_quest ( ...@@ -15,13 +15,13 @@ CREATE TABLE rs_culture_element_quest (
ALTER TABLE rs_culture_element_quest ADD ALTER TABLE tl_culture_element_quest ADD
CONSTRAINT PK_rs_culture_element_quest PRIMARY KEY CONSTRAINT PK_tl_culture_element_quest PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_element_quest_culture_element_number CREATE INDEX idx_tl_culture_element_quest_culture_element_number
ON rs_culture_element_quest (culture_element_number); ON tl_culture_element_quest (culture_element_number);
cmsWebApp/sql/oracle/CultureElementRating.sql
-- DROP TABLE rs_culture_element_rating; -- DROP TABLE tl_culture_element_rating;
CREATE TABLE rs_culture_element_rating ( CREATE TABLE tl_culture_element_rating (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -15,13 +15,13 @@ CREATE TABLE rs_culture_element_rating ( ...@@ -15,13 +15,13 @@ CREATE TABLE rs_culture_element_rating (
ALTER TABLE rs_culture_element_rating ADD ALTER TABLE tl_culture_element_rating ADD
CONSTRAINT PK_rs_culture_element_rating PRIMARY KEY CONSTRAINT PK_tl_culture_element_rating PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_element_rating_culture_element_number CREATE INDEX idx_tl_culture_element_rating_culture_element_number
ON rs_culture_element_rating (culture_element_number); ON tl_culture_element_rating (culture_element_number);
cmsWebApp/sql/oracle/CultureNarrative.sql
-- DROP TABLE rs_culture_narrative; -- DROP TABLE tl_culture_narrative;
CREATE TABLE rs_culture_narrative ( CREATE TABLE tl_culture_narrative (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -18,19 +18,19 @@ CREATE TABLE rs_culture_narrative ( ...@@ -18,19 +18,19 @@ CREATE TABLE rs_culture_narrative (
ALTER TABLE rs_culture_narrative ADD ALTER TABLE tl_culture_narrative ADD
CONSTRAINT PK_rs_culture_narrative PRIMARY KEY CONSTRAINT PK_tl_culture_narrative PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_narrative_culture_element_number CREATE INDEX idx_tl_culture_narrative_culture_element_number
ON rs_culture_narrative (culture_element_number); ON tl_culture_narrative (culture_element_number);
CREATE INDEX idx_rs_culture_narrative_culture_element_quest_id CREATE INDEX idx_tl_culture_narrative_culture_element_quest_id
ON rs_culture_narrative (culture_element_quest_id); ON tl_culture_narrative (culture_element_quest_id);
CREATE INDEX idx_rs_culture_narrative_culture_element_rating_id CREATE INDEX idx_tl_culture_narrative_culture_element_rating_id
ON rs_culture_narrative (culture_element_rating_id); ON tl_culture_narrative (culture_element_rating_id);
cmsWebApp/sql/oracle/Factor.sql
-- DROP TABLE rs_factor; -- DROP TABLE tl_factor;
CREATE TABLE rs_factor ( CREATE TABLE tl_factor (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -14,8 +14,8 @@ CREATE TABLE rs_factor ( ...@@ -14,8 +14,8 @@ CREATE TABLE rs_factor (
ALTER TABLE rs_factor ADD ALTER TABLE tl_factor ADD
CONSTRAINT PK_rs_factor PRIMARY KEY CONSTRAINT PK_tl_factor PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/oracle/FactorLevelLink.sql
-- DROP TABLE rs_factor_hdr; -- DROP TABLE tl_factor_hdr;
CREATE TABLE rs_factor_hdr ( CREATE TABLE tl_factor_hdr (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -21,16 +21,16 @@ CREATE TABLE rs_factor_hdr ( ...@@ -21,16 +21,16 @@ CREATE TABLE rs_factor_hdr (
ALTER TABLE rs_factor_hdr ADD ALTER TABLE tl_factor_hdr ADD
CONSTRAINT PK_rs_factor_hdr PRIMARY KEY CONSTRAINT PK_tl_factor_hdr PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_factor_hdr_level_number CREATE INDEX idx_tl_factor_hdr_level_number
ON rs_factor_hdr (level_number); ON tl_factor_hdr (level_number);
CREATE INDEX idx_rs_factor_hdr_factor_number CREATE INDEX idx_tl_factor_hdr_factor_number
ON rs_factor_hdr (factor_number); ON tl_factor_hdr (factor_number);
cmsWebApp/sql/oracle/FactorQuestionLink.sql
-- DROP TABLE rs_factor_lin; -- DROP TABLE tl_factor_lin;
CREATE TABLE rs_factor_lin ( CREATE TABLE tl_factor_lin (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -16,16 +16,16 @@ CREATE TABLE rs_factor_lin ( ...@@ -16,16 +16,16 @@ CREATE TABLE rs_factor_lin (
ALTER TABLE rs_factor_lin ADD ALTER TABLE tl_factor_lin ADD
CONSTRAINT PK_rs_factor_lin PRIMARY KEY CONSTRAINT PK_tl_factor_lin PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_factor_lin_factor_number CREATE INDEX idx_tl_factor_lin_factor_number
ON rs_factor_lin (factor_number); ON tl_factor_lin (factor_number);
CREATE INDEX idx_rs_factor_lin_quest_number CREATE INDEX idx_tl_factor_lin_quest_number
ON rs_factor_lin (quest_number); ON tl_factor_lin (quest_number);
cmsWebApp/sql/oracle/FactorScore.sql
-- DROP TABLE rs_score; -- DROP TABLE tl_score;
CREATE TABLE rs_score ( CREATE TABLE tl_score (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -20,16 +20,16 @@ CREATE TABLE rs_score ( ...@@ -20,16 +20,16 @@ CREATE TABLE rs_score (
ALTER TABLE rs_score ADD ALTER TABLE tl_score ADD
CONSTRAINT PK_rs_score PRIMARY KEY CONSTRAINT PK_tl_score PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_score_test_analysis_id CREATE INDEX idx_tl_score_test_analysis_id
ON rs_score (test_analysis_id); ON tl_score (test_analysis_id);
CREATE INDEX idx_rs_score_narrative_id CREATE INDEX idx_tl_score_narrative_id
ON rs_score (narrative_id); ON tl_score (narrative_id);
cmsWebApp/sql/oracle/FactorScoreResult.sql
-- DROP TABLE rs_level_factor; -- DROP TABLE tl_level_factor;
CREATE TABLE rs_level_factor ( CREATE TABLE tl_level_factor (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -19,19 +19,19 @@ CREATE TABLE rs_level_factor ( ...@@ -19,19 +19,19 @@ CREATE TABLE rs_level_factor (
ALTER TABLE rs_level_factor ADD ALTER TABLE tl_level_factor ADD
CONSTRAINT PK_rs_level_factor PRIMARY KEY CONSTRAINT PK_tl_level_factor PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_level_factor_factor_number CREATE INDEX idx_tl_level_factor_factor_number
ON rs_level_factor (factor_number); ON tl_level_factor (factor_number);
CREATE INDEX idx_rs_level_factor_level_number CREATE INDEX idx_tl_level_factor_level_number
ON rs_level_factor (level_number); ON tl_level_factor (level_number);
CREATE INDEX idx_rs_level_factor_narrative_id CREATE INDEX idx_tl_level_factor_narrative_id
ON rs_level_factor (narrative_id); ON tl_level_factor (narrative_id);
cmsWebApp/sql/oracle/Level.sql
-- DROP TABLE rs_level; -- DROP TABLE tl_level;
CREATE TABLE rs_level ( CREATE TABLE tl_level (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -16,8 +16,8 @@ CREATE TABLE rs_level ( ...@@ -16,8 +16,8 @@ CREATE TABLE rs_level (
ALTER TABLE rs_level ADD ALTER TABLE tl_level ADD
CONSTRAINT PK_rs_level PRIMARY KEY CONSTRAINT PK_tl_level PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/oracle/Narrative.sql
-- DROP TABLE rs_narrative; -- DROP TABLE tl_narrative;
CREATE TABLE rs_narrative ( CREATE TABLE tl_narrative (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -22,13 +22,13 @@ CREATE TABLE rs_narrative ( ...@@ -22,13 +22,13 @@ CREATE TABLE rs_narrative (
ALTER TABLE rs_narrative ADD ALTER TABLE tl_narrative ADD
CONSTRAINT PK_rs_narrative PRIMARY KEY CONSTRAINT PK_tl_narrative PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_narrative_level_number CREATE INDEX idx_tl_narrative_level_number
ON rs_narrative (level_number); ON tl_narrative (level_number);
cmsWebApp/sql/oracle/Question.sql
-- DROP TABLE rs_quest_lin; -- DROP TABLE tl_quest_lin;
CREATE TABLE rs_quest_lin ( CREATE TABLE tl_quest_lin (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -15,13 +15,13 @@ CREATE TABLE rs_quest_lin ( ...@@ -15,13 +15,13 @@ CREATE TABLE rs_quest_lin (
ALTER TABLE rs_quest_lin ADD ALTER TABLE tl_quest_lin ADD
CONSTRAINT PK_rs_quest_lin PRIMARY KEY CONSTRAINT PK_tl_quest_lin PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_quest_lin_section_number CREATE INDEX idx_tl_quest_lin_section_number
ON rs_quest_lin (section_number); ON tl_quest_lin (section_number);
cmsWebApp/sql/oracle/Section.sql
-- DROP TABLE rs_quest_hdr; -- DROP TABLE tl_quest_hdr;
CREATE TABLE rs_quest_hdr ( CREATE TABLE tl_quest_hdr (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -15,8 +15,8 @@ CREATE TABLE rs_quest_hdr ( ...@@ -15,8 +15,8 @@ CREATE TABLE rs_quest_hdr (
ALTER TABLE rs_quest_hdr ADD ALTER TABLE tl_quest_hdr ADD
CONSTRAINT PK_rs_quest_hdr PRIMARY KEY CONSTRAINT PK_tl_quest_hdr PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/oracle/TestAnalysis.sql
-- DROP TABLE rs_test_analysis; -- DROP TABLE tl_test_analysis;
CREATE TABLE rs_test_analysis ( CREATE TABLE tl_test_analysis (
object_id number(12) NOT NULL , object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
...@@ -15,16 +15,16 @@ CREATE TABLE rs_test_analysis ( ...@@ -15,16 +15,16 @@ CREATE TABLE rs_test_analysis (
ALTER TABLE rs_test_analysis ADD ALTER TABLE tl_test_analysis ADD
CONSTRAINT PK_rs_test_analysis PRIMARY KEY CONSTRAINT PK_tl_test_analysis PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_test_analysis_level_id CREATE INDEX idx_tl_test_analysis_level_id
ON rs_test_analysis (level_id); ON tl_test_analysis (level_id);
CREATE INDEX idx_rs_test_analysis_candidate_id CREATE INDEX idx_tl_test_analysis_candidate_id
ON rs_test_analysis (candidate_id); ON tl_test_analysis (candidate_id);
cmsWebApp/sql/postgres/Answer.sql
-- @AutoRun -- @AutoRun
-- drop table rs_answer; -- drop table tl_answer;
CREATE TABLE rs_answer ( CREATE TABLE tl_answer (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -17,13 +17,13 @@ CREATE TABLE rs_answer ( ...@@ -17,13 +17,13 @@ CREATE TABLE rs_answer (
ALTER TABLE rs_answer ADD ALTER TABLE tl_answer ADD
CONSTRAINT pk_rs_answer PRIMARY KEY CONSTRAINT pk_tl_answer PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_answer_candidate_id CREATE INDEX idx_tl_answer_candidate_id
ON rs_answer (candidate_id); ON tl_answer (candidate_id);
cmsWebApp/sql/postgres/Candidate.sql
-- @AutoRun -- @AutoRun
-- drop table rs_candidate; -- drop table tl_candidate;
CREATE TABLE rs_candidate ( CREATE TABLE tl_candidate (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -15,13 +15,13 @@ CREATE TABLE rs_candidate ( ...@@ -15,13 +15,13 @@ CREATE TABLE rs_candidate (
ALTER TABLE rs_candidate ADD ALTER TABLE tl_candidate ADD
CONSTRAINT pk_rs_candidate PRIMARY KEY CONSTRAINT pk_tl_candidate PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_candidate_test_input_id CREATE INDEX idx_tl_candidate_test_input_id
ON rs_candidate (test_input_id); ON tl_candidate (test_input_id);
cmsWebApp/sql/postgres/CultureElement.sql
-- @AutoRun -- @AutoRun
-- drop table rs_culture_element; -- drop table tl_culture_element;
CREATE TABLE rs_culture_element ( CREATE TABLE tl_culture_element (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -15,8 +15,8 @@ CREATE TABLE rs_culture_element ( ...@@ -15,8 +15,8 @@ CREATE TABLE rs_culture_element (
ALTER TABLE rs_culture_element ADD ALTER TABLE tl_culture_element ADD
CONSTRAINT pk_rs_culture_element PRIMARY KEY CONSTRAINT pk_tl_culture_element PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/postgres/CultureElementQuestion.sql
-- @AutoRun -- @AutoRun
-- drop table rs_culture_element_quest; -- drop table tl_culture_element_quest;
CREATE TABLE rs_culture_element_quest ( CREATE TABLE tl_culture_element_quest (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -15,13 +15,13 @@ CREATE TABLE rs_culture_element_quest ( ...@@ -15,13 +15,13 @@ CREATE TABLE rs_culture_element_quest (
ALTER TABLE rs_culture_element_quest ADD ALTER TABLE tl_culture_element_quest ADD
CONSTRAINT pk_rs_culture_element_quest PRIMARY KEY CONSTRAINT pk_tl_culture_element_quest PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_element_quest_culture_element_number CREATE INDEX idx_tl_culture_element_quest_culture_element_number
ON rs_culture_element_quest (culture_element_number); ON tl_culture_element_quest (culture_element_number);
cmsWebApp/sql/postgres/CultureElementRating.sql
-- @AutoRun -- @AutoRun
-- drop table rs_culture_element_rating; -- drop table tl_culture_element_rating;
CREATE TABLE rs_culture_element_rating ( CREATE TABLE tl_culture_element_rating (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -15,13 +15,13 @@ CREATE TABLE rs_culture_element_rating ( ...@@ -15,13 +15,13 @@ CREATE TABLE rs_culture_element_rating (
ALTER TABLE rs_culture_element_rating ADD ALTER TABLE tl_culture_element_rating ADD
CONSTRAINT pk_rs_culture_element_rating PRIMARY KEY CONSTRAINT pk_tl_culture_element_rating PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_element_rating_culture_element_number CREATE INDEX idx_tl_culture_element_rating_culture_element_number
ON rs_culture_element_rating (culture_element_number); ON tl_culture_element_rating (culture_element_number);
cmsWebApp/sql/postgres/CultureNarrative.sql
-- @AutoRun -- @AutoRun
-- drop table rs_culture_narrative; -- drop table tl_culture_narrative;
CREATE TABLE rs_culture_narrative ( CREATE TABLE tl_culture_narrative (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -18,19 +18,19 @@ CREATE TABLE rs_culture_narrative ( ...@@ -18,19 +18,19 @@ CREATE TABLE rs_culture_narrative (
ALTER TABLE rs_culture_narrative ADD ALTER TABLE tl_culture_narrative ADD
CONSTRAINT pk_rs_culture_narrative PRIMARY KEY CONSTRAINT pk_tl_culture_narrative PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_culture_narrative_culture_element_number CREATE INDEX idx_tl_culture_narrative_culture_element_number
ON rs_culture_narrative (culture_element_number); ON tl_culture_narrative (culture_element_number);
CREATE INDEX idx_rs_culture_narrative_culture_element_quest_id CREATE INDEX idx_tl_culture_narrative_culture_element_quest_id
ON rs_culture_narrative (culture_element_quest_id); ON tl_culture_narrative (culture_element_quest_id);
CREATE INDEX idx_rs_culture_narrative_culture_element_rating_id CREATE INDEX idx_tl_culture_narrative_culture_element_rating_id
ON rs_culture_narrative (culture_element_rating_id); ON tl_culture_narrative (culture_element_rating_id);
cmsWebApp/sql/postgres/Factor.sql
-- @AutoRun -- @AutoRun
-- drop table rs_factor; -- drop table tl_factor;
CREATE TABLE rs_factor ( CREATE TABLE tl_factor (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -14,8 +14,8 @@ CREATE TABLE rs_factor ( ...@@ -14,8 +14,8 @@ CREATE TABLE rs_factor (
ALTER TABLE rs_factor ADD ALTER TABLE tl_factor ADD
CONSTRAINT pk_rs_factor PRIMARY KEY CONSTRAINT pk_tl_factor PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/postgres/FactorLevelLink.sql
-- @AutoRun -- @AutoRun
-- drop table rs_factor_hdr; -- drop table tl_factor_hdr;
CREATE TABLE rs_factor_hdr ( CREATE TABLE tl_factor_hdr (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -21,16 +21,16 @@ CREATE TABLE rs_factor_hdr ( ...@@ -21,16 +21,16 @@ CREATE TABLE rs_factor_hdr (
ALTER TABLE rs_factor_hdr ADD ALTER TABLE tl_factor_hdr ADD
CONSTRAINT pk_rs_factor_hdr PRIMARY KEY CONSTRAINT pk_tl_factor_hdr PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_factor_hdr_level_number CREATE INDEX idx_tl_factor_hdr_level_number
ON rs_factor_hdr (level_number); ON tl_factor_hdr (level_number);
CREATE INDEX idx_rs_factor_hdr_factor_number CREATE INDEX idx_tl_factor_hdr_factor_number
ON rs_factor_hdr (factor_number); ON tl_factor_hdr (factor_number);
cmsWebApp/sql/postgres/FactorQuestionLink.sql
-- @AutoRun -- @AutoRun
-- drop table rs_factor_lin; -- drop table tl_factor_lin;
CREATE TABLE rs_factor_lin ( CREATE TABLE tl_factor_lin (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -16,16 +16,16 @@ CREATE TABLE rs_factor_lin ( ...@@ -16,16 +16,16 @@ CREATE TABLE rs_factor_lin (
ALTER TABLE rs_factor_lin ADD ALTER TABLE tl_factor_lin ADD
CONSTRAINT pk_rs_factor_lin PRIMARY KEY CONSTRAINT pk_tl_factor_lin PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_factor_lin_factor_number CREATE INDEX idx_tl_factor_lin_factor_number
ON rs_factor_lin (factor_number); ON tl_factor_lin (factor_number);
CREATE INDEX idx_rs_factor_lin_quest_number CREATE INDEX idx_tl_factor_lin_quest_number
ON rs_factor_lin (quest_number); ON tl_factor_lin (quest_number);
cmsWebApp/sql/postgres/FactorScore.sql
-- @AutoRun -- @AutoRun
-- drop table rs_score; -- drop table tl_score;
CREATE TABLE rs_score ( CREATE TABLE tl_score (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -20,16 +20,16 @@ CREATE TABLE rs_score ( ...@@ -20,16 +20,16 @@ CREATE TABLE rs_score (
ALTER TABLE rs_score ADD ALTER TABLE tl_score ADD
CONSTRAINT pk_rs_score PRIMARY KEY CONSTRAINT pk_tl_score PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_score_test_analysis_id CREATE INDEX idx_tl_score_test_analysis_id
ON rs_score (test_analysis_id); ON tl_score (test_analysis_id);
CREATE INDEX idx_rs_score_narrative_id CREATE INDEX idx_tl_score_narrative_id
ON rs_score (narrative_id); ON tl_score (narrative_id);
cmsWebApp/sql/postgres/FactorScoreResult.sql
-- @AutoRun -- @AutoRun
-- drop table rs_level_factor; -- drop table tl_level_factor;
CREATE TABLE rs_level_factor ( CREATE TABLE tl_level_factor (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -19,19 +19,19 @@ CREATE TABLE rs_level_factor ( ...@@ -19,19 +19,19 @@ CREATE TABLE rs_level_factor (
ALTER TABLE rs_level_factor ADD ALTER TABLE tl_level_factor ADD
CONSTRAINT pk_rs_level_factor PRIMARY KEY CONSTRAINT pk_tl_level_factor PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_level_factor_factor_number CREATE INDEX idx_tl_level_factor_factor_number
ON rs_level_factor (factor_number); ON tl_level_factor (factor_number);
CREATE INDEX idx_rs_level_factor_level_number CREATE INDEX idx_tl_level_factor_level_number
ON rs_level_factor (level_number); ON tl_level_factor (level_number);
CREATE INDEX idx_rs_level_factor_narrative_id CREATE INDEX idx_tl_level_factor_narrative_id
ON rs_level_factor (narrative_id); ON tl_level_factor (narrative_id);
cmsWebApp/sql/postgres/Level.sql
-- @AutoRun -- @AutoRun
-- drop table rs_level; -- drop table tl_level;
CREATE TABLE rs_level ( CREATE TABLE tl_level (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -16,8 +16,8 @@ CREATE TABLE rs_level ( ...@@ -16,8 +16,8 @@ CREATE TABLE rs_level (
ALTER TABLE rs_level ADD ALTER TABLE tl_level ADD
CONSTRAINT pk_rs_level PRIMARY KEY CONSTRAINT pk_tl_level PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/postgres/Narrative.sql
-- @AutoRun -- @AutoRun
-- drop table rs_narrative; -- drop table tl_narrative;
CREATE TABLE rs_narrative ( CREATE TABLE tl_narrative (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -22,13 +22,13 @@ CREATE TABLE rs_narrative ( ...@@ -22,13 +22,13 @@ CREATE TABLE rs_narrative (
ALTER TABLE rs_narrative ADD ALTER TABLE tl_narrative ADD
CONSTRAINT pk_rs_narrative PRIMARY KEY CONSTRAINT pk_tl_narrative PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_narrative_level_number CREATE INDEX idx_tl_narrative_level_number
ON rs_narrative (level_number); ON tl_narrative (level_number);
cmsWebApp/sql/postgres/Question.sql
-- @AutoRun -- @AutoRun
-- drop table rs_quest_lin; -- drop table tl_quest_lin;
CREATE TABLE rs_quest_lin ( CREATE TABLE tl_quest_lin (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -15,13 +15,13 @@ CREATE TABLE rs_quest_lin ( ...@@ -15,13 +15,13 @@ CREATE TABLE rs_quest_lin (
ALTER TABLE rs_quest_lin ADD ALTER TABLE tl_quest_lin ADD
CONSTRAINT pk_rs_quest_lin PRIMARY KEY CONSTRAINT pk_tl_quest_lin PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_quest_lin_section_number CREATE INDEX idx_tl_quest_lin_section_number
ON rs_quest_lin (section_number); ON tl_quest_lin (section_number);
cmsWebApp/sql/postgres/Section.sql
-- @AutoRun -- @AutoRun
-- drop table rs_quest_hdr; -- drop table tl_quest_hdr;
CREATE TABLE rs_quest_hdr ( CREATE TABLE tl_quest_hdr (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -15,8 +15,8 @@ CREATE TABLE rs_quest_hdr ( ...@@ -15,8 +15,8 @@ CREATE TABLE rs_quest_hdr (
ALTER TABLE rs_quest_hdr ADD ALTER TABLE tl_quest_hdr ADD
CONSTRAINT pk_rs_quest_hdr PRIMARY KEY CONSTRAINT pk_tl_quest_hdr PRIMARY KEY
( (
object_id object_id
) ; ) ;
......
cmsWebApp/sql/postgres/TestAnalysis.sql
-- @AutoRun -- @AutoRun
-- drop table rs_test_analysis; -- drop table tl_test_analysis;
CREATE TABLE rs_test_analysis ( CREATE TABLE tl_test_analysis (
object_id numeric(12) NOT NULL , object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
...@@ -15,16 +15,16 @@ CREATE TABLE rs_test_analysis ( ...@@ -15,16 +15,16 @@ CREATE TABLE rs_test_analysis (
ALTER TABLE rs_test_analysis ADD ALTER TABLE tl_test_analysis ADD
CONSTRAINT pk_rs_test_analysis PRIMARY KEY CONSTRAINT pk_tl_test_analysis PRIMARY KEY
( (
object_id object_id
) ; ) ;
CREATE INDEX idx_rs_test_analysis_level_id CREATE INDEX idx_tl_test_analysis_level_id
ON rs_test_analysis (level_id); ON tl_test_analysis (level_id);
CREATE INDEX idx_rs_test_analysis_candidate_id CREATE INDEX idx_tl_test_analysis_candidate_id
ON rs_test_analysis (candidate_id); ON tl_test_analysis (candidate_id);
cmsWebApp/src/performa/orm/Answer.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<BUSINESSCLASS name="Answer" package="performa.orm"> <BUSINESSCLASS name="Answer" package="performa.orm">
<TABLE name="rs_answer" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_answer" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="AnswerNo" type="Integer" dbcol="answer_number"/> <ATTRIB name="AnswerNo" type="Integer" dbcol="answer_number"/>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_answer.object_id is not null" orderBy="rs_answer.object_id" /> <SEARCH type="All" paramFilter="tl_answer.object_id is not null" orderBy="tl_answer.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/AnswerPersistenceMgr.java
...@@ -41,7 +41,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -41,7 +41,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_answer.object_id as id, {PREFIX}rs_answer.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_answer.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_answer.answer_number, {PREFIX}rs_answer.section_number, {PREFIX}rs_answer.candidate_id, {PREFIX}rs_answer.quest_number, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_answer.object_id as id, {PREFIX}tl_answer.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_answer.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_answer.answer_number, {PREFIX}tl_answer.section_number, {PREFIX}tl_answer.candidate_id, {PREFIX}tl_answer.quest_number, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -86,16 +86,16 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -86,16 +86,16 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_answerPSet = allPSets.getPersistentSet(id, "rs_answer", PersistentSetStatus.FETCHED); PersistentSet tl_answerPSet = allPSets.getPersistentSet(id, "tl_answer", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_answerPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_answerPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_answerPSet.containsAttrib(Answer.FIELD_AnswerNo)|| !tl_answerPSet.containsAttrib(Answer.FIELD_AnswerNo)||
!rs_answerPSet.containsAttrib(Answer.SINGLEREFERENCE_Section)|| !tl_answerPSet.containsAttrib(Answer.SINGLEREFERENCE_Section)||
!rs_answerPSet.containsAttrib(Answer.SINGLEREFERENCE_Candidate)|| !tl_answerPSet.containsAttrib(Answer.SINGLEREFERENCE_Candidate)||
!rs_answerPSet.containsAttrib(Answer.SINGLEREFERENCE_Question)) !tl_answerPSet.containsAttrib(Answer.SINGLEREFERENCE_Question))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -118,8 +118,8 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -118,8 +118,8 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_answer " + "FROM {PREFIX}tl_answer " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_answer.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_answer.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -144,7 +144,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -144,7 +144,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (Answer.SINGLEREFERENCE_Candidate)) else if (refName.equals (Answer.SINGLEREFERENCE_Candidate))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_answer " + "FROM {PREFIX}tl_answer " +
"WHERE " + SELECT_JOINS + "candidate_id = ?"; "WHERE " + SELECT_JOINS + "candidate_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -166,47 +166,47 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -166,47 +166,47 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_answerPSet = allPSets.getPersistentSet(objectID, "rs_answer"); PersistentSet tl_answerPSet = allPSets.getPersistentSet(objectID, "tl_answer");
if (rs_answerPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_answerPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_answerPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_answerPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_answer " + "UPDATE {PREFIX}tl_answer " +
"SET answer_number = ?, section_number = ? , candidate_id = ? , quest_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET answer_number = ?, section_number = ? , candidate_id = ? , quest_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_answer.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_answer.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_AnswerNo.getForSQL(dummyAnswerNo, rs_answerPSet.getAttrib (Answer.FIELD_AnswerNo))).listEntry (SQLManager.CheckNull((Long)(rs_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Section)))).listEntry (SQLManager.CheckNull((Long)(rs_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Candidate)))).listEntry (SQLManager.CheckNull((Long)(rs_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Question)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_AnswerNo.getForSQL(dummyAnswerNo, tl_answerPSet.getAttrib (Answer.FIELD_AnswerNo))).listEntry (SQLManager.CheckNull((Long)(tl_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Section)))).listEntry (SQLManager.CheckNull((Long)(tl_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Candidate)))).listEntry (SQLManager.CheckNull((Long)(tl_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Question)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_answer WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_answer WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_answer", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_answer", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (AnswerPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (AnswerPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_answer"); throw new ConcurrentUpdateConflictException (obj, "tl_answer");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_answer for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_answer for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (AnswerPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (AnswerPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_answerPSet.setStatus (PersistentSetStatus.PROCESSED); tl_answerPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -221,42 +221,42 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -221,42 +221,42 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_answerPSet = allPSets.getPersistentSet(objectID, "rs_answer"); PersistentSet tl_answerPSet = allPSets.getPersistentSet(objectID, "tl_answer");
LogMgr.log (AnswerPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (AnswerPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_answerPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_answerPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_answerPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_answerPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_answer " + "FROM {PREFIX}tl_answer " +
"WHERE rs_answer.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_answer.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_answer WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_answer WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_answer"); throw new ConcurrentUpdateConflictException (obj, "tl_answer");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_answer for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_answer for row:" + objectID;
LogMgr.log (AnswerPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (AnswerPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_answerPSet.setStatus (PersistentSetStatus.PROCESSED); tl_answerPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -311,7 +311,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -311,7 +311,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_answerPSet = allPSets.getPersistentSet(objectID, "rs_answer", PersistentSetStatus.FETCHED); PersistentSet tl_answerPSet = allPSets.getPersistentSet(objectID, "tl_answer", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -370,7 +370,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -370,7 +370,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_answer " + tables + "FROM {PREFIX}tl_answer " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -386,12 +386,12 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -386,12 +386,12 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_answer.object_id"; String orderBy = " ORDER BY tl_answer.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_answer.object_id is not null Object[] searchParams; // paramFilter: tl_answer.object_id is not null
String preFilter = "(rs_answer.object_id is not null)" String preFilter = "(tl_answer.object_id is not null)"
+ " "; + " ";
...@@ -406,7 +406,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -406,7 +406,7 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_answer " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_answer " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -426,19 +426,19 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -426,19 +426,19 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_answerPSet = allPSets.getPersistentSet(objectID, "rs_answer", PersistentSetStatus.FETCHED); PersistentSet tl_answerPSet = allPSets.getPersistentSet(objectID, "tl_answer", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_answerPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_answerPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_answerPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_answerPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_answerPSet.setAttrib(Answer.FIELD_AnswerNo, HELPER_AnswerNo.getFromRS(dummyAnswerNo, r, "answer_number")); tl_answerPSet.setAttrib(Answer.FIELD_AnswerNo, HELPER_AnswerNo.getFromRS(dummyAnswerNo, r, "answer_number"));
rs_answerPSet.setAttrib(Answer.SINGLEREFERENCE_Section, r.getObject ("section_number")); tl_answerPSet.setAttrib(Answer.SINGLEREFERENCE_Section, r.getObject ("section_number"));
rs_answerPSet.setAttrib(Answer.SINGLEREFERENCE_Candidate, r.getObject ("candidate_id")); tl_answerPSet.setAttrib(Answer.SINGLEREFERENCE_Candidate, r.getObject ("candidate_id"));
rs_answerPSet.setAttrib(Answer.SINGLEREFERENCE_Question, r.getObject ("quest_number")); tl_answerPSet.setAttrib(Answer.SINGLEREFERENCE_Question, r.getObject ("quest_number"));
} }
...@@ -446,21 +446,21 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr ...@@ -446,21 +446,21 @@ public class AnswerPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_answerPSet = allPSets.getPersistentSet(objectID, "rs_answer"); PersistentSet tl_answerPSet = allPSets.getPersistentSet(objectID, "tl_answer");
if (rs_answerPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_answerPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_answerPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_answerPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_answer " + "INSERT INTO {PREFIX}tl_answer " +
" (answer_number, section_number, candidate_id, quest_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (answer_number, section_number, candidate_id, quest_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_AnswerNo.getForSQL(dummyAnswerNo, rs_answerPSet.getAttrib (Answer.FIELD_AnswerNo))) .listEntry (SQLManager.CheckNull((Long)(rs_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Section)))).listEntry (SQLManager.CheckNull((Long)(rs_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Candidate)))).listEntry (SQLManager.CheckNull((Long)(rs_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Question)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_AnswerNo.getForSQL(dummyAnswerNo, tl_answerPSet.getAttrib (Answer.FIELD_AnswerNo))) .listEntry (SQLManager.CheckNull((Long)(tl_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Section)))).listEntry (SQLManager.CheckNull((Long)(tl_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Candidate)))).listEntry (SQLManager.CheckNull((Long)(tl_answerPSet.getAttrib (Answer.SINGLEREFERENCE_Question)))) .listEntry (objectID.longID ()).toList().toArray());
rs_answerPSet.setStatus (PersistentSetStatus.PROCESSED); tl_answerPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/BaseAnswer.java
...@@ -199,9 +199,9 @@ public abstract class BaseAnswer extends BaseBusinessClass ...@@ -199,9 +199,9 @@ public abstract class BaseAnswer extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_Section = new SingleAssociation<Answer, Section> (this, SINGLEREFERENCE_Section, null, Section.REFERENCE_Section, "rs_answer"); _Section = new SingleAssociation<Answer, Section> (this, SINGLEREFERENCE_Section, null, Section.REFERENCE_Section, "tl_answer");
_Candidate = new SingleAssociation<Answer, Candidate> (this, SINGLEREFERENCE_Candidate, Candidate.MULTIPLEREFERENCE_Answers, Candidate.REFERENCE_Candidate, "rs_answer"); _Candidate = new SingleAssociation<Answer, Candidate> (this, SINGLEREFERENCE_Candidate, Candidate.MULTIPLEREFERENCE_Answers, Candidate.REFERENCE_Candidate, "tl_answer");
_Question = new SingleAssociation<Answer, Question> (this, SINGLEREFERENCE_Question, null, Question.REFERENCE_Question, "rs_answer"); _Question = new SingleAssociation<Answer, Question> (this, SINGLEREFERENCE_Question, null, Question.REFERENCE_Question, "tl_answer");
} }
...@@ -211,9 +211,9 @@ public abstract class BaseAnswer extends BaseBusinessClass ...@@ -211,9 +211,9 @@ public abstract class BaseAnswer extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_Section = new SingleAssociation<Answer, Section> (this, SINGLEREFERENCE_Section, null, Section.REFERENCE_Section, "rs_answer"); _Section = new SingleAssociation<Answer, Section> (this, SINGLEREFERENCE_Section, null, Section.REFERENCE_Section, "tl_answer");
_Candidate = new SingleAssociation<Answer, Candidate> (this, SINGLEREFERENCE_Candidate, Candidate.MULTIPLEREFERENCE_Answers, Candidate.REFERENCE_Candidate, "rs_answer"); _Candidate = new SingleAssociation<Answer, Candidate> (this, SINGLEREFERENCE_Candidate, Candidate.MULTIPLEREFERENCE_Answers, Candidate.REFERENCE_Candidate, "tl_answer");
_Question = new SingleAssociation<Answer, Question> (this, SINGLEREFERENCE_Question, null, Question.REFERENCE_Question, "rs_answer"); _Question = new SingleAssociation<Answer, Question> (this, SINGLEREFERENCE_Question, null, Question.REFERENCE_Question, "tl_answer");
return this; return this;
...@@ -922,7 +922,7 @@ public abstract class BaseAnswer extends BaseBusinessClass ...@@ -922,7 +922,7 @@ public abstract class BaseAnswer extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_answer"; return "tl_answer";
} }
...@@ -943,10 +943,10 @@ public abstract class BaseAnswer extends BaseBusinessClass ...@@ -943,10 +943,10 @@ public abstract class BaseAnswer extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_answerPSet = allSets.getPersistentSet (myID, "rs_answer", myPSetStatus); PersistentSet tl_answerPSet = allSets.getPersistentSet (myID, "tl_answer", myPSetStatus);
rs_answerPSet.setAttrib (FIELD_ObjectID, myID); tl_answerPSet.setAttrib (FIELD_ObjectID, myID);
rs_answerPSet.setAttrib (FIELD_AnswerNo, HELPER_AnswerNo.toObject (_AnswerNo)); // tl_answerPSet.setAttrib (FIELD_AnswerNo, HELPER_AnswerNo.toObject (_AnswerNo)); //
_Section.getPersistentSets (allSets); _Section.getPersistentSets (allSets);
_Candidate.getPersistentSets (allSets); _Candidate.getPersistentSets (allSets);
_Question.getPersistentSets (allSets); _Question.getPersistentSets (allSets);
...@@ -962,9 +962,9 @@ public abstract class BaseAnswer extends BaseBusinessClass ...@@ -962,9 +962,9 @@ public abstract class BaseAnswer extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_answerPSet = allSets.getPersistentSet (objectID, "rs_answer"); PersistentSet tl_answerPSet = allSets.getPersistentSet (objectID, "tl_answer");
_AnswerNo = (Integer)(HELPER_AnswerNo.fromObject (_AnswerNo, rs_answerPSet.getAttrib (FIELD_AnswerNo))); // _AnswerNo = (Integer)(HELPER_AnswerNo.fromObject (_AnswerNo, tl_answerPSet.getAttrib (FIELD_AnswerNo))); //
_Section.setFromPersistentSets (objectID, allSets); _Section.setFromPersistentSets (objectID, allSets);
_Candidate.setFromPersistentSets (objectID, allSets); _Candidate.setFromPersistentSets (objectID, allSets);
_Question.setFromPersistentSets (objectID, allSets); _Question.setFromPersistentSets (objectID, allSets);
...@@ -1203,44 +1203,44 @@ public abstract class BaseAnswer extends BaseBusinessClass ...@@ -1203,44 +1203,44 @@ public abstract class BaseAnswer extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_answer.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_answer.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_answer.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_answer.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_answer.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_answer.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andAnswerNo (QueryFilter<Integer> filter) public SearchAll andAnswerNo (QueryFilter<Integer> filter)
{ {
filter.addFilter (context, "rs_answer.answer_number", "AnswerNo"); filter.addFilter (context, "tl_answer.answer_number", "AnswerNo");
return this; return this;
} }
public SearchAll andSection (QueryFilter<Section> filter) public SearchAll andSection (QueryFilter<Section> filter)
{ {
filter.addFilter (context, "rs_answer.section_number", "Section"); filter.addFilter (context, "tl_answer.section_number", "Section");
return this; return this;
} }
public SearchAll andCandidate (QueryFilter<Candidate> filter) public SearchAll andCandidate (QueryFilter<Candidate> filter)
{ {
filter.addFilter (context, "rs_answer.candidate_id", "Candidate"); filter.addFilter (context, "tl_answer.candidate_id", "Candidate");
return this; return this;
} }
public SearchAll andQuestion (QueryFilter<Question> filter) public SearchAll andQuestion (QueryFilter<Question> filter)
{ {
filter.addFilter (context, "rs_answer.quest_number", "Question"); filter.addFilter (context, "tl_answer.quest_number", "Question");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseCandidate.java
...@@ -204,7 +204,7 @@ public abstract class BaseCandidate extends BaseBusinessClass ...@@ -204,7 +204,7 @@ public abstract class BaseCandidate extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_TestInput = new SingleAssociation<Candidate, TestInput> (this, SINGLEREFERENCE_TestInput, TestInput.MULTIPLEREFERENCE_Candidates, TestInput.REFERENCE_TestInput, "rs_candidate"); _TestInput = new SingleAssociation<Candidate, TestInput> (this, SINGLEREFERENCE_TestInput, TestInput.MULTIPLEREFERENCE_Candidates, TestInput.REFERENCE_TestInput, "tl_candidate");
_TestAnalysises = new MultipleAssociation<Candidate, TestAnalysis> (this, MULTIPLEREFERENCE_TestAnalysises, TestAnalysis.SINGLEREFERENCE_Candidate, TestAnalysis.REFERENCE_TestAnalysis); _TestAnalysises = new MultipleAssociation<Candidate, TestAnalysis> (this, MULTIPLEREFERENCE_TestAnalysises, TestAnalysis.SINGLEREFERENCE_Candidate, TestAnalysis.REFERENCE_TestAnalysis);
_Answers = new MultipleAssociation<Candidate, Answer> (this, MULTIPLEREFERENCE_Answers, Answer.SINGLEREFERENCE_Candidate, Answer.REFERENCE_Answer); _Answers = new MultipleAssociation<Candidate, Answer> (this, MULTIPLEREFERENCE_Answers, Answer.SINGLEREFERENCE_Candidate, Answer.REFERENCE_Answer);
...@@ -216,7 +216,7 @@ public abstract class BaseCandidate extends BaseBusinessClass ...@@ -216,7 +216,7 @@ public abstract class BaseCandidate extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_TestInput = new SingleAssociation<Candidate, TestInput> (this, SINGLEREFERENCE_TestInput, TestInput.MULTIPLEREFERENCE_Candidates, TestInput.REFERENCE_TestInput, "rs_candidate"); _TestInput = new SingleAssociation<Candidate, TestInput> (this, SINGLEREFERENCE_TestInput, TestInput.MULTIPLEREFERENCE_Candidates, TestInput.REFERENCE_TestInput, "tl_candidate");
_TestAnalysises = new MultipleAssociation<Candidate, TestAnalysis> (this, MULTIPLEREFERENCE_TestAnalysises, TestAnalysis.SINGLEREFERENCE_Candidate, TestAnalysis.REFERENCE_TestAnalysis); _TestAnalysises = new MultipleAssociation<Candidate, TestAnalysis> (this, MULTIPLEREFERENCE_TestAnalysises, TestAnalysis.SINGLEREFERENCE_Candidate, TestAnalysis.REFERENCE_TestAnalysis);
_Answers = new MultipleAssociation<Candidate, Answer> (this, MULTIPLEREFERENCE_Answers, Answer.SINGLEREFERENCE_Candidate, Answer.REFERENCE_Answer); _Answers = new MultipleAssociation<Candidate, Answer> (this, MULTIPLEREFERENCE_Answers, Answer.SINGLEREFERENCE_Candidate, Answer.REFERENCE_Answer);
...@@ -943,7 +943,7 @@ public abstract class BaseCandidate extends BaseBusinessClass ...@@ -943,7 +943,7 @@ public abstract class BaseCandidate extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_candidate"; return "tl_candidate";
} }
...@@ -964,10 +964,10 @@ public abstract class BaseCandidate extends BaseBusinessClass ...@@ -964,10 +964,10 @@ public abstract class BaseCandidate extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_candidatePSet = allSets.getPersistentSet (myID, "rs_candidate", myPSetStatus); PersistentSet tl_candidatePSet = allSets.getPersistentSet (myID, "tl_candidate", myPSetStatus);
rs_candidatePSet.setAttrib (FIELD_ObjectID, myID); tl_candidatePSet.setAttrib (FIELD_ObjectID, myID);
rs_candidatePSet.setAttrib (FIELD_FirstName, HELPER_FirstName.toObject (_FirstName)); // tl_candidatePSet.setAttrib (FIELD_FirstName, HELPER_FirstName.toObject (_FirstName)); //
_TestInput.getPersistentSets (allSets); _TestInput.getPersistentSets (allSets);
} }
...@@ -981,9 +981,9 @@ public abstract class BaseCandidate extends BaseBusinessClass ...@@ -981,9 +981,9 @@ public abstract class BaseCandidate extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_candidatePSet = allSets.getPersistentSet (objectID, "rs_candidate"); PersistentSet tl_candidatePSet = allSets.getPersistentSet (objectID, "tl_candidate");
_FirstName = (String)(HELPER_FirstName.fromObject (_FirstName, rs_candidatePSet.getAttrib (FIELD_FirstName))); // _FirstName = (String)(HELPER_FirstName.fromObject (_FirstName, tl_candidatePSet.getAttrib (FIELD_FirstName))); //
_TestInput.setFromPersistentSets (objectID, allSets); _TestInput.setFromPersistentSets (objectID, allSets);
} }
...@@ -1212,32 +1212,32 @@ public abstract class BaseCandidate extends BaseBusinessClass ...@@ -1212,32 +1212,32 @@ public abstract class BaseCandidate extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_candidate.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_candidate.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_candidate.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_candidate.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_candidate.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_candidate.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andFirstName (QueryFilter<String> filter) public SearchAll andFirstName (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_candidate.first_name", "FirstName"); filter.addFilter (context, "tl_candidate.first_name", "FirstName");
return this; return this;
} }
public SearchAll andTestInput (QueryFilter<TestInput> filter) public SearchAll andTestInput (QueryFilter<TestInput> filter)
{ {
filter.addFilter (context, "rs_candidate.test_input_id", "TestInput"); filter.addFilter (context, "tl_candidate.test_input_id", "TestInput");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseCultureElement.java
...@@ -1048,7 +1048,7 @@ public abstract class BaseCultureElement extends BaseBusinessClass ...@@ -1048,7 +1048,7 @@ public abstract class BaseCultureElement extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_culture_element"; return "tl_culture_element";
} }
...@@ -1069,11 +1069,11 @@ public abstract class BaseCultureElement extends BaseBusinessClass ...@@ -1069,11 +1069,11 @@ public abstract class BaseCultureElement extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_culture_elementPSet = allSets.getPersistentSet (myID, "rs_culture_element", myPSetStatus); PersistentSet tl_culture_elementPSet = allSets.getPersistentSet (myID, "tl_culture_element", myPSetStatus);
rs_culture_elementPSet.setAttrib (FIELD_ObjectID, myID); tl_culture_elementPSet.setAttrib (FIELD_ObjectID, myID);
rs_culture_elementPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); // tl_culture_elementPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); //
rs_culture_elementPSet.setAttrib (FIELD_CultureClass, HELPER_CultureClass.toObject (_CultureClass)); // tl_culture_elementPSet.setAttrib (FIELD_CultureClass, HELPER_CultureClass.toObject (_CultureClass)); //
} }
...@@ -1086,10 +1086,10 @@ public abstract class BaseCultureElement extends BaseBusinessClass ...@@ -1086,10 +1086,10 @@ public abstract class BaseCultureElement extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_culture_elementPSet = allSets.getPersistentSet (objectID, "rs_culture_element"); PersistentSet tl_culture_elementPSet = allSets.getPersistentSet (objectID, "tl_culture_element");
_Description = (String)(HELPER_Description.fromObject (_Description, rs_culture_elementPSet.getAttrib (FIELD_Description))); // _Description = (String)(HELPER_Description.fromObject (_Description, tl_culture_elementPSet.getAttrib (FIELD_Description))); //
_CultureClass = (CultureClass)(HELPER_CultureClass.fromObject (_CultureClass, rs_culture_elementPSet.getAttrib (FIELD_CultureClass))); // _CultureClass = (CultureClass)(HELPER_CultureClass.fromObject (_CultureClass, tl_culture_elementPSet.getAttrib (FIELD_CultureClass))); //
} }
...@@ -1334,32 +1334,32 @@ public abstract class BaseCultureElement extends BaseBusinessClass ...@@ -1334,32 +1334,32 @@ public abstract class BaseCultureElement extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_culture_element.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_culture_element.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_culture_element.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_culture_element.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_culture_element.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_culture_element.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andDescription (QueryFilter<String> filter) public SearchAll andDescription (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_culture_element.culture_element_desc", "Description"); filter.addFilter (context, "tl_culture_element.culture_element_desc", "Description");
return this; return this;
} }
public SearchAll andCultureClass (QueryFilter<CultureClass> filter) public SearchAll andCultureClass (QueryFilter<CultureClass> filter)
{ {
filter.addFilter (context, "rs_culture_element.culture_class_code", "CultureClass"); filter.addFilter (context, "tl_culture_element.culture_class_code", "CultureClass");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseCultureElementQuestion.java
...@@ -185,7 +185,7 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass ...@@ -185,7 +185,7 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_CultureElement = new SingleAssociation<CultureElementQuestion, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Questions, CultureElement.REFERENCE_CultureElement, "rs_culture_element_quest"); _CultureElement = new SingleAssociation<CultureElementQuestion, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Questions, CultureElement.REFERENCE_CultureElement, "tl_culture_element_quest");
_Narratives = new MultipleAssociation<CultureElementQuestion, CultureNarrative> (this, MULTIPLEREFERENCE_Narratives, CultureNarrative.SINGLEREFERENCE_CultureElementQuestion, CultureNarrative.REFERENCE_CultureNarrative); _Narratives = new MultipleAssociation<CultureElementQuestion, CultureNarrative> (this, MULTIPLEREFERENCE_Narratives, CultureNarrative.SINGLEREFERENCE_CultureElementQuestion, CultureNarrative.REFERENCE_CultureNarrative);
} }
...@@ -196,7 +196,7 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass ...@@ -196,7 +196,7 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_CultureElement = new SingleAssociation<CultureElementQuestion, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Questions, CultureElement.REFERENCE_CultureElement, "rs_culture_element_quest"); _CultureElement = new SingleAssociation<CultureElementQuestion, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Questions, CultureElement.REFERENCE_CultureElement, "tl_culture_element_quest");
_Narratives = new MultipleAssociation<CultureElementQuestion, CultureNarrative> (this, MULTIPLEREFERENCE_Narratives, CultureNarrative.SINGLEREFERENCE_CultureElementQuestion, CultureNarrative.REFERENCE_CultureNarrative); _Narratives = new MultipleAssociation<CultureElementQuestion, CultureNarrative> (this, MULTIPLEREFERENCE_Narratives, CultureNarrative.SINGLEREFERENCE_CultureElementQuestion, CultureNarrative.REFERENCE_CultureNarrative);
...@@ -800,7 +800,7 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass ...@@ -800,7 +800,7 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_culture_element_quest"; return "tl_culture_element_quest";
} }
...@@ -821,10 +821,10 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass ...@@ -821,10 +821,10 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_culture_element_questPSet = allSets.getPersistentSet (myID, "rs_culture_element_quest", myPSetStatus); PersistentSet tl_culture_element_questPSet = allSets.getPersistentSet (myID, "tl_culture_element_quest", myPSetStatus);
rs_culture_element_questPSet.setAttrib (FIELD_ObjectID, myID); tl_culture_element_questPSet.setAttrib (FIELD_ObjectID, myID);
rs_culture_element_questPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); // tl_culture_element_questPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); //
_CultureElement.getPersistentSets (allSets); _CultureElement.getPersistentSets (allSets);
} }
...@@ -838,9 +838,9 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass ...@@ -838,9 +838,9 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_culture_element_questPSet = allSets.getPersistentSet (objectID, "rs_culture_element_quest"); PersistentSet tl_culture_element_questPSet = allSets.getPersistentSet (objectID, "tl_culture_element_quest");
_Description = (String)(HELPER_Description.fromObject (_Description, rs_culture_element_questPSet.getAttrib (FIELD_Description))); // _Description = (String)(HELPER_Description.fromObject (_Description, tl_culture_element_questPSet.getAttrib (FIELD_Description))); //
_CultureElement.setFromPersistentSets (objectID, allSets); _CultureElement.setFromPersistentSets (objectID, allSets);
} }
...@@ -1060,32 +1060,32 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass ...@@ -1060,32 +1060,32 @@ public abstract class BaseCultureElementQuestion extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_culture_element_quest.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_culture_element_quest.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_culture_element_quest.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_culture_element_quest.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_culture_element_quest.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_culture_element_quest.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andDescription (QueryFilter<String> filter) public SearchAll andDescription (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_culture_element_quest.quest", "Description"); filter.addFilter (context, "tl_culture_element_quest.quest", "Description");
return this; return this;
} }
public SearchAll andCultureElement (QueryFilter<CultureElement> filter) public SearchAll andCultureElement (QueryFilter<CultureElement> filter)
{ {
filter.addFilter (context, "rs_culture_element_quest.culture_element_number", "CultureElement"); filter.addFilter (context, "tl_culture_element_quest.culture_element_number", "CultureElement");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseCultureElementRating.java
...@@ -185,7 +185,7 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass ...@@ -185,7 +185,7 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_CultureElement = new SingleAssociation<CultureElementRating, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Ratings, CultureElement.REFERENCE_CultureElement, "rs_culture_element_rating"); _CultureElement = new SingleAssociation<CultureElementRating, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Ratings, CultureElement.REFERENCE_CultureElement, "tl_culture_element_rating");
_Narratives = new MultipleAssociation<CultureElementRating, CultureNarrative> (this, MULTIPLEREFERENCE_Narratives, CultureNarrative.SINGLEREFERENCE_CultureElementRating, CultureNarrative.REFERENCE_CultureNarrative); _Narratives = new MultipleAssociation<CultureElementRating, CultureNarrative> (this, MULTIPLEREFERENCE_Narratives, CultureNarrative.SINGLEREFERENCE_CultureElementRating, CultureNarrative.REFERENCE_CultureNarrative);
} }
...@@ -196,7 +196,7 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass ...@@ -196,7 +196,7 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_CultureElement = new SingleAssociation<CultureElementRating, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Ratings, CultureElement.REFERENCE_CultureElement, "rs_culture_element_rating"); _CultureElement = new SingleAssociation<CultureElementRating, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Ratings, CultureElement.REFERENCE_CultureElement, "tl_culture_element_rating");
_Narratives = new MultipleAssociation<CultureElementRating, CultureNarrative> (this, MULTIPLEREFERENCE_Narratives, CultureNarrative.SINGLEREFERENCE_CultureElementRating, CultureNarrative.REFERENCE_CultureNarrative); _Narratives = new MultipleAssociation<CultureElementRating, CultureNarrative> (this, MULTIPLEREFERENCE_Narratives, CultureNarrative.SINGLEREFERENCE_CultureElementRating, CultureNarrative.REFERENCE_CultureNarrative);
...@@ -800,7 +800,7 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass ...@@ -800,7 +800,7 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_culture_element_rating"; return "tl_culture_element_rating";
} }
...@@ -821,10 +821,10 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass ...@@ -821,10 +821,10 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_culture_element_ratingPSet = allSets.getPersistentSet (myID, "rs_culture_element_rating", myPSetStatus); PersistentSet tl_culture_element_ratingPSet = allSets.getPersistentSet (myID, "tl_culture_element_rating", myPSetStatus);
rs_culture_element_ratingPSet.setAttrib (FIELD_ObjectID, myID); tl_culture_element_ratingPSet.setAttrib (FIELD_ObjectID, myID);
rs_culture_element_ratingPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); // tl_culture_element_ratingPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); //
_CultureElement.getPersistentSets (allSets); _CultureElement.getPersistentSets (allSets);
} }
...@@ -838,9 +838,9 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass ...@@ -838,9 +838,9 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_culture_element_ratingPSet = allSets.getPersistentSet (objectID, "rs_culture_element_rating"); PersistentSet tl_culture_element_ratingPSet = allSets.getPersistentSet (objectID, "tl_culture_element_rating");
_Description = (String)(HELPER_Description.fromObject (_Description, rs_culture_element_ratingPSet.getAttrib (FIELD_Description))); // _Description = (String)(HELPER_Description.fromObject (_Description, tl_culture_element_ratingPSet.getAttrib (FIELD_Description))); //
_CultureElement.setFromPersistentSets (objectID, allSets); _CultureElement.setFromPersistentSets (objectID, allSets);
} }
...@@ -1060,32 +1060,32 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass ...@@ -1060,32 +1060,32 @@ public abstract class BaseCultureElementRating extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_culture_element_rating.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_culture_element_rating.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_culture_element_rating.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_culture_element_rating.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_culture_element_rating.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_culture_element_rating.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andDescription (QueryFilter<String> filter) public SearchAll andDescription (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_culture_element_rating.culture_element_rating_desc", "Description"); filter.addFilter (context, "tl_culture_element_rating.culture_element_rating_desc", "Description");
return this; return this;
} }
public SearchAll andCultureElement (QueryFilter<CultureElement> filter) public SearchAll andCultureElement (QueryFilter<CultureElement> filter)
{ {
filter.addFilter (context, "rs_culture_element_rating.culture_element_number", "CultureElement"); filter.addFilter (context, "tl_culture_element_rating.culture_element_number", "CultureElement");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseCultureNarrative.java
...@@ -232,9 +232,9 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass ...@@ -232,9 +232,9 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_CultureElement = new SingleAssociation<CultureNarrative, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Narratives, CultureElement.REFERENCE_CultureElement, "rs_culture_narrative"); _CultureElement = new SingleAssociation<CultureNarrative, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Narratives, CultureElement.REFERENCE_CultureElement, "tl_culture_narrative");
_CultureElementQuestion = new SingleAssociation<CultureNarrative, CultureElementQuestion> (this, SINGLEREFERENCE_CultureElementQuestion, CultureElementQuestion.MULTIPLEREFERENCE_Narratives, CultureElementQuestion.REFERENCE_CultureElementQuestion, "rs_culture_narrative"); _CultureElementQuestion = new SingleAssociation<CultureNarrative, CultureElementQuestion> (this, SINGLEREFERENCE_CultureElementQuestion, CultureElementQuestion.MULTIPLEREFERENCE_Narratives, CultureElementQuestion.REFERENCE_CultureElementQuestion, "tl_culture_narrative");
_CultureElementRating = new SingleAssociation<CultureNarrative, CultureElementRating> (this, SINGLEREFERENCE_CultureElementRating, CultureElementRating.MULTIPLEREFERENCE_Narratives, CultureElementRating.REFERENCE_CultureElementRating, "rs_culture_narrative"); _CultureElementRating = new SingleAssociation<CultureNarrative, CultureElementRating> (this, SINGLEREFERENCE_CultureElementRating, CultureElementRating.MULTIPLEREFERENCE_Narratives, CultureElementRating.REFERENCE_CultureElementRating, "tl_culture_narrative");
} }
...@@ -244,9 +244,9 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass ...@@ -244,9 +244,9 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_CultureElement = new SingleAssociation<CultureNarrative, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Narratives, CultureElement.REFERENCE_CultureElement, "rs_culture_narrative"); _CultureElement = new SingleAssociation<CultureNarrative, CultureElement> (this, SINGLEREFERENCE_CultureElement, CultureElement.MULTIPLEREFERENCE_Narratives, CultureElement.REFERENCE_CultureElement, "tl_culture_narrative");
_CultureElementQuestion = new SingleAssociation<CultureNarrative, CultureElementQuestion> (this, SINGLEREFERENCE_CultureElementQuestion, CultureElementQuestion.MULTIPLEREFERENCE_Narratives, CultureElementQuestion.REFERENCE_CultureElementQuestion, "rs_culture_narrative"); _CultureElementQuestion = new SingleAssociation<CultureNarrative, CultureElementQuestion> (this, SINGLEREFERENCE_CultureElementQuestion, CultureElementQuestion.MULTIPLEREFERENCE_Narratives, CultureElementQuestion.REFERENCE_CultureElementQuestion, "tl_culture_narrative");
_CultureElementRating = new SingleAssociation<CultureNarrative, CultureElementRating> (this, SINGLEREFERENCE_CultureElementRating, CultureElementRating.MULTIPLEREFERENCE_Narratives, CultureElementRating.REFERENCE_CultureElementRating, "rs_culture_narrative"); _CultureElementRating = new SingleAssociation<CultureNarrative, CultureElementRating> (this, SINGLEREFERENCE_CultureElementRating, CultureElementRating.MULTIPLEREFERENCE_Narratives, CultureElementRating.REFERENCE_CultureElementRating, "tl_culture_narrative");
return this; return this;
...@@ -1107,7 +1107,7 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass ...@@ -1107,7 +1107,7 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_culture_narrative"; return "tl_culture_narrative";
} }
...@@ -1128,11 +1128,11 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass ...@@ -1128,11 +1128,11 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_culture_narrativePSet = allSets.getPersistentSet (myID, "rs_culture_narrative", myPSetStatus); PersistentSet tl_culture_narrativePSet = allSets.getPersistentSet (myID, "tl_culture_narrative", myPSetStatus);
rs_culture_narrativePSet.setAttrib (FIELD_ObjectID, myID); tl_culture_narrativePSet.setAttrib (FIELD_ObjectID, myID);
rs_culture_narrativePSet.setAttrib (FIELD_Notes, HELPER_Notes.toObject (_Notes)); // tl_culture_narrativePSet.setAttrib (FIELD_Notes, HELPER_Notes.toObject (_Notes)); //
rs_culture_narrativePSet.setAttrib (FIELD_ColorCode, HELPER_ColorCode.toObject (_ColorCode)); // tl_culture_narrativePSet.setAttrib (FIELD_ColorCode, HELPER_ColorCode.toObject (_ColorCode)); //
_CultureElement.getPersistentSets (allSets); _CultureElement.getPersistentSets (allSets);
_CultureElementQuestion.getPersistentSets (allSets); _CultureElementQuestion.getPersistentSets (allSets);
_CultureElementRating.getPersistentSets (allSets); _CultureElementRating.getPersistentSets (allSets);
...@@ -1148,10 +1148,10 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass ...@@ -1148,10 +1148,10 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_culture_narrativePSet = allSets.getPersistentSet (objectID, "rs_culture_narrative"); PersistentSet tl_culture_narrativePSet = allSets.getPersistentSet (objectID, "tl_culture_narrative");
_Notes = (String)(HELPER_Notes.fromObject (_Notes, rs_culture_narrativePSet.getAttrib (FIELD_Notes))); // _Notes = (String)(HELPER_Notes.fromObject (_Notes, tl_culture_narrativePSet.getAttrib (FIELD_Notes))); //
_ColorCode = (ColorCode)(HELPER_ColorCode.fromObject (_ColorCode, rs_culture_narrativePSet.getAttrib (FIELD_ColorCode))); // _ColorCode = (ColorCode)(HELPER_ColorCode.fromObject (_ColorCode, tl_culture_narrativePSet.getAttrib (FIELD_ColorCode))); //
_CultureElement.setFromPersistentSets (objectID, allSets); _CultureElement.setFromPersistentSets (objectID, allSets);
_CultureElementQuestion.setFromPersistentSets (objectID, allSets); _CultureElementQuestion.setFromPersistentSets (objectID, allSets);
_CultureElementRating.setFromPersistentSets (objectID, allSets); _CultureElementRating.setFromPersistentSets (objectID, allSets);
...@@ -1411,50 +1411,50 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass ...@@ -1411,50 +1411,50 @@ public abstract class BaseCultureNarrative extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_culture_narrative.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_culture_narrative.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_culture_narrative.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_culture_narrative.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_culture_narrative.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_culture_narrative.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andNotes (QueryFilter<String> filter) public SearchAll andNotes (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_culture_narrative.narrative_notes", "Notes"); filter.addFilter (context, "tl_culture_narrative.narrative_notes", "Notes");
return this; return this;
} }
public SearchAll andColorCode (QueryFilter<ColorCode> filter) public SearchAll andColorCode (QueryFilter<ColorCode> filter)
{ {
filter.addFilter (context, "rs_culture_narrative.color_code", "ColorCode"); filter.addFilter (context, "tl_culture_narrative.color_code", "ColorCode");
return this; return this;
} }
public SearchAll andCultureElement (QueryFilter<CultureElement> filter) public SearchAll andCultureElement (QueryFilter<CultureElement> filter)
{ {
filter.addFilter (context, "rs_culture_narrative.culture_element_number", "CultureElement"); filter.addFilter (context, "tl_culture_narrative.culture_element_number", "CultureElement");
return this; return this;
} }
public SearchAll andCultureElementQuestion (QueryFilter<CultureElementQuestion> filter) public SearchAll andCultureElementQuestion (QueryFilter<CultureElementQuestion> filter)
{ {
filter.addFilter (context, "rs_culture_narrative.culture_element_quest_id", "CultureElementQuestion"); filter.addFilter (context, "tl_culture_narrative.culture_element_quest_id", "CultureElementQuestion");
return this; return this;
} }
public SearchAll andCultureElementRating (QueryFilter<CultureElementRating> filter) public SearchAll andCultureElementRating (QueryFilter<CultureElementRating> filter)
{ {
filter.addFilter (context, "rs_culture_narrative.culture_element_rating_id", "CultureElementRating"); filter.addFilter (context, "tl_culture_narrative.culture_element_rating_id", "CultureElementRating");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseFactor.java
...@@ -923,7 +923,7 @@ public abstract class BaseFactor extends BaseBusinessClass ...@@ -923,7 +923,7 @@ public abstract class BaseFactor extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_factor"; return "tl_factor";
} }
...@@ -944,10 +944,10 @@ public abstract class BaseFactor extends BaseBusinessClass ...@@ -944,10 +944,10 @@ public abstract class BaseFactor extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_factorPSet = allSets.getPersistentSet (myID, "rs_factor", myPSetStatus); PersistentSet tl_factorPSet = allSets.getPersistentSet (myID, "tl_factor", myPSetStatus);
rs_factorPSet.setAttrib (FIELD_ObjectID, myID); tl_factorPSet.setAttrib (FIELD_ObjectID, myID);
rs_factorPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); // tl_factorPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); //
} }
...@@ -960,9 +960,9 @@ public abstract class BaseFactor extends BaseBusinessClass ...@@ -960,9 +960,9 @@ public abstract class BaseFactor extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_factorPSet = allSets.getPersistentSet (objectID, "rs_factor"); PersistentSet tl_factorPSet = allSets.getPersistentSet (objectID, "tl_factor");
_Description = (String)(HELPER_Description.fromObject (_Description, rs_factorPSet.getAttrib (FIELD_Description))); // _Description = (String)(HELPER_Description.fromObject (_Description, tl_factorPSet.getAttrib (FIELD_Description))); //
} }
...@@ -1186,26 +1186,26 @@ public abstract class BaseFactor extends BaseBusinessClass ...@@ -1186,26 +1186,26 @@ public abstract class BaseFactor extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_factor.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_factor.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_factor.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_factor.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_factor.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_factor.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andDescription (QueryFilter<String> filter) public SearchAll andDescription (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_factor.factor_hdr_desc", "Description"); filter.addFilter (context, "tl_factor.factor_hdr_desc", "Description");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseFactorLevelLink.java
...@@ -308,8 +308,8 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -308,8 +308,8 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_Level = new SingleAssociation<FactorLevelLink, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Factors, Level.REFERENCE_Level, "rs_factor_hdr"); _Level = new SingleAssociation<FactorLevelLink, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Factors, Level.REFERENCE_Level, "tl_factor_hdr");
_Factor = new SingleAssociation<FactorLevelLink, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Levels, Factor.REFERENCE_Factor, "rs_factor_hdr"); _Factor = new SingleAssociation<FactorLevelLink, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Levels, Factor.REFERENCE_Factor, "tl_factor_hdr");
} }
...@@ -319,8 +319,8 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -319,8 +319,8 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_Level = new SingleAssociation<FactorLevelLink, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Factors, Level.REFERENCE_Level, "rs_factor_hdr"); _Level = new SingleAssociation<FactorLevelLink, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Factors, Level.REFERENCE_Level, "tl_factor_hdr");
_Factor = new SingleAssociation<FactorLevelLink, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Levels, Factor.REFERENCE_Factor, "rs_factor_hdr"); _Factor = new SingleAssociation<FactorLevelLink, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Levels, Factor.REFERENCE_Factor, "tl_factor_hdr");
return this; return this;
...@@ -1432,7 +1432,7 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1432,7 +1432,7 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_factor_hdr"; return "tl_factor_hdr";
} }
...@@ -1453,15 +1453,15 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1453,15 +1453,15 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_factor_hdrPSet = allSets.getPersistentSet (myID, "rs_factor_hdr", myPSetStatus); PersistentSet tl_factor_hdrPSet = allSets.getPersistentSet (myID, "tl_factor_hdr", myPSetStatus);
rs_factor_hdrPSet.setAttrib (FIELD_ObjectID, myID); tl_factor_hdrPSet.setAttrib (FIELD_ObjectID, myID);
rs_factor_hdrPSet.setAttrib (FIELD_ClassCode, HELPER_ClassCode.toObject (_ClassCode)); // tl_factor_hdrPSet.setAttrib (FIELD_ClassCode, HELPER_ClassCode.toObject (_ClassCode)); //
rs_factor_hdrPSet.setAttrib (FIELD_Notes, HELPER_Notes.toObject (_Notes)); // tl_factor_hdrPSet.setAttrib (FIELD_Notes, HELPER_Notes.toObject (_Notes)); //
rs_factor_hdrPSet.setAttrib (FIELD_LeftAnnot, HELPER_LeftAnnot.toObject (_LeftAnnot)); // tl_factor_hdrPSet.setAttrib (FIELD_LeftAnnot, HELPER_LeftAnnot.toObject (_LeftAnnot)); //
rs_factor_hdrPSet.setAttrib (FIELD_RightAnnot, HELPER_RightAnnot.toObject (_RightAnnot)); // tl_factor_hdrPSet.setAttrib (FIELD_RightAnnot, HELPER_RightAnnot.toObject (_RightAnnot)); //
rs_factor_hdrPSet.setAttrib (FIELD_ZScoreWeight, HELPER_ZScoreWeight.toObject (_ZScoreWeight)); // tl_factor_hdrPSet.setAttrib (FIELD_ZScoreWeight, HELPER_ZScoreWeight.toObject (_ZScoreWeight)); //
rs_factor_hdrPSet.setAttrib (FIELD_ZScoreWeight2, HELPER_ZScoreWeight2.toObject (_ZScoreWeight2)); // tl_factor_hdrPSet.setAttrib (FIELD_ZScoreWeight2, HELPER_ZScoreWeight2.toObject (_ZScoreWeight2)); //
_Level.getPersistentSets (allSets); _Level.getPersistentSets (allSets);
_Factor.getPersistentSets (allSets); _Factor.getPersistentSets (allSets);
...@@ -1476,14 +1476,14 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1476,14 +1476,14 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_factor_hdrPSet = allSets.getPersistentSet (objectID, "rs_factor_hdr"); PersistentSet tl_factor_hdrPSet = allSets.getPersistentSet (objectID, "tl_factor_hdr");
_ClassCode = (String)(HELPER_ClassCode.fromObject (_ClassCode, rs_factor_hdrPSet.getAttrib (FIELD_ClassCode))); // _ClassCode = (String)(HELPER_ClassCode.fromObject (_ClassCode, tl_factor_hdrPSet.getAttrib (FIELD_ClassCode))); //
_Notes = (String)(HELPER_Notes.fromObject (_Notes, rs_factor_hdrPSet.getAttrib (FIELD_Notes))); // _Notes = (String)(HELPER_Notes.fromObject (_Notes, tl_factor_hdrPSet.getAttrib (FIELD_Notes))); //
_LeftAnnot = (String)(HELPER_LeftAnnot.fromObject (_LeftAnnot, rs_factor_hdrPSet.getAttrib (FIELD_LeftAnnot))); // _LeftAnnot = (String)(HELPER_LeftAnnot.fromObject (_LeftAnnot, tl_factor_hdrPSet.getAttrib (FIELD_LeftAnnot))); //
_RightAnnot = (String)(HELPER_RightAnnot.fromObject (_RightAnnot, rs_factor_hdrPSet.getAttrib (FIELD_RightAnnot))); // _RightAnnot = (String)(HELPER_RightAnnot.fromObject (_RightAnnot, tl_factor_hdrPSet.getAttrib (FIELD_RightAnnot))); //
_ZScoreWeight = (Double)(HELPER_ZScoreWeight.fromObject (_ZScoreWeight, rs_factor_hdrPSet.getAttrib (FIELD_ZScoreWeight))); // _ZScoreWeight = (Double)(HELPER_ZScoreWeight.fromObject (_ZScoreWeight, tl_factor_hdrPSet.getAttrib (FIELD_ZScoreWeight))); //
_ZScoreWeight2 = (Double)(HELPER_ZScoreWeight2.fromObject (_ZScoreWeight2, rs_factor_hdrPSet.getAttrib (FIELD_ZScoreWeight2))); // _ZScoreWeight2 = (Double)(HELPER_ZScoreWeight2.fromObject (_ZScoreWeight2, tl_factor_hdrPSet.getAttrib (FIELD_ZScoreWeight2))); //
_Level.setFromPersistentSets (objectID, allSets); _Level.setFromPersistentSets (objectID, allSets);
_Factor.setFromPersistentSets (objectID, allSets); _Factor.setFromPersistentSets (objectID, allSets);
...@@ -1813,68 +1813,68 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1813,68 +1813,68 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_factor_hdr.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_factor_hdr.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_factor_hdr.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andClassCode (QueryFilter<String> filter) public SearchAll andClassCode (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.class_code", "ClassCode"); filter.addFilter (context, "tl_factor_hdr.class_code", "ClassCode");
return this; return this;
} }
public SearchAll andNotes (QueryFilter<String> filter) public SearchAll andNotes (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.factor_hdr_notes", "Notes"); filter.addFilter (context, "tl_factor_hdr.factor_hdr_notes", "Notes");
return this; return this;
} }
public SearchAll andLeftAnnot (QueryFilter<String> filter) public SearchAll andLeftAnnot (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.left_annot", "LeftAnnot"); filter.addFilter (context, "tl_factor_hdr.left_annot", "LeftAnnot");
return this; return this;
} }
public SearchAll andRightAnnot (QueryFilter<String> filter) public SearchAll andRightAnnot (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.right_annot", "RightAnnot"); filter.addFilter (context, "tl_factor_hdr.right_annot", "RightAnnot");
return this; return this;
} }
public SearchAll andZScoreWeight (QueryFilter<Double> filter) public SearchAll andZScoreWeight (QueryFilter<Double> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.z_score_wght", "ZScoreWeight"); filter.addFilter (context, "tl_factor_hdr.z_score_wght", "ZScoreWeight");
return this; return this;
} }
public SearchAll andZScoreWeight2 (QueryFilter<Double> filter) public SearchAll andZScoreWeight2 (QueryFilter<Double> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.z_score_wght_2", "ZScoreWeight2"); filter.addFilter (context, "tl_factor_hdr.z_score_wght_2", "ZScoreWeight2");
return this; return this;
} }
public SearchAll andLevel (QueryFilter<Level> filter) public SearchAll andLevel (QueryFilter<Level> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.level_number", "Level"); filter.addFilter (context, "tl_factor_hdr.level_number", "Level");
return this; return this;
} }
public SearchAll andFactor (QueryFilter<Factor> filter) public SearchAll andFactor (QueryFilter<Factor> filter)
{ {
filter.addFilter (context, "rs_factor_hdr.factor_number", "Factor"); filter.addFilter (context, "tl_factor_hdr.factor_number", "Factor");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseFactorQuestionLink.java
...@@ -185,8 +185,8 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass ...@@ -185,8 +185,8 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_Factor = new SingleAssociation<FactorQuestionLink, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Questions, Factor.REFERENCE_Factor, "rs_factor_lin"); _Factor = new SingleAssociation<FactorQuestionLink, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Questions, Factor.REFERENCE_Factor, "tl_factor_lin");
_Question = new SingleAssociation<FactorQuestionLink, Question> (this, SINGLEREFERENCE_Question, Question.MULTIPLEREFERENCE_Factors, Question.REFERENCE_Question, "rs_factor_lin"); _Question = new SingleAssociation<FactorQuestionLink, Question> (this, SINGLEREFERENCE_Question, Question.MULTIPLEREFERENCE_Factors, Question.REFERENCE_Question, "tl_factor_lin");
} }
...@@ -196,8 +196,8 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass ...@@ -196,8 +196,8 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_Factor = new SingleAssociation<FactorQuestionLink, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Questions, Factor.REFERENCE_Factor, "rs_factor_lin"); _Factor = new SingleAssociation<FactorQuestionLink, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Questions, Factor.REFERENCE_Factor, "tl_factor_lin");
_Question = new SingleAssociation<FactorQuestionLink, Question> (this, SINGLEREFERENCE_Question, Question.MULTIPLEREFERENCE_Factors, Question.REFERENCE_Question, "rs_factor_lin"); _Question = new SingleAssociation<FactorQuestionLink, Question> (this, SINGLEREFERENCE_Question, Question.MULTIPLEREFERENCE_Factors, Question.REFERENCE_Question, "tl_factor_lin");
return this; return this;
...@@ -819,7 +819,7 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass ...@@ -819,7 +819,7 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_factor_lin"; return "tl_factor_lin";
} }
...@@ -840,10 +840,10 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass ...@@ -840,10 +840,10 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_factor_linPSet = allSets.getPersistentSet (myID, "rs_factor_lin", myPSetStatus); PersistentSet tl_factor_linPSet = allSets.getPersistentSet (myID, "tl_factor_lin", myPSetStatus);
rs_factor_linPSet.setAttrib (FIELD_ObjectID, myID); tl_factor_linPSet.setAttrib (FIELD_ObjectID, myID);
rs_factor_linPSet.setAttrib (FIELD_ReverseScore, HELPER_ReverseScore.toObject (_ReverseScore)); // tl_factor_linPSet.setAttrib (FIELD_ReverseScore, HELPER_ReverseScore.toObject (_ReverseScore)); //
_Factor.getPersistentSets (allSets); _Factor.getPersistentSets (allSets);
_Question.getPersistentSets (allSets); _Question.getPersistentSets (allSets);
...@@ -858,9 +858,9 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass ...@@ -858,9 +858,9 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_factor_linPSet = allSets.getPersistentSet (objectID, "rs_factor_lin"); PersistentSet tl_factor_linPSet = allSets.getPersistentSet (objectID, "tl_factor_lin");
_ReverseScore = (Boolean)(HELPER_ReverseScore.fromObject (_ReverseScore, rs_factor_linPSet.getAttrib (FIELD_ReverseScore))); // _ReverseScore = (Boolean)(HELPER_ReverseScore.fromObject (_ReverseScore, tl_factor_linPSet.getAttrib (FIELD_ReverseScore))); //
_Factor.setFromPersistentSets (objectID, allSets); _Factor.setFromPersistentSets (objectID, allSets);
_Question.setFromPersistentSets (objectID, allSets); _Question.setFromPersistentSets (objectID, allSets);
...@@ -1085,38 +1085,38 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass ...@@ -1085,38 +1085,38 @@ public abstract class BaseFactorQuestionLink extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_factor_lin.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_factor_lin.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_factor_lin.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_factor_lin.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_factor_lin.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_factor_lin.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andReverseScore (QueryFilter<Boolean> filter) public SearchAll andReverseScore (QueryFilter<Boolean> filter)
{ {
filter.addFilter (context, "rs_factor_lin.reverse_score_flag", "ReverseScore"); filter.addFilter (context, "tl_factor_lin.reverse_score_flag", "ReverseScore");
return this; return this;
} }
public SearchAll andFactor (QueryFilter<Factor> filter) public SearchAll andFactor (QueryFilter<Factor> filter)
{ {
filter.addFilter (context, "rs_factor_lin.factor_number", "Factor"); filter.addFilter (context, "tl_factor_lin.factor_number", "Factor");
return this; return this;
} }
public SearchAll andQuestion (QueryFilter<Question> filter) public SearchAll andQuestion (QueryFilter<Question> filter)
{ {
filter.addFilter (context, "rs_factor_lin.quest_number", "Question"); filter.addFilter (context, "tl_factor_lin.quest_number", "Question");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseFactorScore.java
...@@ -293,10 +293,10 @@ public abstract class BaseFactorScore extends BaseBusinessClass ...@@ -293,10 +293,10 @@ public abstract class BaseFactorScore extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_TestAnalysis = new SingleAssociation<FactorScore, TestAnalysis> (this, SINGLEREFERENCE_TestAnalysis, TestAnalysis.MULTIPLEREFERENCE_FactorScores, TestAnalysis.REFERENCE_TestAnalysis, "rs_score"); _TestAnalysis = new SingleAssociation<FactorScore, TestAnalysis> (this, SINGLEREFERENCE_TestAnalysis, TestAnalysis.MULTIPLEREFERENCE_FactorScores, TestAnalysis.REFERENCE_TestAnalysis, "tl_score");
_Factor = new SingleAssociation<FactorScore, Factor> (this, SINGLEREFERENCE_Factor, null, Factor.REFERENCE_Factor, "rs_score"); _Factor = new SingleAssociation<FactorScore, Factor> (this, SINGLEREFERENCE_Factor, null, Factor.REFERENCE_Factor, "tl_score");
_Level = new SingleAssociation<FactorScore, Level> (this, SINGLEREFERENCE_Level, null, Level.REFERENCE_Level, "rs_score"); _Level = new SingleAssociation<FactorScore, Level> (this, SINGLEREFERENCE_Level, null, Level.REFERENCE_Level, "tl_score");
_Narrative = new SingleAssociation<FactorScore, Narrative> (this, SINGLEREFERENCE_Narrative, Narrative.MULTIPLEREFERENCE_FactorScores, Narrative.REFERENCE_Narrative, "rs_score"); _Narrative = new SingleAssociation<FactorScore, Narrative> (this, SINGLEREFERENCE_Narrative, Narrative.MULTIPLEREFERENCE_FactorScores, Narrative.REFERENCE_Narrative, "tl_score");
} }
...@@ -306,10 +306,10 @@ public abstract class BaseFactorScore extends BaseBusinessClass ...@@ -306,10 +306,10 @@ public abstract class BaseFactorScore extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_TestAnalysis = new SingleAssociation<FactorScore, TestAnalysis> (this, SINGLEREFERENCE_TestAnalysis, TestAnalysis.MULTIPLEREFERENCE_FactorScores, TestAnalysis.REFERENCE_TestAnalysis, "rs_score"); _TestAnalysis = new SingleAssociation<FactorScore, TestAnalysis> (this, SINGLEREFERENCE_TestAnalysis, TestAnalysis.MULTIPLEREFERENCE_FactorScores, TestAnalysis.REFERENCE_TestAnalysis, "tl_score");
_Factor = new SingleAssociation<FactorScore, Factor> (this, SINGLEREFERENCE_Factor, null, Factor.REFERENCE_Factor, "rs_score"); _Factor = new SingleAssociation<FactorScore, Factor> (this, SINGLEREFERENCE_Factor, null, Factor.REFERENCE_Factor, "tl_score");
_Level = new SingleAssociation<FactorScore, Level> (this, SINGLEREFERENCE_Level, null, Level.REFERENCE_Level, "rs_score"); _Level = new SingleAssociation<FactorScore, Level> (this, SINGLEREFERENCE_Level, null, Level.REFERENCE_Level, "tl_score");
_Narrative = new SingleAssociation<FactorScore, Narrative> (this, SINGLEREFERENCE_Narrative, Narrative.MULTIPLEREFERENCE_FactorScores, Narrative.REFERENCE_Narrative, "rs_score"); _Narrative = new SingleAssociation<FactorScore, Narrative> (this, SINGLEREFERENCE_Narrative, Narrative.MULTIPLEREFERENCE_FactorScores, Narrative.REFERENCE_Narrative, "tl_score");
return this; return this;
...@@ -1453,7 +1453,7 @@ public abstract class BaseFactorScore extends BaseBusinessClass ...@@ -1453,7 +1453,7 @@ public abstract class BaseFactorScore extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_score"; return "tl_score";
} }
...@@ -1474,12 +1474,12 @@ public abstract class BaseFactorScore extends BaseBusinessClass ...@@ -1474,12 +1474,12 @@ public abstract class BaseFactorScore extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_scorePSet = allSets.getPersistentSet (myID, "rs_score", myPSetStatus); PersistentSet tl_scorePSet = allSets.getPersistentSet (myID, "tl_score", myPSetStatus);
rs_scorePSet.setAttrib (FIELD_ObjectID, myID); tl_scorePSet.setAttrib (FIELD_ObjectID, myID);
rs_scorePSet.setAttrib (FIELD_Score, HELPER_Score.toObject (_Score)); // tl_scorePSet.setAttrib (FIELD_Score, HELPER_Score.toObject (_Score)); //
rs_scorePSet.setAttrib (FIELD_ColorRank, HELPER_ColorRank.toObject (_ColorRank)); // tl_scorePSet.setAttrib (FIELD_ColorRank, HELPER_ColorRank.toObject (_ColorRank)); //
rs_scorePSet.setAttrib (FIELD_WghtdScore, HELPER_WghtdScore.toObject (_WghtdScore)); // tl_scorePSet.setAttrib (FIELD_WghtdScore, HELPER_WghtdScore.toObject (_WghtdScore)); //
_TestAnalysis.getPersistentSets (allSets); _TestAnalysis.getPersistentSets (allSets);
_Factor.getPersistentSets (allSets); _Factor.getPersistentSets (allSets);
_Level.getPersistentSets (allSets); _Level.getPersistentSets (allSets);
...@@ -1496,11 +1496,11 @@ public abstract class BaseFactorScore extends BaseBusinessClass ...@@ -1496,11 +1496,11 @@ public abstract class BaseFactorScore extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_scorePSet = allSets.getPersistentSet (objectID, "rs_score"); PersistentSet tl_scorePSet = allSets.getPersistentSet (objectID, "tl_score");
_Score = (Integer)(HELPER_Score.fromObject (_Score, rs_scorePSet.getAttrib (FIELD_Score))); // _Score = (Integer)(HELPER_Score.fromObject (_Score, tl_scorePSet.getAttrib (FIELD_Score))); //
_ColorRank = (Integer)(HELPER_ColorRank.fromObject (_ColorRank, rs_scorePSet.getAttrib (FIELD_ColorRank))); // _ColorRank = (Integer)(HELPER_ColorRank.fromObject (_ColorRank, tl_scorePSet.getAttrib (FIELD_ColorRank))); //
_WghtdScore = (Integer)(HELPER_WghtdScore.fromObject (_WghtdScore, rs_scorePSet.getAttrib (FIELD_WghtdScore))); // _WghtdScore = (Integer)(HELPER_WghtdScore.fromObject (_WghtdScore, tl_scorePSet.getAttrib (FIELD_WghtdScore))); //
_TestAnalysis.setFromPersistentSets (objectID, allSets); _TestAnalysis.setFromPersistentSets (objectID, allSets);
_Factor.setFromPersistentSets (objectID, allSets); _Factor.setFromPersistentSets (objectID, allSets);
_Level.setFromPersistentSets (objectID, allSets); _Level.setFromPersistentSets (objectID, allSets);
...@@ -1799,62 +1799,62 @@ public abstract class BaseFactorScore extends BaseBusinessClass ...@@ -1799,62 +1799,62 @@ public abstract class BaseFactorScore extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_score.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_score.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_score.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_score.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_score.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_score.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andScore (QueryFilter<Integer> filter) public SearchAll andScore (QueryFilter<Integer> filter)
{ {
filter.addFilter (context, "rs_score.score_number", "Score"); filter.addFilter (context, "tl_score.score_number", "Score");
return this; return this;
} }
public SearchAll andColorRank (QueryFilter<Integer> filter) public SearchAll andColorRank (QueryFilter<Integer> filter)
{ {
filter.addFilter (context, "rs_score.color_rank", "ColorRank"); filter.addFilter (context, "tl_score.color_rank", "ColorRank");
return this; return this;
} }
public SearchAll andWghtdScore (QueryFilter<Integer> filter) public SearchAll andWghtdScore (QueryFilter<Integer> filter)
{ {
filter.addFilter (context, "rs_score.wghtd_score", "WghtdScore"); filter.addFilter (context, "tl_score.wghtd_score", "WghtdScore");
return this; return this;
} }
public SearchAll andTestAnalysis (QueryFilter<TestAnalysis> filter) public SearchAll andTestAnalysis (QueryFilter<TestAnalysis> filter)
{ {
filter.addFilter (context, "rs_score.test_analysis_id", "TestAnalysis"); filter.addFilter (context, "tl_score.test_analysis_id", "TestAnalysis");
return this; return this;
} }
public SearchAll andFactor (QueryFilter<Factor> filter) public SearchAll andFactor (QueryFilter<Factor> filter)
{ {
filter.addFilter (context, "rs_score.factor_number", "Factor"); filter.addFilter (context, "tl_score.factor_number", "Factor");
return this; return this;
} }
public SearchAll andLevel (QueryFilter<Level> filter) public SearchAll andLevel (QueryFilter<Level> filter)
{ {
filter.addFilter (context, "rs_score.level_number", "Level"); filter.addFilter (context, "tl_score.level_number", "Level");
return this; return this;
} }
public SearchAll andNarrative (QueryFilter<Narrative> filter) public SearchAll andNarrative (QueryFilter<Narrative> filter)
{ {
filter.addFilter (context, "rs_score.narrative_id", "Narrative"); filter.addFilter (context, "tl_score.narrative_id", "Narrative");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseFactorScoreResult.java
...@@ -256,9 +256,9 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass ...@@ -256,9 +256,9 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_Factor = new SingleAssociation<FactorScoreResult, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Results, Factor.REFERENCE_Factor, "rs_level_factor"); _Factor = new SingleAssociation<FactorScoreResult, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Results, Factor.REFERENCE_Factor, "tl_level_factor");
_Level = new SingleAssociation<FactorScoreResult, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Results, Level.REFERENCE_Level, "rs_level_factor"); _Level = new SingleAssociation<FactorScoreResult, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Results, Level.REFERENCE_Level, "tl_level_factor");
_Narrative = new SingleAssociation<FactorScoreResult, Narrative> (this, SINGLEREFERENCE_Narrative, Narrative.MULTIPLEREFERENCE_Results, Narrative.REFERENCE_Narrative, "rs_level_factor"); _Narrative = new SingleAssociation<FactorScoreResult, Narrative> (this, SINGLEREFERENCE_Narrative, Narrative.MULTIPLEREFERENCE_Results, Narrative.REFERENCE_Narrative, "tl_level_factor");
} }
...@@ -268,9 +268,9 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass ...@@ -268,9 +268,9 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_Factor = new SingleAssociation<FactorScoreResult, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Results, Factor.REFERENCE_Factor, "rs_level_factor"); _Factor = new SingleAssociation<FactorScoreResult, Factor> (this, SINGLEREFERENCE_Factor, Factor.MULTIPLEREFERENCE_Results, Factor.REFERENCE_Factor, "tl_level_factor");
_Level = new SingleAssociation<FactorScoreResult, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Results, Level.REFERENCE_Level, "rs_level_factor"); _Level = new SingleAssociation<FactorScoreResult, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Results, Level.REFERENCE_Level, "tl_level_factor");
_Narrative = new SingleAssociation<FactorScoreResult, Narrative> (this, SINGLEREFERENCE_Narrative, Narrative.MULTIPLEREFERENCE_Results, Narrative.REFERENCE_Narrative, "rs_level_factor"); _Narrative = new SingleAssociation<FactorScoreResult, Narrative> (this, SINGLEREFERENCE_Narrative, Narrative.MULTIPLEREFERENCE_Results, Narrative.REFERENCE_Narrative, "tl_level_factor");
return this; return this;
...@@ -1229,7 +1229,7 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass ...@@ -1229,7 +1229,7 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_level_factor"; return "tl_level_factor";
} }
...@@ -1250,12 +1250,12 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass ...@@ -1250,12 +1250,12 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_level_factorPSet = allSets.getPersistentSet (myID, "rs_level_factor", myPSetStatus); PersistentSet tl_level_factorPSet = allSets.getPersistentSet (myID, "tl_level_factor", myPSetStatus);
rs_level_factorPSet.setAttrib (FIELD_ObjectID, myID); tl_level_factorPSet.setAttrib (FIELD_ObjectID, myID);
rs_level_factorPSet.setAttrib (FIELD_FromScore, HELPER_FromScore.toObject (_FromScore)); // tl_level_factorPSet.setAttrib (FIELD_FromScore, HELPER_FromScore.toObject (_FromScore)); //
rs_level_factorPSet.setAttrib (FIELD_ToScore, HELPER_ToScore.toObject (_ToScore)); // tl_level_factorPSet.setAttrib (FIELD_ToScore, HELPER_ToScore.toObject (_ToScore)); //
rs_level_factorPSet.setAttrib (FIELD_ColorCode, HELPER_ColorCode.toObject (_ColorCode)); // tl_level_factorPSet.setAttrib (FIELD_ColorCode, HELPER_ColorCode.toObject (_ColorCode)); //
_Factor.getPersistentSets (allSets); _Factor.getPersistentSets (allSets);
_Level.getPersistentSets (allSets); _Level.getPersistentSets (allSets);
_Narrative.getPersistentSets (allSets); _Narrative.getPersistentSets (allSets);
...@@ -1271,11 +1271,11 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass ...@@ -1271,11 +1271,11 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_level_factorPSet = allSets.getPersistentSet (objectID, "rs_level_factor"); PersistentSet tl_level_factorPSet = allSets.getPersistentSet (objectID, "tl_level_factor");
_FromScore = (Integer)(HELPER_FromScore.fromObject (_FromScore, rs_level_factorPSet.getAttrib (FIELD_FromScore))); // _FromScore = (Integer)(HELPER_FromScore.fromObject (_FromScore, tl_level_factorPSet.getAttrib (FIELD_FromScore))); //
_ToScore = (Integer)(HELPER_ToScore.fromObject (_ToScore, rs_level_factorPSet.getAttrib (FIELD_ToScore))); // _ToScore = (Integer)(HELPER_ToScore.fromObject (_ToScore, tl_level_factorPSet.getAttrib (FIELD_ToScore))); //
_ColorCode = (ColorCode)(HELPER_ColorCode.fromObject (_ColorCode, rs_level_factorPSet.getAttrib (FIELD_ColorCode))); // _ColorCode = (ColorCode)(HELPER_ColorCode.fromObject (_ColorCode, tl_level_factorPSet.getAttrib (FIELD_ColorCode))); //
_Factor.setFromPersistentSets (objectID, allSets); _Factor.setFromPersistentSets (objectID, allSets);
_Level.setFromPersistentSets (objectID, allSets); _Level.setFromPersistentSets (objectID, allSets);
_Narrative.setFromPersistentSets (objectID, allSets); _Narrative.setFromPersistentSets (objectID, allSets);
...@@ -1556,56 +1556,56 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass ...@@ -1556,56 +1556,56 @@ public abstract class BaseFactorScoreResult extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_level_factor.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_level_factor.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_level_factor.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_level_factor.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_level_factor.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_level_factor.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andFromScore (QueryFilter<Integer> filter) public SearchAll andFromScore (QueryFilter<Integer> filter)
{ {
filter.addFilter (context, "rs_level_factor.from_score", "FromScore"); filter.addFilter (context, "tl_level_factor.from_score", "FromScore");
return this; return this;
} }
public SearchAll andToScore (QueryFilter<Integer> filter) public SearchAll andToScore (QueryFilter<Integer> filter)
{ {
filter.addFilter (context, "rs_level_factor.to_score", "ToScore"); filter.addFilter (context, "tl_level_factor.to_score", "ToScore");
return this; return this;
} }
public SearchAll andColorCode (QueryFilter<ColorCode> filter) public SearchAll andColorCode (QueryFilter<ColorCode> filter)
{ {
filter.addFilter (context, "rs_level_factor.color_code", "ColorCode"); filter.addFilter (context, "tl_level_factor.color_code", "ColorCode");
return this; return this;
} }
public SearchAll andFactor (QueryFilter<Factor> filter) public SearchAll andFactor (QueryFilter<Factor> filter)
{ {
filter.addFilter (context, "rs_level_factor.factor_number", "Factor"); filter.addFilter (context, "tl_level_factor.factor_number", "Factor");
return this; return this;
} }
public SearchAll andLevel (QueryFilter<Level> filter) public SearchAll andLevel (QueryFilter<Level> filter)
{ {
filter.addFilter (context, "rs_level_factor.level_number", "Level"); filter.addFilter (context, "tl_level_factor.level_number", "Level");
return this; return this;
} }
public SearchAll andNarrative (QueryFilter<Narrative> filter) public SearchAll andNarrative (QueryFilter<Narrative> filter)
{ {
filter.addFilter (context, "rs_level_factor.narrative_id", "Narrative"); filter.addFilter (context, "tl_level_factor.narrative_id", "Narrative");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseLevel.java
...@@ -1310,7 +1310,7 @@ public abstract class BaseLevel extends BaseBusinessClass ...@@ -1310,7 +1310,7 @@ public abstract class BaseLevel extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_level"; return "tl_level";
} }
...@@ -1331,12 +1331,12 @@ public abstract class BaseLevel extends BaseBusinessClass ...@@ -1331,12 +1331,12 @@ public abstract class BaseLevel extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_levelPSet = allSets.getPersistentSet (myID, "rs_level", myPSetStatus); PersistentSet tl_levelPSet = allSets.getPersistentSet (myID, "tl_level", myPSetStatus);
rs_levelPSet.setAttrib (FIELD_ObjectID, myID); tl_levelPSet.setAttrib (FIELD_ObjectID, myID);
rs_levelPSet.setAttrib (FIELD_LevelDescription, HELPER_LevelDescription.toObject (_LevelDescription)); // tl_levelPSet.setAttrib (FIELD_LevelDescription, HELPER_LevelDescription.toObject (_LevelDescription)); //
rs_levelPSet.setAttrib (FIELD_LevelNotes, HELPER_LevelNotes.toObject (_LevelNotes)); // tl_levelPSet.setAttrib (FIELD_LevelNotes, HELPER_LevelNotes.toObject (_LevelNotes)); //
rs_levelPSet.setAttrib (FIELD_ReportHeader, HELPER_ReportHeader.toObject (_ReportHeader)); // tl_levelPSet.setAttrib (FIELD_ReportHeader, HELPER_ReportHeader.toObject (_ReportHeader)); //
} }
...@@ -1349,11 +1349,11 @@ public abstract class BaseLevel extends BaseBusinessClass ...@@ -1349,11 +1349,11 @@ public abstract class BaseLevel extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_levelPSet = allSets.getPersistentSet (objectID, "rs_level"); PersistentSet tl_levelPSet = allSets.getPersistentSet (objectID, "tl_level");
_LevelDescription = (String)(HELPER_LevelDescription.fromObject (_LevelDescription, rs_levelPSet.getAttrib (FIELD_LevelDescription))); // _LevelDescription = (String)(HELPER_LevelDescription.fromObject (_LevelDescription, tl_levelPSet.getAttrib (FIELD_LevelDescription))); //
_LevelNotes = (String)(HELPER_LevelNotes.fromObject (_LevelNotes, rs_levelPSet.getAttrib (FIELD_LevelNotes))); // _LevelNotes = (String)(HELPER_LevelNotes.fromObject (_LevelNotes, tl_levelPSet.getAttrib (FIELD_LevelNotes))); //
_ReportHeader = (String)(HELPER_ReportHeader.fromObject (_ReportHeader, rs_levelPSet.getAttrib (FIELD_ReportHeader))); // _ReportHeader = (String)(HELPER_ReportHeader.fromObject (_ReportHeader, tl_levelPSet.getAttrib (FIELD_ReportHeader))); //
} }
...@@ -1628,38 +1628,38 @@ public abstract class BaseLevel extends BaseBusinessClass ...@@ -1628,38 +1628,38 @@ public abstract class BaseLevel extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_level.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_level.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_level.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_level.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_level.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_level.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andLevelDescription (QueryFilter<String> filter) public SearchAll andLevelDescription (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_level.level_desc", "LevelDescription"); filter.addFilter (context, "tl_level.level_desc", "LevelDescription");
return this; return this;
} }
public SearchAll andLevelNotes (QueryFilter<String> filter) public SearchAll andLevelNotes (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_level.level_notes", "LevelNotes"); filter.addFilter (context, "tl_level.level_notes", "LevelNotes");
return this; return this;
} }
public SearchAll andReportHeader (QueryFilter<String> filter) public SearchAll andReportHeader (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_level.rpt_hdr", "ReportHeader"); filter.addFilter (context, "tl_level.rpt_hdr", "ReportHeader");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseNarrative.java
...@@ -376,7 +376,7 @@ public abstract class BaseNarrative extends BaseBusinessClass ...@@ -376,7 +376,7 @@ public abstract class BaseNarrative extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_Level = new SingleAssociation<Narrative, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Narratives, Level.REFERENCE_Level, "rs_narrative"); _Level = new SingleAssociation<Narrative, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Narratives, Level.REFERENCE_Level, "tl_narrative");
_Results = new MultipleAssociation<Narrative, FactorScoreResult> (this, MULTIPLEREFERENCE_Results, FactorScoreResult.SINGLEREFERENCE_Narrative, FactorScoreResult.REFERENCE_FactorScoreResult); _Results = new MultipleAssociation<Narrative, FactorScoreResult> (this, MULTIPLEREFERENCE_Results, FactorScoreResult.SINGLEREFERENCE_Narrative, FactorScoreResult.REFERENCE_FactorScoreResult);
_FactorScores = new MultipleAssociation<Narrative, FactorScore> (this, MULTIPLEREFERENCE_FactorScores, FactorScore.SINGLEREFERENCE_Narrative, FactorScore.REFERENCE_FactorScore); _FactorScores = new MultipleAssociation<Narrative, FactorScore> (this, MULTIPLEREFERENCE_FactorScores, FactorScore.SINGLEREFERENCE_Narrative, FactorScore.REFERENCE_FactorScore);
...@@ -388,7 +388,7 @@ public abstract class BaseNarrative extends BaseBusinessClass ...@@ -388,7 +388,7 @@ public abstract class BaseNarrative extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_Level = new SingleAssociation<Narrative, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Narratives, Level.REFERENCE_Level, "rs_narrative"); _Level = new SingleAssociation<Narrative, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_Narratives, Level.REFERENCE_Level, "tl_narrative");
_Results = new MultipleAssociation<Narrative, FactorScoreResult> (this, MULTIPLEREFERENCE_Results, FactorScoreResult.SINGLEREFERENCE_Narrative, FactorScoreResult.REFERENCE_FactorScoreResult); _Results = new MultipleAssociation<Narrative, FactorScoreResult> (this, MULTIPLEREFERENCE_Results, FactorScoreResult.SINGLEREFERENCE_Narrative, FactorScoreResult.REFERENCE_FactorScoreResult);
_FactorScores = new MultipleAssociation<Narrative, FactorScore> (this, MULTIPLEREFERENCE_FactorScores, FactorScore.SINGLEREFERENCE_Narrative, FactorScore.REFERENCE_FactorScore); _FactorScores = new MultipleAssociation<Narrative, FactorScore> (this, MULTIPLEREFERENCE_FactorScores, FactorScore.SINGLEREFERENCE_Narrative, FactorScore.REFERENCE_FactorScore);
...@@ -1802,7 +1802,7 @@ public abstract class BaseNarrative extends BaseBusinessClass ...@@ -1802,7 +1802,7 @@ public abstract class BaseNarrative extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_narrative"; return "tl_narrative";
} }
...@@ -1823,17 +1823,17 @@ public abstract class BaseNarrative extends BaseBusinessClass ...@@ -1823,17 +1823,17 @@ public abstract class BaseNarrative extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_narrativePSet = allSets.getPersistentSet (myID, "rs_narrative", myPSetStatus); PersistentSet tl_narrativePSet = allSets.getPersistentSet (myID, "tl_narrative", myPSetStatus);
rs_narrativePSet.setAttrib (FIELD_ObjectID, myID); tl_narrativePSet.setAttrib (FIELD_ObjectID, myID);
rs_narrativePSet.setAttrib (FIELD_NarrativeCode, HELPER_NarrativeCode.toObject (_NarrativeCode)); // tl_narrativePSet.setAttrib (FIELD_NarrativeCode, HELPER_NarrativeCode.toObject (_NarrativeCode)); //
rs_narrativePSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); // tl_narrativePSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); //
rs_narrativePSet.setAttrib (FIELD_GraphicNotes, HELPER_GraphicNotes.toObject (_GraphicNotes)); // tl_narrativePSet.setAttrib (FIELD_GraphicNotes, HELPER_GraphicNotes.toObject (_GraphicNotes)); //
rs_narrativePSet.setAttrib (FIELD_SummaryNotes, HELPER_SummaryNotes.toObject (_SummaryNotes)); // tl_narrativePSet.setAttrib (FIELD_SummaryNotes, HELPER_SummaryNotes.toObject (_SummaryNotes)); //
rs_narrativePSet.setAttrib (FIELD_ModConnect, HELPER_ModConnect.toObject (_ModConnect)); // tl_narrativePSet.setAttrib (FIELD_ModConnect, HELPER_ModConnect.toObject (_ModConnect)); //
rs_narrativePSet.setAttrib (FIELD_NarrativeNotes, HELPER_NarrativeNotes.toObject (_NarrativeNotes)); // tl_narrativePSet.setAttrib (FIELD_NarrativeNotes, HELPER_NarrativeNotes.toObject (_NarrativeNotes)); //
rs_narrativePSet.setAttrib (FIELD_DevelNarrative, HELPER_DevelNarrative.toObject (_DevelNarrative)); // tl_narrativePSet.setAttrib (FIELD_DevelNarrative, HELPER_DevelNarrative.toObject (_DevelNarrative)); //
rs_narrativePSet.setAttrib (FIELD_Question, HELPER_Question.toObject (_Question)); // tl_narrativePSet.setAttrib (FIELD_Question, HELPER_Question.toObject (_Question)); //
_Level.getPersistentSets (allSets); _Level.getPersistentSets (allSets);
} }
...@@ -1847,16 +1847,16 @@ public abstract class BaseNarrative extends BaseBusinessClass ...@@ -1847,16 +1847,16 @@ public abstract class BaseNarrative extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_narrativePSet = allSets.getPersistentSet (objectID, "rs_narrative"); PersistentSet tl_narrativePSet = allSets.getPersistentSet (objectID, "tl_narrative");
_NarrativeCode = (String)(HELPER_NarrativeCode.fromObject (_NarrativeCode, rs_narrativePSet.getAttrib (FIELD_NarrativeCode))); // _NarrativeCode = (String)(HELPER_NarrativeCode.fromObject (_NarrativeCode, tl_narrativePSet.getAttrib (FIELD_NarrativeCode))); //
_Description = (String)(HELPER_Description.fromObject (_Description, rs_narrativePSet.getAttrib (FIELD_Description))); // _Description = (String)(HELPER_Description.fromObject (_Description, tl_narrativePSet.getAttrib (FIELD_Description))); //
_GraphicNotes = (String)(HELPER_GraphicNotes.fromObject (_GraphicNotes, rs_narrativePSet.getAttrib (FIELD_GraphicNotes))); // _GraphicNotes = (String)(HELPER_GraphicNotes.fromObject (_GraphicNotes, tl_narrativePSet.getAttrib (FIELD_GraphicNotes))); //
_SummaryNotes = (String)(HELPER_SummaryNotes.fromObject (_SummaryNotes, rs_narrativePSet.getAttrib (FIELD_SummaryNotes))); // _SummaryNotes = (String)(HELPER_SummaryNotes.fromObject (_SummaryNotes, tl_narrativePSet.getAttrib (FIELD_SummaryNotes))); //
_ModConnect = (String)(HELPER_ModConnect.fromObject (_ModConnect, rs_narrativePSet.getAttrib (FIELD_ModConnect))); // _ModConnect = (String)(HELPER_ModConnect.fromObject (_ModConnect, tl_narrativePSet.getAttrib (FIELD_ModConnect))); //
_NarrativeNotes = (String)(HELPER_NarrativeNotes.fromObject (_NarrativeNotes, rs_narrativePSet.getAttrib (FIELD_NarrativeNotes))); // _NarrativeNotes = (String)(HELPER_NarrativeNotes.fromObject (_NarrativeNotes, tl_narrativePSet.getAttrib (FIELD_NarrativeNotes))); //
_DevelNarrative = (String)(HELPER_DevelNarrative.fromObject (_DevelNarrative, rs_narrativePSet.getAttrib (FIELD_DevelNarrative))); // _DevelNarrative = (String)(HELPER_DevelNarrative.fromObject (_DevelNarrative, tl_narrativePSet.getAttrib (FIELD_DevelNarrative))); //
_Question = (String)(HELPER_Question.fromObject (_Question, rs_narrativePSet.getAttrib (FIELD_Question))); // _Question = (String)(HELPER_Question.fromObject (_Question, tl_narrativePSet.getAttrib (FIELD_Question))); //
_Level.setFromPersistentSets (objectID, allSets); _Level.setFromPersistentSets (objectID, allSets);
} }
...@@ -2232,74 +2232,74 @@ public abstract class BaseNarrative extends BaseBusinessClass ...@@ -2232,74 +2232,74 @@ public abstract class BaseNarrative extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_narrative.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_narrative.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_narrative.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_narrative.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_narrative.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_narrative.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andNarrativeCode (QueryFilter<String> filter) public SearchAll andNarrativeCode (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_narrative.narrative_code", "NarrativeCode"); filter.addFilter (context, "tl_narrative.narrative_code", "NarrativeCode");
return this; return this;
} }
public SearchAll andDescription (QueryFilter<String> filter) public SearchAll andDescription (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_narrative.narrative_desc", "Description"); filter.addFilter (context, "tl_narrative.narrative_desc", "Description");
return this; return this;
} }
public SearchAll andGraphicNotes (QueryFilter<String> filter) public SearchAll andGraphicNotes (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_narrative.graphic_notes", "GraphicNotes"); filter.addFilter (context, "tl_narrative.graphic_notes", "GraphicNotes");
return this; return this;
} }
public SearchAll andSummaryNotes (QueryFilter<String> filter) public SearchAll andSummaryNotes (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_narrative.exec_sum_notes", "SummaryNotes"); filter.addFilter (context, "tl_narrative.exec_sum_notes", "SummaryNotes");
return this; return this;
} }
public SearchAll andModConnect (QueryFilter<String> filter) public SearchAll andModConnect (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_narrative.mod_connect_flag", "ModConnect"); filter.addFilter (context, "tl_narrative.mod_connect_flag", "ModConnect");
return this; return this;
} }
public SearchAll andNarrativeNotes (QueryFilter<String> filter) public SearchAll andNarrativeNotes (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_narrative.narrative_notes", "NarrativeNotes"); filter.addFilter (context, "tl_narrative.narrative_notes", "NarrativeNotes");
return this; return this;
} }
public SearchAll andDevelNarrative (QueryFilter<String> filter) public SearchAll andDevelNarrative (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_narrative.devel_narrative", "DevelNarrative"); filter.addFilter (context, "tl_narrative.devel_narrative", "DevelNarrative");
return this; return this;
} }
public SearchAll andQuestion (QueryFilter<String> filter) public SearchAll andQuestion (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_narrative.question", "Question"); filter.addFilter (context, "tl_narrative.question", "Question");
return this; return this;
} }
public SearchAll andLevel (QueryFilter<Level> filter) public SearchAll andLevel (QueryFilter<Level> filter)
{ {
filter.addFilter (context, "rs_narrative.level_number", "Level"); filter.addFilter (context, "tl_narrative.level_number", "Level");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseQuestion.java
...@@ -185,7 +185,7 @@ public abstract class BaseQuestion extends BaseBusinessClass ...@@ -185,7 +185,7 @@ public abstract class BaseQuestion extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_Section = new SingleAssociation<Question, Section> (this, SINGLEREFERENCE_Section, Section.MULTIPLEREFERENCE_Questions, Section.REFERENCE_Section, "rs_quest_lin"); _Section = new SingleAssociation<Question, Section> (this, SINGLEREFERENCE_Section, Section.MULTIPLEREFERENCE_Questions, Section.REFERENCE_Section, "tl_quest_lin");
_Factors = new MultipleAssociation<Question, FactorQuestionLink> (this, MULTIPLEREFERENCE_Factors, FactorQuestionLink.SINGLEREFERENCE_Question, FactorQuestionLink.REFERENCE_FactorQuestionLink); _Factors = new MultipleAssociation<Question, FactorQuestionLink> (this, MULTIPLEREFERENCE_Factors, FactorQuestionLink.SINGLEREFERENCE_Question, FactorQuestionLink.REFERENCE_FactorQuestionLink);
} }
...@@ -196,7 +196,7 @@ public abstract class BaseQuestion extends BaseBusinessClass ...@@ -196,7 +196,7 @@ public abstract class BaseQuestion extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_Section = new SingleAssociation<Question, Section> (this, SINGLEREFERENCE_Section, Section.MULTIPLEREFERENCE_Questions, Section.REFERENCE_Section, "rs_quest_lin"); _Section = new SingleAssociation<Question, Section> (this, SINGLEREFERENCE_Section, Section.MULTIPLEREFERENCE_Questions, Section.REFERENCE_Section, "tl_quest_lin");
_Factors = new MultipleAssociation<Question, FactorQuestionLink> (this, MULTIPLEREFERENCE_Factors, FactorQuestionLink.SINGLEREFERENCE_Question, FactorQuestionLink.REFERENCE_FactorQuestionLink); _Factors = new MultipleAssociation<Question, FactorQuestionLink> (this, MULTIPLEREFERENCE_Factors, FactorQuestionLink.SINGLEREFERENCE_Question, FactorQuestionLink.REFERENCE_FactorQuestionLink);
...@@ -800,7 +800,7 @@ public abstract class BaseQuestion extends BaseBusinessClass ...@@ -800,7 +800,7 @@ public abstract class BaseQuestion extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_quest_lin"; return "tl_quest_lin";
} }
...@@ -821,10 +821,10 @@ public abstract class BaseQuestion extends BaseBusinessClass ...@@ -821,10 +821,10 @@ public abstract class BaseQuestion extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_quest_linPSet = allSets.getPersistentSet (myID, "rs_quest_lin", myPSetStatus); PersistentSet tl_quest_linPSet = allSets.getPersistentSet (myID, "tl_quest_lin", myPSetStatus);
rs_quest_linPSet.setAttrib (FIELD_ObjectID, myID); tl_quest_linPSet.setAttrib (FIELD_ObjectID, myID);
rs_quest_linPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); // tl_quest_linPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); //
_Section.getPersistentSets (allSets); _Section.getPersistentSets (allSets);
} }
...@@ -838,9 +838,9 @@ public abstract class BaseQuestion extends BaseBusinessClass ...@@ -838,9 +838,9 @@ public abstract class BaseQuestion extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_quest_linPSet = allSets.getPersistentSet (objectID, "rs_quest_lin"); PersistentSet tl_quest_linPSet = allSets.getPersistentSet (objectID, "tl_quest_lin");
_Description = (String)(HELPER_Description.fromObject (_Description, rs_quest_linPSet.getAttrib (FIELD_Description))); // _Description = (String)(HELPER_Description.fromObject (_Description, tl_quest_linPSet.getAttrib (FIELD_Description))); //
_Section.setFromPersistentSets (objectID, allSets); _Section.setFromPersistentSets (objectID, allSets);
} }
...@@ -1060,32 +1060,32 @@ public abstract class BaseQuestion extends BaseBusinessClass ...@@ -1060,32 +1060,32 @@ public abstract class BaseQuestion extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_quest_lin.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_quest_lin.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_quest_lin.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_quest_lin.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_quest_lin.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_quest_lin.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andDescription (QueryFilter<String> filter) public SearchAll andDescription (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_quest_lin.left_quest", "Description"); filter.addFilter (context, "tl_quest_lin.left_quest", "Description");
return this; return this;
} }
public SearchAll andSection (QueryFilter<Section> filter) public SearchAll andSection (QueryFilter<Section> filter)
{ {
filter.addFilter (context, "rs_quest_lin.section_number", "Section"); filter.addFilter (context, "tl_quest_lin.section_number", "Section");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseSection.java
...@@ -762,7 +762,7 @@ public abstract class BaseSection extends BaseBusinessClass ...@@ -762,7 +762,7 @@ public abstract class BaseSection extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_quest_hdr"; return "tl_quest_hdr";
} }
...@@ -783,11 +783,11 @@ public abstract class BaseSection extends BaseBusinessClass ...@@ -783,11 +783,11 @@ public abstract class BaseSection extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_quest_hdrPSet = allSets.getPersistentSet (myID, "rs_quest_hdr", myPSetStatus); PersistentSet tl_quest_hdrPSet = allSets.getPersistentSet (myID, "tl_quest_hdr", myPSetStatus);
rs_quest_hdrPSet.setAttrib (FIELD_ObjectID, myID); tl_quest_hdrPSet.setAttrib (FIELD_ObjectID, myID);
rs_quest_hdrPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); // tl_quest_hdrPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); //
rs_quest_hdrPSet.setAttrib (FIELD_QuestionType, HELPER_QuestionType.toObject (_QuestionType)); // tl_quest_hdrPSet.setAttrib (FIELD_QuestionType, HELPER_QuestionType.toObject (_QuestionType)); //
} }
...@@ -800,10 +800,10 @@ public abstract class BaseSection extends BaseBusinessClass ...@@ -800,10 +800,10 @@ public abstract class BaseSection extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_quest_hdrPSet = allSets.getPersistentSet (objectID, "rs_quest_hdr"); PersistentSet tl_quest_hdrPSet = allSets.getPersistentSet (objectID, "tl_quest_hdr");
_Description = (String)(HELPER_Description.fromObject (_Description, rs_quest_hdrPSet.getAttrib (FIELD_Description))); // _Description = (String)(HELPER_Description.fromObject (_Description, tl_quest_hdrPSet.getAttrib (FIELD_Description))); //
_QuestionType = (QuestionType)(HELPER_QuestionType.fromObject (_QuestionType, rs_quest_hdrPSet.getAttrib (FIELD_QuestionType))); // _QuestionType = (QuestionType)(HELPER_QuestionType.fromObject (_QuestionType, tl_quest_hdrPSet.getAttrib (FIELD_QuestionType))); //
} }
...@@ -1030,32 +1030,32 @@ public abstract class BaseSection extends BaseBusinessClass ...@@ -1030,32 +1030,32 @@ public abstract class BaseSection extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_quest_hdr.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_quest_hdr.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_quest_hdr.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_quest_hdr.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_quest_hdr.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_quest_hdr.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andDescription (QueryFilter<String> filter) public SearchAll andDescription (QueryFilter<String> filter)
{ {
filter.addFilter (context, "rs_quest_hdr.quest_hdr_desc", "Description"); filter.addFilter (context, "tl_quest_hdr.quest_hdr_desc", "Description");
return this; return this;
} }
public SearchAll andQuestionType (QueryFilter<QuestionType> filter) public SearchAll andQuestionType (QueryFilter<QuestionType> filter)
{ {
filter.addFilter (context, "rs_quest_hdr.quest_type_flag", "QuestionType"); filter.addFilter (context, "tl_quest_hdr.quest_type_flag", "QuestionType");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/BaseTestAnalysis.java
...@@ -180,8 +180,8 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass ...@@ -180,8 +180,8 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_Level = new SingleAssociation<TestAnalysis, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_TestAnalysises, Level.REFERENCE_Level, "rs_test_analysis"); _Level = new SingleAssociation<TestAnalysis, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_TestAnalysises, Level.REFERENCE_Level, "tl_test_analysis");
_Candidate = new SingleAssociation<TestAnalysis, Candidate> (this, SINGLEREFERENCE_Candidate, Candidate.MULTIPLEREFERENCE_TestAnalysises, Candidate.REFERENCE_Candidate, "rs_test_analysis"); _Candidate = new SingleAssociation<TestAnalysis, Candidate> (this, SINGLEREFERENCE_Candidate, Candidate.MULTIPLEREFERENCE_TestAnalysises, Candidate.REFERENCE_Candidate, "tl_test_analysis");
_FactorScores = new MultipleAssociation<TestAnalysis, FactorScore> (this, MULTIPLEREFERENCE_FactorScores, FactorScore.SINGLEREFERENCE_TestAnalysis, FactorScore.REFERENCE_FactorScore); _FactorScores = new MultipleAssociation<TestAnalysis, FactorScore> (this, MULTIPLEREFERENCE_FactorScores, FactorScore.SINGLEREFERENCE_TestAnalysis, FactorScore.REFERENCE_FactorScore);
} }
...@@ -192,8 +192,8 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass ...@@ -192,8 +192,8 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass
{ {
super.initialiseReference (); super.initialiseReference ();
_Level = new SingleAssociation<TestAnalysis, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_TestAnalysises, Level.REFERENCE_Level, "rs_test_analysis"); _Level = new SingleAssociation<TestAnalysis, Level> (this, SINGLEREFERENCE_Level, Level.MULTIPLEREFERENCE_TestAnalysises, Level.REFERENCE_Level, "tl_test_analysis");
_Candidate = new SingleAssociation<TestAnalysis, Candidate> (this, SINGLEREFERENCE_Candidate, Candidate.MULTIPLEREFERENCE_TestAnalysises, Candidate.REFERENCE_Candidate, "rs_test_analysis"); _Candidate = new SingleAssociation<TestAnalysis, Candidate> (this, SINGLEREFERENCE_Candidate, Candidate.MULTIPLEREFERENCE_TestAnalysises, Candidate.REFERENCE_Candidate, "tl_test_analysis");
_FactorScores = new MultipleAssociation<TestAnalysis, FactorScore> (this, MULTIPLEREFERENCE_FactorScores, FactorScore.SINGLEREFERENCE_TestAnalysis, FactorScore.REFERENCE_FactorScore); _FactorScores = new MultipleAssociation<TestAnalysis, FactorScore> (this, MULTIPLEREFERENCE_FactorScores, FactorScore.SINGLEREFERENCE_TestAnalysis, FactorScore.REFERENCE_FactorScore);
...@@ -840,7 +840,7 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass ...@@ -840,7 +840,7 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass
public String getBaseSetName () public String getBaseSetName ()
{ {
return "rs_test_analysis"; return "tl_test_analysis";
} }
...@@ -861,9 +861,9 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass ...@@ -861,9 +861,9 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass
super.getPersistentSets (allSets); super.getPersistentSets (allSets);
PersistentSet rs_test_analysisPSet = allSets.getPersistentSet (myID, "rs_test_analysis", myPSetStatus); PersistentSet tl_test_analysisPSet = allSets.getPersistentSet (myID, "tl_test_analysis", myPSetStatus);
rs_test_analysisPSet.setAttrib (FIELD_ObjectID, myID); tl_test_analysisPSet.setAttrib (FIELD_ObjectID, myID);
_Level.getPersistentSets (allSets); _Level.getPersistentSets (allSets);
_Candidate.getPersistentSets (allSets); _Candidate.getPersistentSets (allSets);
...@@ -878,7 +878,7 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass ...@@ -878,7 +878,7 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass
super.setFromPersistentSets (objectID, allSets); super.setFromPersistentSets (objectID, allSets);
PersistentSet rs_test_analysisPSet = allSets.getPersistentSet (objectID, "rs_test_analysis"); PersistentSet tl_test_analysisPSet = allSets.getPersistentSet (objectID, "tl_test_analysis");
_Level.setFromPersistentSets (objectID, allSets); _Level.setFromPersistentSets (objectID, allSets);
_Candidate.setFromPersistentSets (objectID, allSets); _Candidate.setFromPersistentSets (objectID, allSets);
...@@ -1092,32 +1092,32 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass ...@@ -1092,32 +1092,32 @@ public abstract class BaseTestAnalysis extends BaseBusinessClass
public SearchAll andObjectID (QueryFilter<Long> filter) public SearchAll andObjectID (QueryFilter<Long> filter)
{ {
filter.addFilter (context, "rs_test_analysis.object_id", FIELD_ObjectID); filter.addFilter (context, "tl_test_analysis.object_id", FIELD_ObjectID);
return this; return this;
} }
public SearchAll andObjectCreated (QueryFilter<Date> filter) public SearchAll andObjectCreated (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_test_analysis.object_created_date", FIELD_ObjectCreated); filter.addFilter (context, "tl_test_analysis.object_created_date", FIELD_ObjectCreated);
return this; return this;
} }
public SearchAll andObjectLastModified (QueryFilter<Date> filter) public SearchAll andObjectLastModified (QueryFilter<Date> filter)
{ {
filter.addFilter (context, "rs_test_analysis.object_last_updated_date", FIELD_ObjectLastModified); filter.addFilter (context, "tl_test_analysis.object_last_updated_date", FIELD_ObjectLastModified);
return this; return this;
} }
public SearchAll andLevel (QueryFilter<Level> filter) public SearchAll andLevel (QueryFilter<Level> filter)
{ {
filter.addFilter (context, "rs_test_analysis.level_id", "Level"); filter.addFilter (context, "tl_test_analysis.level_id", "Level");
return this; return this;
} }
public SearchAll andCandidate (QueryFilter<Candidate> filter) public SearchAll andCandidate (QueryFilter<Candidate> filter)
{ {
filter.addFilter (context, "rs_test_analysis.candidate_id", "Candidate"); filter.addFilter (context, "tl_test_analysis.candidate_id", "Candidate");
return this; return this;
} }
......
cmsWebApp/src/performa/orm/Candidate.xml
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<MULTIPLEREFERENCE name="TestAnalysises" type="TestAnalysis" backreferenceName="Candidate" /> <MULTIPLEREFERENCE name="TestAnalysises" type="TestAnalysis" backreferenceName="Candidate" />
<MULTIPLEREFERENCE name="Answers" type="Answer" backreferenceName="Candidate" /> <MULTIPLEREFERENCE name="Answers" type="Answer" backreferenceName="Candidate" />
<TABLE name="rs_candidate" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_candidate" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="FirstName" type="String" dbcol="first_name" length="30"/> <ATTRIB name="FirstName" type="String" dbcol="first_name" length="30"/>
<SINGLEREFERENCE name="TestInput" type="TestInput" dbcol="test_input_id" backreferenceName="Candidates"/> <SINGLEREFERENCE name="TestInput" type="TestInput" dbcol="test_input_id" backreferenceName="Candidates"/>
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_candidate.object_id is not null" orderBy="rs_candidate.object_id" /> <SEARCH type="All" paramFilter="tl_candidate.object_id is not null" orderBy="tl_candidate.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/CandidatePersistenceMgr.java
...@@ -41,7 +41,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -41,7 +41,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_candidate.object_id as id, {PREFIX}rs_candidate.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_candidate.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_candidate.first_name, {PREFIX}rs_candidate.test_input_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_candidate.object_id as id, {PREFIX}tl_candidate.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_candidate.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_candidate.first_name, {PREFIX}tl_candidate.test_input_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -86,14 +86,14 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -86,14 +86,14 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_candidatePSet = allPSets.getPersistentSet(id, "rs_candidate", PersistentSetStatus.FETCHED); PersistentSet tl_candidatePSet = allPSets.getPersistentSet(id, "tl_candidate", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_candidatePSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_candidatePSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_candidatePSet.containsAttrib(Candidate.FIELD_FirstName)|| !tl_candidatePSet.containsAttrib(Candidate.FIELD_FirstName)||
!rs_candidatePSet.containsAttrib(Candidate.SINGLEREFERENCE_TestInput)) !tl_candidatePSet.containsAttrib(Candidate.SINGLEREFERENCE_TestInput))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -116,8 +116,8 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -116,8 +116,8 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_candidate " + "FROM {PREFIX}tl_candidate " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_candidate.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_candidate.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -142,7 +142,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -142,7 +142,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (Candidate.SINGLEREFERENCE_TestInput)) else if (refName.equals (Candidate.SINGLEREFERENCE_TestInput))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_candidate " + "FROM {PREFIX}tl_candidate " +
"WHERE " + SELECT_JOINS + "test_input_id = ?"; "WHERE " + SELECT_JOINS + "test_input_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -164,47 +164,47 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -164,47 +164,47 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_candidatePSet = allPSets.getPersistentSet(objectID, "rs_candidate"); PersistentSet tl_candidatePSet = allPSets.getPersistentSet(objectID, "tl_candidate");
if (rs_candidatePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_candidatePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_candidatePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_candidatePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_candidate " + "UPDATE {PREFIX}tl_candidate " +
"SET first_name = ?, test_input_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET first_name = ?, test_input_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_candidate.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_candidate.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_FirstName.getForSQL(dummyFirstName, rs_candidatePSet.getAttrib (Candidate.FIELD_FirstName))).listEntry (SQLManager.CheckNull((Long)(rs_candidatePSet.getAttrib (Candidate.SINGLEREFERENCE_TestInput)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_FirstName.getForSQL(dummyFirstName, tl_candidatePSet.getAttrib (Candidate.FIELD_FirstName))).listEntry (SQLManager.CheckNull((Long)(tl_candidatePSet.getAttrib (Candidate.SINGLEREFERENCE_TestInput)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_candidate WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_candidate WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_candidate", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_candidate", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (CandidatePersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CandidatePersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_candidate"); throw new ConcurrentUpdateConflictException (obj, "tl_candidate");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_candidate for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_candidate for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (CandidatePersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CandidatePersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_candidatePSet.setStatus (PersistentSetStatus.PROCESSED); tl_candidatePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -219,42 +219,42 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -219,42 +219,42 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_candidatePSet = allPSets.getPersistentSet(objectID, "rs_candidate"); PersistentSet tl_candidatePSet = allPSets.getPersistentSet(objectID, "tl_candidate");
LogMgr.log (CandidatePersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (CandidatePersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_candidatePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_candidatePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_candidatePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_candidatePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_candidate " + "FROM {PREFIX}tl_candidate " +
"WHERE rs_candidate.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_candidate.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_candidate WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_candidate WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_candidate"); throw new ConcurrentUpdateConflictException (obj, "tl_candidate");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_candidate for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_candidate for row:" + objectID;
LogMgr.log (CandidatePersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (CandidatePersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_candidatePSet.setStatus (PersistentSetStatus.PROCESSED); tl_candidatePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -309,7 +309,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -309,7 +309,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_candidatePSet = allPSets.getPersistentSet(objectID, "rs_candidate", PersistentSetStatus.FETCHED); PersistentSet tl_candidatePSet = allPSets.getPersistentSet(objectID, "tl_candidate", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -368,7 +368,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -368,7 +368,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_candidate " + tables + "FROM {PREFIX}tl_candidate " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -384,12 +384,12 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -384,12 +384,12 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_candidate.object_id"; String orderBy = " ORDER BY tl_candidate.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_candidate.object_id is not null Object[] searchParams; // paramFilter: tl_candidate.object_id is not null
String preFilter = "(rs_candidate.object_id is not null)" String preFilter = "(tl_candidate.object_id is not null)"
+ " "; + " ";
...@@ -404,7 +404,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -404,7 +404,7 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_candidate " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_candidate " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -424,17 +424,17 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -424,17 +424,17 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_candidatePSet = allPSets.getPersistentSet(objectID, "rs_candidate", PersistentSetStatus.FETCHED); PersistentSet tl_candidatePSet = allPSets.getPersistentSet(objectID, "tl_candidate", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_candidatePSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_candidatePSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_candidatePSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_candidatePSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_candidatePSet.setAttrib(Candidate.FIELD_FirstName, HELPER_FirstName.getFromRS(dummyFirstName, r, "first_name")); tl_candidatePSet.setAttrib(Candidate.FIELD_FirstName, HELPER_FirstName.getFromRS(dummyFirstName, r, "first_name"));
rs_candidatePSet.setAttrib(Candidate.SINGLEREFERENCE_TestInput, r.getObject ("test_input_id")); tl_candidatePSet.setAttrib(Candidate.SINGLEREFERENCE_TestInput, r.getObject ("test_input_id"));
} }
...@@ -442,21 +442,21 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr ...@@ -442,21 +442,21 @@ public class CandidatePersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_candidatePSet = allPSets.getPersistentSet(objectID, "rs_candidate"); PersistentSet tl_candidatePSet = allPSets.getPersistentSet(objectID, "tl_candidate");
if (rs_candidatePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_candidatePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_candidatePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_candidatePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_candidate " + "INSERT INTO {PREFIX}tl_candidate " +
" (first_name, test_input_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (first_name, test_input_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_FirstName.getForSQL(dummyFirstName, rs_candidatePSet.getAttrib (Candidate.FIELD_FirstName))) .listEntry (SQLManager.CheckNull((Long)(rs_candidatePSet.getAttrib (Candidate.SINGLEREFERENCE_TestInput)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_FirstName.getForSQL(dummyFirstName, tl_candidatePSet.getAttrib (Candidate.FIELD_FirstName))) .listEntry (SQLManager.CheckNull((Long)(tl_candidatePSet.getAttrib (Candidate.SINGLEREFERENCE_TestInput)))) .listEntry (objectID.longID ()).toList().toArray());
rs_candidatePSet.setStatus (PersistentSetStatus.PROCESSED); tl_candidatePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/CultureElement.xml
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
<MULTIPLEREFERENCE name="Ratings" type="CultureElementRating" backreferenceName="CultureElement" /> <MULTIPLEREFERENCE name="Ratings" type="CultureElementRating" backreferenceName="CultureElement" />
<MULTIPLEREFERENCE name="Narratives" type="CultureNarrative" backreferenceName="CultureElement" /> <MULTIPLEREFERENCE name="Narratives" type="CultureNarrative" backreferenceName="CultureElement" />
<TABLE name="rs_culture_element" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_culture_element" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Description" type="String" dbcol="culture_element_desc" length="200"/> <ATTRIB name="Description" type="String" dbcol="culture_element_desc" length="200"/>
<ATTRIB name="CultureClass" type="CultureClass" dbcol="culture_class_code" attribHelper="EnumeratedAttributeHelper" /> <ATTRIB name="CultureClass" type="CultureClass" dbcol="culture_class_code" attribHelper="EnumeratedAttributeHelper" />
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_culture_element.object_id is not null" orderBy="rs_culture_element.object_id" /> <SEARCH type="All" paramFilter="tl_culture_element.object_id is not null" orderBy="tl_culture_element.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/CultureElementPersistenceMgr.java
...@@ -45,7 +45,7 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -45,7 +45,7 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_culture_element.object_id as id, {PREFIX}rs_culture_element.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_culture_element.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_culture_element.culture_element_desc, {PREFIX}rs_culture_element.culture_class_code, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_culture_element.object_id as id, {PREFIX}tl_culture_element.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_culture_element.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_culture_element.culture_element_desc, {PREFIX}tl_culture_element.culture_class_code, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -90,14 +90,14 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -90,14 +90,14 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_culture_elementPSet = allPSets.getPersistentSet(id, "rs_culture_element", PersistentSetStatus.FETCHED); PersistentSet tl_culture_elementPSet = allPSets.getPersistentSet(id, "tl_culture_element", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_culture_elementPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_culture_elementPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_culture_elementPSet.containsAttrib(CultureElement.FIELD_Description)|| !tl_culture_elementPSet.containsAttrib(CultureElement.FIELD_Description)||
!rs_culture_elementPSet.containsAttrib(CultureElement.FIELD_CultureClass)) !tl_culture_elementPSet.containsAttrib(CultureElement.FIELD_CultureClass))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -120,8 +120,8 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -120,8 +120,8 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element " + "FROM {PREFIX}tl_culture_element " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_culture_element.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_culture_element.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -158,47 +158,47 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -158,47 +158,47 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_culture_elementPSet = allPSets.getPersistentSet(objectID, "rs_culture_element"); PersistentSet tl_culture_elementPSet = allPSets.getPersistentSet(objectID, "tl_culture_element");
if (rs_culture_elementPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_elementPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_elementPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_elementPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_culture_element " + "UPDATE {PREFIX}tl_culture_element " +
"SET culture_element_desc = ?, culture_class_code = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET culture_element_desc = ?, culture_class_code = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_culture_element.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_culture_element.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_culture_elementPSet.getAttrib (CultureElement.FIELD_Description))).listEntry (HELPER_CultureClass.getForSQL(dummyCultureClass, rs_culture_elementPSet.getAttrib (CultureElement.FIELD_CultureClass))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_culture_elementPSet.getAttrib (CultureElement.FIELD_Description))).listEntry (HELPER_CultureClass.getForSQL(dummyCultureClass, tl_culture_elementPSet.getAttrib (CultureElement.FIELD_CultureClass))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_culture_element WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_culture_element WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_culture_element", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_culture_element", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (CultureElementPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CultureElementPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_culture_element"); throw new ConcurrentUpdateConflictException (obj, "tl_culture_element");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_culture_element for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_culture_element for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (CultureElementPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CultureElementPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_culture_elementPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_elementPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -213,42 +213,42 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -213,42 +213,42 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_culture_elementPSet = allPSets.getPersistentSet(objectID, "rs_culture_element"); PersistentSet tl_culture_elementPSet = allPSets.getPersistentSet(objectID, "tl_culture_element");
LogMgr.log (CultureElementPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (CultureElementPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_culture_elementPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_elementPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_elementPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_elementPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_culture_element " + "FROM {PREFIX}tl_culture_element " +
"WHERE rs_culture_element.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_culture_element.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_culture_element WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_culture_element WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_culture_element"); throw new ConcurrentUpdateConflictException (obj, "tl_culture_element");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_culture_element for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_culture_element for row:" + objectID;
LogMgr.log (CultureElementPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (CultureElementPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_culture_elementPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_elementPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -303,7 +303,7 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -303,7 +303,7 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_culture_elementPSet = allPSets.getPersistentSet(objectID, "rs_culture_element", PersistentSetStatus.FETCHED); PersistentSet tl_culture_elementPSet = allPSets.getPersistentSet(objectID, "tl_culture_element", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -362,7 +362,7 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -362,7 +362,7 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element " + tables + "FROM {PREFIX}tl_culture_element " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -378,12 +378,12 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -378,12 +378,12 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_culture_element.object_id"; String orderBy = " ORDER BY tl_culture_element.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_culture_element.object_id is not null Object[] searchParams; // paramFilter: tl_culture_element.object_id is not null
String preFilter = "(rs_culture_element.object_id is not null)" String preFilter = "(tl_culture_element.object_id is not null)"
+ " "; + " ";
...@@ -398,7 +398,7 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -398,7 +398,7 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_culture_element " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -418,16 +418,16 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -418,16 +418,16 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_culture_elementPSet = allPSets.getPersistentSet(objectID, "rs_culture_element", PersistentSetStatus.FETCHED); PersistentSet tl_culture_elementPSet = allPSets.getPersistentSet(objectID, "tl_culture_element", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_culture_elementPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_culture_elementPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_culture_elementPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_culture_elementPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_culture_elementPSet.setAttrib(CultureElement.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "culture_element_desc")); tl_culture_elementPSet.setAttrib(CultureElement.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "culture_element_desc"));
rs_culture_elementPSet.setAttrib(CultureElement.FIELD_CultureClass, HELPER_CultureClass.getFromRS(dummyCultureClass, r, "culture_class_code")); tl_culture_elementPSet.setAttrib(CultureElement.FIELD_CultureClass, HELPER_CultureClass.getFromRS(dummyCultureClass, r, "culture_class_code"));
} }
...@@ -436,21 +436,21 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr ...@@ -436,21 +436,21 @@ public class CultureElementPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_culture_elementPSet = allPSets.getPersistentSet(objectID, "rs_culture_element"); PersistentSet tl_culture_elementPSet = allPSets.getPersistentSet(objectID, "tl_culture_element");
if (rs_culture_elementPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_elementPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_elementPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_elementPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_culture_element " + "INSERT INTO {PREFIX}tl_culture_element " +
" (culture_element_desc, culture_class_code, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (culture_element_desc, culture_class_code, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_culture_elementPSet.getAttrib (CultureElement.FIELD_Description))).listEntry (HELPER_CultureClass.getForSQL(dummyCultureClass, rs_culture_elementPSet.getAttrib (CultureElement.FIELD_CultureClass))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_culture_elementPSet.getAttrib (CultureElement.FIELD_Description))).listEntry (HELPER_CultureClass.getForSQL(dummyCultureClass, tl_culture_elementPSet.getAttrib (CultureElement.FIELD_CultureClass))) .listEntry (objectID.longID ()).toList().toArray());
rs_culture_elementPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_elementPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/CultureElementQuestion.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<MULTIPLEREFERENCE name="Narratives" type="CultureNarrative" backreferenceName="CultureElementQuestion" /> <MULTIPLEREFERENCE name="Narratives" type="CultureNarrative" backreferenceName="CultureElementQuestion" />
<TABLE name="rs_culture_element_quest" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_culture_element_quest" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Description" type="String" dbcol="quest" length="200"/> <ATTRIB name="Description" type="String" dbcol="quest" length="200"/>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_culture_element_quest.object_id is not null" orderBy="rs_culture_element_quest.object_id" /> <SEARCH type="All" paramFilter="tl_culture_element_quest.object_id is not null" orderBy="tl_culture_element_quest.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/CultureElementQuestionPersistenceMgr.java
...@@ -41,7 +41,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -41,7 +41,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_culture_element_quest.object_id as id, {PREFIX}rs_culture_element_quest.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_culture_element_quest.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_culture_element_quest.quest, {PREFIX}rs_culture_element_quest.culture_element_number, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_culture_element_quest.object_id as id, {PREFIX}tl_culture_element_quest.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_culture_element_quest.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_culture_element_quest.quest, {PREFIX}tl_culture_element_quest.culture_element_number, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -86,14 +86,14 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -86,14 +86,14 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_culture_element_questPSet = allPSets.getPersistentSet(id, "rs_culture_element_quest", PersistentSetStatus.FETCHED); PersistentSet tl_culture_element_questPSet = allPSets.getPersistentSet(id, "tl_culture_element_quest", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_culture_element_questPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_culture_element_questPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_culture_element_questPSet.containsAttrib(CultureElementQuestion.FIELD_Description)|| !tl_culture_element_questPSet.containsAttrib(CultureElementQuestion.FIELD_Description)||
!rs_culture_element_questPSet.containsAttrib(CultureElementQuestion.SINGLEREFERENCE_CultureElement)) !tl_culture_element_questPSet.containsAttrib(CultureElementQuestion.SINGLEREFERENCE_CultureElement))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -116,8 +116,8 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -116,8 +116,8 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element_quest " + "FROM {PREFIX}tl_culture_element_quest " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_culture_element_quest.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_culture_element_quest.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -142,7 +142,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -142,7 +142,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (CultureElementQuestion.SINGLEREFERENCE_CultureElement)) else if (refName.equals (CultureElementQuestion.SINGLEREFERENCE_CultureElement))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element_quest " + "FROM {PREFIX}tl_culture_element_quest " +
"WHERE " + SELECT_JOINS + "culture_element_number = ?"; "WHERE " + SELECT_JOINS + "culture_element_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -164,47 +164,47 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -164,47 +164,47 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_culture_element_questPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_quest"); PersistentSet tl_culture_element_questPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_quest");
if (rs_culture_element_questPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_element_questPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_element_questPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_element_questPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_culture_element_quest " + "UPDATE {PREFIX}tl_culture_element_quest " +
"SET quest = ?, culture_element_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET quest = ?, culture_element_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_culture_element_quest.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_culture_element_quest.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_culture_element_questPSet.getAttrib (CultureElementQuestion.FIELD_Description))).listEntry (SQLManager.CheckNull((Long)(rs_culture_element_questPSet.getAttrib (CultureElementQuestion.SINGLEREFERENCE_CultureElement)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_culture_element_questPSet.getAttrib (CultureElementQuestion.FIELD_Description))).listEntry (SQLManager.CheckNull((Long)(tl_culture_element_questPSet.getAttrib (CultureElementQuestion.SINGLEREFERENCE_CultureElement)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_culture_element_quest WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_culture_element_quest WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_culture_element_quest", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_culture_element_quest", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (CultureElementQuestionPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CultureElementQuestionPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_culture_element_quest"); throw new ConcurrentUpdateConflictException (obj, "tl_culture_element_quest");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_culture_element_quest for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_culture_element_quest for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (CultureElementQuestionPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CultureElementQuestionPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_culture_element_questPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_element_questPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -219,42 +219,42 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -219,42 +219,42 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_culture_element_questPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_quest"); PersistentSet tl_culture_element_questPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_quest");
LogMgr.log (CultureElementQuestionPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (CultureElementQuestionPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_culture_element_questPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_element_questPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_element_questPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_element_questPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_culture_element_quest " + "FROM {PREFIX}tl_culture_element_quest " +
"WHERE rs_culture_element_quest.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_culture_element_quest.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_culture_element_quest WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_culture_element_quest WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_culture_element_quest"); throw new ConcurrentUpdateConflictException (obj, "tl_culture_element_quest");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_culture_element_quest for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_culture_element_quest for row:" + objectID;
LogMgr.log (CultureElementQuestionPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (CultureElementQuestionPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_culture_element_questPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_element_questPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -309,7 +309,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -309,7 +309,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_culture_element_questPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_quest", PersistentSetStatus.FETCHED); PersistentSet tl_culture_element_questPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_quest", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -368,7 +368,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -368,7 +368,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element_quest " + tables + "FROM {PREFIX}tl_culture_element_quest " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -384,12 +384,12 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -384,12 +384,12 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_culture_element_quest.object_id"; String orderBy = " ORDER BY tl_culture_element_quest.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_culture_element_quest.object_id is not null Object[] searchParams; // paramFilter: tl_culture_element_quest.object_id is not null
String preFilter = "(rs_culture_element_quest.object_id is not null)" String preFilter = "(tl_culture_element_quest.object_id is not null)"
+ " "; + " ";
...@@ -404,7 +404,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -404,7 +404,7 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element_quest " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_culture_element_quest " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -424,17 +424,17 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -424,17 +424,17 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_culture_element_questPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_quest", PersistentSetStatus.FETCHED); PersistentSet tl_culture_element_questPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_quest", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_culture_element_questPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_culture_element_questPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_culture_element_questPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_culture_element_questPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_culture_element_questPSet.setAttrib(CultureElementQuestion.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "quest")); tl_culture_element_questPSet.setAttrib(CultureElementQuestion.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "quest"));
rs_culture_element_questPSet.setAttrib(CultureElementQuestion.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_number")); tl_culture_element_questPSet.setAttrib(CultureElementQuestion.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_number"));
} }
...@@ -442,21 +442,21 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -442,21 +442,21 @@ public class CultureElementQuestionPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_culture_element_questPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_quest"); PersistentSet tl_culture_element_questPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_quest");
if (rs_culture_element_questPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_element_questPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_element_questPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_element_questPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_culture_element_quest " + "INSERT INTO {PREFIX}tl_culture_element_quest " +
" (quest, culture_element_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (quest, culture_element_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_culture_element_questPSet.getAttrib (CultureElementQuestion.FIELD_Description))) .listEntry (SQLManager.CheckNull((Long)(rs_culture_element_questPSet.getAttrib (CultureElementQuestion.SINGLEREFERENCE_CultureElement)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_culture_element_questPSet.getAttrib (CultureElementQuestion.FIELD_Description))) .listEntry (SQLManager.CheckNull((Long)(tl_culture_element_questPSet.getAttrib (CultureElementQuestion.SINGLEREFERENCE_CultureElement)))) .listEntry (objectID.longID ()).toList().toArray());
rs_culture_element_questPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_element_questPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/CultureElementRating.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<MULTIPLEREFERENCE name="Narratives" type="CultureNarrative" backreferenceName="CultureElementRating" /> <MULTIPLEREFERENCE name="Narratives" type="CultureNarrative" backreferenceName="CultureElementRating" />
<TABLE name="rs_culture_element_rating" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_culture_element_rating" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Description" type="String" dbcol="culture_element_rating_desc" length="200"/> <ATTRIB name="Description" type="String" dbcol="culture_element_rating_desc" length="200"/>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_culture_element_rating.object_id is not null" orderBy="rs_culture_element_rating.object_id" /> <SEARCH type="All" paramFilter="tl_culture_element_rating.object_id is not null" orderBy="tl_culture_element_rating.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/CultureElementRatingPersistenceMgr.java
...@@ -41,7 +41,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -41,7 +41,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_culture_element_rating.object_id as id, {PREFIX}rs_culture_element_rating.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_culture_element_rating.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_culture_element_rating.culture_element_rating_desc, {PREFIX}rs_culture_element_rating.culture_element_number, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_culture_element_rating.object_id as id, {PREFIX}tl_culture_element_rating.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_culture_element_rating.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_culture_element_rating.culture_element_rating_desc, {PREFIX}tl_culture_element_rating.culture_element_number, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -86,14 +86,14 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -86,14 +86,14 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_culture_element_ratingPSet = allPSets.getPersistentSet(id, "rs_culture_element_rating", PersistentSetStatus.FETCHED); PersistentSet tl_culture_element_ratingPSet = allPSets.getPersistentSet(id, "tl_culture_element_rating", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_culture_element_ratingPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_culture_element_ratingPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_culture_element_ratingPSet.containsAttrib(CultureElementRating.FIELD_Description)|| !tl_culture_element_ratingPSet.containsAttrib(CultureElementRating.FIELD_Description)||
!rs_culture_element_ratingPSet.containsAttrib(CultureElementRating.SINGLEREFERENCE_CultureElement)) !tl_culture_element_ratingPSet.containsAttrib(CultureElementRating.SINGLEREFERENCE_CultureElement))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -116,8 +116,8 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -116,8 +116,8 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element_rating " + "FROM {PREFIX}tl_culture_element_rating " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_culture_element_rating.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_culture_element_rating.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -142,7 +142,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -142,7 +142,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (CultureElementRating.SINGLEREFERENCE_CultureElement)) else if (refName.equals (CultureElementRating.SINGLEREFERENCE_CultureElement))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element_rating " + "FROM {PREFIX}tl_culture_element_rating " +
"WHERE " + SELECT_JOINS + "culture_element_number = ?"; "WHERE " + SELECT_JOINS + "culture_element_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -164,47 +164,47 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -164,47 +164,47 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_rating"); PersistentSet tl_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_rating");
if (rs_culture_element_ratingPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_element_ratingPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_element_ratingPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_element_ratingPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_culture_element_rating " + "UPDATE {PREFIX}tl_culture_element_rating " +
"SET culture_element_rating_desc = ?, culture_element_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET culture_element_rating_desc = ?, culture_element_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_culture_element_rating.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_culture_element_rating.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_culture_element_ratingPSet.getAttrib (CultureElementRating.FIELD_Description))).listEntry (SQLManager.CheckNull((Long)(rs_culture_element_ratingPSet.getAttrib (CultureElementRating.SINGLEREFERENCE_CultureElement)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_culture_element_ratingPSet.getAttrib (CultureElementRating.FIELD_Description))).listEntry (SQLManager.CheckNull((Long)(tl_culture_element_ratingPSet.getAttrib (CultureElementRating.SINGLEREFERENCE_CultureElement)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_culture_element_rating WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_culture_element_rating WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_culture_element_rating", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_culture_element_rating", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (CultureElementRatingPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CultureElementRatingPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_culture_element_rating"); throw new ConcurrentUpdateConflictException (obj, "tl_culture_element_rating");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_culture_element_rating for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_culture_element_rating for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (CultureElementRatingPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CultureElementRatingPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_culture_element_ratingPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_element_ratingPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -219,42 +219,42 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -219,42 +219,42 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_rating"); PersistentSet tl_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_rating");
LogMgr.log (CultureElementRatingPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (CultureElementRatingPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_culture_element_ratingPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_element_ratingPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_element_ratingPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_element_ratingPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_culture_element_rating " + "FROM {PREFIX}tl_culture_element_rating " +
"WHERE rs_culture_element_rating.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_culture_element_rating.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_culture_element_rating WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_culture_element_rating WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_culture_element_rating"); throw new ConcurrentUpdateConflictException (obj, "tl_culture_element_rating");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_culture_element_rating for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_culture_element_rating for row:" + objectID;
LogMgr.log (CultureElementRatingPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (CultureElementRatingPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_culture_element_ratingPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_element_ratingPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -309,7 +309,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -309,7 +309,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_rating", PersistentSetStatus.FETCHED); PersistentSet tl_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_rating", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -368,7 +368,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -368,7 +368,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element_rating " + tables + "FROM {PREFIX}tl_culture_element_rating " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -384,12 +384,12 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -384,12 +384,12 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_culture_element_rating.object_id"; String orderBy = " ORDER BY tl_culture_element_rating.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_culture_element_rating.object_id is not null Object[] searchParams; // paramFilter: tl_culture_element_rating.object_id is not null
String preFilter = "(rs_culture_element_rating.object_id is not null)" String preFilter = "(tl_culture_element_rating.object_id is not null)"
+ " "; + " ";
...@@ -404,7 +404,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -404,7 +404,7 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_element_rating " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_culture_element_rating " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -424,17 +424,17 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -424,17 +424,17 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_rating", PersistentSetStatus.FETCHED); PersistentSet tl_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_rating", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_culture_element_ratingPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_culture_element_ratingPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_culture_element_ratingPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_culture_element_ratingPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_culture_element_ratingPSet.setAttrib(CultureElementRating.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "culture_element_rating_desc")); tl_culture_element_ratingPSet.setAttrib(CultureElementRating.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "culture_element_rating_desc"));
rs_culture_element_ratingPSet.setAttrib(CultureElementRating.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_number")); tl_culture_element_ratingPSet.setAttrib(CultureElementRating.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_number"));
} }
...@@ -442,21 +442,21 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr ...@@ -442,21 +442,21 @@ public class CultureElementRatingPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "rs_culture_element_rating"); PersistentSet tl_culture_element_ratingPSet = allPSets.getPersistentSet(objectID, "tl_culture_element_rating");
if (rs_culture_element_ratingPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_element_ratingPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_element_ratingPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_element_ratingPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_culture_element_rating " + "INSERT INTO {PREFIX}tl_culture_element_rating " +
" (culture_element_rating_desc, culture_element_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (culture_element_rating_desc, culture_element_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_culture_element_ratingPSet.getAttrib (CultureElementRating.FIELD_Description))) .listEntry (SQLManager.CheckNull((Long)(rs_culture_element_ratingPSet.getAttrib (CultureElementRating.SINGLEREFERENCE_CultureElement)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_culture_element_ratingPSet.getAttrib (CultureElementRating.FIELD_Description))) .listEntry (SQLManager.CheckNull((Long)(tl_culture_element_ratingPSet.getAttrib (CultureElementRating.SINGLEREFERENCE_CultureElement)))) .listEntry (objectID.longID ()).toList().toArray());
rs_culture_element_ratingPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_element_ratingPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/CultureNarrative.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<IMPORT value="performa.orm.types.*"/> <IMPORT value="performa.orm.types.*"/>
<TABLE name="rs_culture_narrative" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_culture_narrative" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Notes" type="String" dbcol="narrative_notes" /> <ATTRIB name="Notes" type="String" dbcol="narrative_notes" />
<ATTRIB name="ColorCode" type="ColorCode" dbcol="color_code" attribHelper="EnumeratedAttributeHelper" /> <ATTRIB name="ColorCode" type="ColorCode" dbcol="color_code" attribHelper="EnumeratedAttributeHelper" />
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_culture_narrative.object_id is not null" orderBy="rs_culture_narrative.object_id" /> <SEARCH type="All" paramFilter="tl_culture_narrative.object_id is not null" orderBy="tl_culture_narrative.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/CultureNarrativePersistenceMgr.java
...@@ -45,7 +45,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -45,7 +45,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_culture_narrative.object_id as id, {PREFIX}rs_culture_narrative.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_culture_narrative.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_culture_narrative.narrative_notes, {PREFIX}rs_culture_narrative.color_code, {PREFIX}rs_culture_narrative.culture_element_number, {PREFIX}rs_culture_narrative.culture_element_quest_id, {PREFIX}rs_culture_narrative.culture_element_rating_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_culture_narrative.object_id as id, {PREFIX}tl_culture_narrative.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_culture_narrative.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_culture_narrative.narrative_notes, {PREFIX}tl_culture_narrative.color_code, {PREFIX}tl_culture_narrative.culture_element_number, {PREFIX}tl_culture_narrative.culture_element_quest_id, {PREFIX}tl_culture_narrative.culture_element_rating_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -90,17 +90,17 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -90,17 +90,17 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_culture_narrativePSet = allPSets.getPersistentSet(id, "rs_culture_narrative", PersistentSetStatus.FETCHED); PersistentSet tl_culture_narrativePSet = allPSets.getPersistentSet(id, "tl_culture_narrative", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_culture_narrativePSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_culture_narrativePSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_culture_narrativePSet.containsAttrib(CultureNarrative.FIELD_Notes)|| !tl_culture_narrativePSet.containsAttrib(CultureNarrative.FIELD_Notes)||
!rs_culture_narrativePSet.containsAttrib(CultureNarrative.FIELD_ColorCode)|| !tl_culture_narrativePSet.containsAttrib(CultureNarrative.FIELD_ColorCode)||
!rs_culture_narrativePSet.containsAttrib(CultureNarrative.SINGLEREFERENCE_CultureElement)|| !tl_culture_narrativePSet.containsAttrib(CultureNarrative.SINGLEREFERENCE_CultureElement)||
!rs_culture_narrativePSet.containsAttrib(CultureNarrative.SINGLEREFERENCE_CultureElementQuestion)|| !tl_culture_narrativePSet.containsAttrib(CultureNarrative.SINGLEREFERENCE_CultureElementQuestion)||
!rs_culture_narrativePSet.containsAttrib(CultureNarrative.SINGLEREFERENCE_CultureElementRating)) !tl_culture_narrativePSet.containsAttrib(CultureNarrative.SINGLEREFERENCE_CultureElementRating))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -123,8 +123,8 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -123,8 +123,8 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_narrative " + "FROM {PREFIX}tl_culture_narrative " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_culture_narrative.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_culture_narrative.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -149,7 +149,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -149,7 +149,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (CultureNarrative.SINGLEREFERENCE_CultureElement)) else if (refName.equals (CultureNarrative.SINGLEREFERENCE_CultureElement))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_narrative " + "FROM {PREFIX}tl_culture_narrative " +
"WHERE " + SELECT_JOINS + "culture_element_number = ?"; "WHERE " + SELECT_JOINS + "culture_element_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -159,7 +159,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -159,7 +159,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (CultureNarrative.SINGLEREFERENCE_CultureElementQuestion)) else if (refName.equals (CultureNarrative.SINGLEREFERENCE_CultureElementQuestion))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_narrative " + "FROM {PREFIX}tl_culture_narrative " +
"WHERE " + SELECT_JOINS + "culture_element_quest_id = ?"; "WHERE " + SELECT_JOINS + "culture_element_quest_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -169,7 +169,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -169,7 +169,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (CultureNarrative.SINGLEREFERENCE_CultureElementRating)) else if (refName.equals (CultureNarrative.SINGLEREFERENCE_CultureElementRating))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_narrative " + "FROM {PREFIX}tl_culture_narrative " +
"WHERE " + SELECT_JOINS + "culture_element_rating_id = ?"; "WHERE " + SELECT_JOINS + "culture_element_rating_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -191,47 +191,47 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -191,47 +191,47 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_culture_narrativePSet = allPSets.getPersistentSet(objectID, "rs_culture_narrative"); PersistentSet tl_culture_narrativePSet = allPSets.getPersistentSet(objectID, "tl_culture_narrative");
if (rs_culture_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_culture_narrative " + "UPDATE {PREFIX}tl_culture_narrative " +
"SET narrative_notes = ?, color_code = ?, culture_element_number = ? , culture_element_quest_id = ? , culture_element_rating_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET narrative_notes = ?, color_code = ?, culture_element_number = ? , culture_element_quest_id = ? , culture_element_rating_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_culture_narrative.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_culture_narrative.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Notes.getForSQL(dummyNotes, rs_culture_narrativePSet.getAttrib (CultureNarrative.FIELD_Notes))).listEntry (HELPER_ColorCode.getForSQL(dummyColorCode, rs_culture_narrativePSet.getAttrib (CultureNarrative.FIELD_ColorCode))).listEntry (SQLManager.CheckNull((Long)(rs_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(rs_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElementQuestion)))).listEntry (SQLManager.CheckNull((Long)(rs_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElementRating)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Notes.getForSQL(dummyNotes, tl_culture_narrativePSet.getAttrib (CultureNarrative.FIELD_Notes))).listEntry (HELPER_ColorCode.getForSQL(dummyColorCode, tl_culture_narrativePSet.getAttrib (CultureNarrative.FIELD_ColorCode))).listEntry (SQLManager.CheckNull((Long)(tl_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElementQuestion)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElementRating)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_culture_narrative WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_culture_narrative WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_culture_narrative", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_culture_narrative", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (CultureNarrativePersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CultureNarrativePersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_culture_narrative"); throw new ConcurrentUpdateConflictException (obj, "tl_culture_narrative");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_culture_narrative for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_culture_narrative for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (CultureNarrativePersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (CultureNarrativePersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_culture_narrativePSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_narrativePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -246,42 +246,42 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -246,42 +246,42 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_culture_narrativePSet = allPSets.getPersistentSet(objectID, "rs_culture_narrative"); PersistentSet tl_culture_narrativePSet = allPSets.getPersistentSet(objectID, "tl_culture_narrative");
LogMgr.log (CultureNarrativePersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (CultureNarrativePersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_culture_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_culture_narrative " + "FROM {PREFIX}tl_culture_narrative " +
"WHERE rs_culture_narrative.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_culture_narrative.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_culture_narrative WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_culture_narrative WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_culture_narrative"); throw new ConcurrentUpdateConflictException (obj, "tl_culture_narrative");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_culture_narrative for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_culture_narrative for row:" + objectID;
LogMgr.log (CultureNarrativePersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (CultureNarrativePersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_culture_narrativePSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_narrativePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -336,7 +336,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -336,7 +336,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_culture_narrativePSet = allPSets.getPersistentSet(objectID, "rs_culture_narrative", PersistentSetStatus.FETCHED); PersistentSet tl_culture_narrativePSet = allPSets.getPersistentSet(objectID, "tl_culture_narrative", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -395,7 +395,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -395,7 +395,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_narrative " + tables + "FROM {PREFIX}tl_culture_narrative " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -411,12 +411,12 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -411,12 +411,12 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_culture_narrative.object_id"; String orderBy = " ORDER BY tl_culture_narrative.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_culture_narrative.object_id is not null Object[] searchParams; // paramFilter: tl_culture_narrative.object_id is not null
String preFilter = "(rs_culture_narrative.object_id is not null)" String preFilter = "(tl_culture_narrative.object_id is not null)"
+ " "; + " ";
...@@ -431,7 +431,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -431,7 +431,7 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_culture_narrative " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_culture_narrative " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -451,20 +451,20 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -451,20 +451,20 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_culture_narrativePSet = allPSets.getPersistentSet(objectID, "rs_culture_narrative", PersistentSetStatus.FETCHED); PersistentSet tl_culture_narrativePSet = allPSets.getPersistentSet(objectID, "tl_culture_narrative", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_culture_narrativePSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_culture_narrativePSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_culture_narrativePSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_culture_narrativePSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_culture_narrativePSet.setAttrib(CultureNarrative.FIELD_Notes, HELPER_Notes.getFromRS(dummyNotes, r, "narrative_notes")); tl_culture_narrativePSet.setAttrib(CultureNarrative.FIELD_Notes, HELPER_Notes.getFromRS(dummyNotes, r, "narrative_notes"));
rs_culture_narrativePSet.setAttrib(CultureNarrative.FIELD_ColorCode, HELPER_ColorCode.getFromRS(dummyColorCode, r, "color_code")); tl_culture_narrativePSet.setAttrib(CultureNarrative.FIELD_ColorCode, HELPER_ColorCode.getFromRS(dummyColorCode, r, "color_code"));
rs_culture_narrativePSet.setAttrib(CultureNarrative.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_number")); tl_culture_narrativePSet.setAttrib(CultureNarrative.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_number"));
rs_culture_narrativePSet.setAttrib(CultureNarrative.SINGLEREFERENCE_CultureElementQuestion, r.getObject ("culture_element_quest_id")); tl_culture_narrativePSet.setAttrib(CultureNarrative.SINGLEREFERENCE_CultureElementQuestion, r.getObject ("culture_element_quest_id"));
rs_culture_narrativePSet.setAttrib(CultureNarrative.SINGLEREFERENCE_CultureElementRating, r.getObject ("culture_element_rating_id")); tl_culture_narrativePSet.setAttrib(CultureNarrative.SINGLEREFERENCE_CultureElementRating, r.getObject ("culture_element_rating_id"));
} }
...@@ -472,21 +472,21 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -472,21 +472,21 @@ public class CultureNarrativePersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_culture_narrativePSet = allPSets.getPersistentSet(objectID, "rs_culture_narrative"); PersistentSet tl_culture_narrativePSet = allPSets.getPersistentSet(objectID, "tl_culture_narrative");
if (rs_culture_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_culture_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_culture_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_culture_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_culture_narrative " + "INSERT INTO {PREFIX}tl_culture_narrative " +
" (narrative_notes, color_code, culture_element_number, culture_element_quest_id, culture_element_rating_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (narrative_notes, color_code, culture_element_number, culture_element_quest_id, culture_element_rating_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Notes.getForSQL(dummyNotes, rs_culture_narrativePSet.getAttrib (CultureNarrative.FIELD_Notes))).listEntry (HELPER_ColorCode.getForSQL(dummyColorCode, rs_culture_narrativePSet.getAttrib (CultureNarrative.FIELD_ColorCode))) .listEntry (SQLManager.CheckNull((Long)(rs_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(rs_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElementQuestion)))).listEntry (SQLManager.CheckNull((Long)(rs_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElementRating)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Notes.getForSQL(dummyNotes, tl_culture_narrativePSet.getAttrib (CultureNarrative.FIELD_Notes))).listEntry (HELPER_ColorCode.getForSQL(dummyColorCode, tl_culture_narrativePSet.getAttrib (CultureNarrative.FIELD_ColorCode))) .listEntry (SQLManager.CheckNull((Long)(tl_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElementQuestion)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_narrativePSet.getAttrib (CultureNarrative.SINGLEREFERENCE_CultureElementRating)))) .listEntry (objectID.longID ()).toList().toArray());
rs_culture_narrativePSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_narrativePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/Factor.xml
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<MULTIPLEREFERENCE name="Questions" type="FactorQuestionLink" backreferenceName="Factor" /> <MULTIPLEREFERENCE name="Questions" type="FactorQuestionLink" backreferenceName="Factor" />
<MULTIPLEREFERENCE name="Results" type="FactorScoreResult" backreferenceName="Factor" /> <MULTIPLEREFERENCE name="Results" type="FactorScoreResult" backreferenceName="Factor" />
<TABLE name="rs_factor" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_factor" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Description" type="String" dbcol="factor_hdr_desc" length="30"/> <ATTRIB name="Description" type="String" dbcol="factor_hdr_desc" length="30"/>
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_factor.object_id is not null" orderBy="rs_factor.object_id" /> <SEARCH type="All" paramFilter="tl_factor.object_id is not null" orderBy="tl_factor.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/FactorLevelLink.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<BUSINESSCLASS name="FactorLevelLink" package="performa.orm"> <BUSINESSCLASS name="FactorLevelLink" package="performa.orm">
<TABLE name="rs_factor_hdr" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_factor_hdr" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="ClassCode" type="String" dbcol="class_code" length="15"/> <ATTRIB name="ClassCode" type="String" dbcol="class_code" length="15"/>
<ATTRIB name="Notes" type="String" dbcol="factor_hdr_notes"/> <ATTRIB name="Notes" type="String" dbcol="factor_hdr_notes"/>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_factor_hdr.object_id is not null" orderBy="factor_hdr.object_id" /> <SEARCH type="All" paramFilter="tl_factor_hdr.object_id is not null" orderBy="factor_hdr.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/FactorLevelLinkPersistenceMgr.java
...@@ -56,7 +56,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -56,7 +56,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_factor_hdr.object_id as id, {PREFIX}rs_factor_hdr.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_factor_hdr.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_factor_hdr.class_code, {PREFIX}rs_factor_hdr.factor_hdr_notes, {PREFIX}rs_factor_hdr.left_annot, {PREFIX}rs_factor_hdr.right_annot, {PREFIX}rs_factor_hdr.z_score_wght, {PREFIX}rs_factor_hdr.z_score_wght_2, {PREFIX}rs_factor_hdr.level_number, {PREFIX}rs_factor_hdr.factor_number, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_factor_hdr.object_id as id, {PREFIX}tl_factor_hdr.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_factor_hdr.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_factor_hdr.class_code, {PREFIX}tl_factor_hdr.factor_hdr_notes, {PREFIX}tl_factor_hdr.left_annot, {PREFIX}tl_factor_hdr.right_annot, {PREFIX}tl_factor_hdr.z_score_wght, {PREFIX}tl_factor_hdr.z_score_wght_2, {PREFIX}tl_factor_hdr.level_number, {PREFIX}tl_factor_hdr.factor_number, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -101,20 +101,20 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -101,20 +101,20 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_factor_hdrPSet = allPSets.getPersistentSet(id, "rs_factor_hdr", PersistentSetStatus.FETCHED); PersistentSet tl_factor_hdrPSet = allPSets.getPersistentSet(id, "tl_factor_hdr", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_factor_hdrPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_factor_hdrPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ClassCode)|| !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ClassCode)||
!rs_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_Notes)|| !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_Notes)||
!rs_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_LeftAnnot)|| !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_LeftAnnot)||
!rs_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_RightAnnot)|| !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_RightAnnot)||
!rs_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ZScoreWeight)|| !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ZScoreWeight)||
!rs_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ZScoreWeight2)|| !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ZScoreWeight2)||
!rs_factor_hdrPSet.containsAttrib(FactorLevelLink.SINGLEREFERENCE_Level)|| !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.SINGLEREFERENCE_Level)||
!rs_factor_hdrPSet.containsAttrib(FactorLevelLink.SINGLEREFERENCE_Factor)) !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.SINGLEREFERENCE_Factor))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -137,8 +137,8 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -137,8 +137,8 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_hdr " + "FROM {PREFIX}tl_factor_hdr " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_factor_hdr.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_factor_hdr.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -163,7 +163,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -163,7 +163,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorLevelLink.SINGLEREFERENCE_Level)) else if (refName.equals (FactorLevelLink.SINGLEREFERENCE_Level))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_hdr " + "FROM {PREFIX}tl_factor_hdr " +
"WHERE " + SELECT_JOINS + "level_number = ?"; "WHERE " + SELECT_JOINS + "level_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -173,7 +173,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -173,7 +173,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorLevelLink.SINGLEREFERENCE_Factor)) else if (refName.equals (FactorLevelLink.SINGLEREFERENCE_Factor))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_hdr " + "FROM {PREFIX}tl_factor_hdr " +
"WHERE " + SELECT_JOINS + "factor_number = ?"; "WHERE " + SELECT_JOINS + "factor_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -195,47 +195,47 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -195,47 +195,47 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_factor_hdrPSet = allPSets.getPersistentSet(objectID, "rs_factor_hdr"); PersistentSet tl_factor_hdrPSet = allPSets.getPersistentSet(objectID, "tl_factor_hdr");
if (rs_factor_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factor_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factor_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factor_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_factor_hdr " + "UPDATE {PREFIX}tl_factor_hdr " +
"SET class_code = ?, factor_hdr_notes = ?, left_annot = ?, right_annot = ?, z_score_wght = ?, z_score_wght_2 = ?, level_number = ? , factor_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET class_code = ?, factor_hdr_notes = ?, left_annot = ?, right_annot = ?, z_score_wght = ?, z_score_wght_2 = ?, level_number = ? , factor_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_factor_hdr.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_factor_hdr.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))).listEntry (SQLManager.CheckNull((Long)(rs_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(rs_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_factor_hdr WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_factor_hdr WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_factor_hdr", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_factor_hdr", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (FactorLevelLinkPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorLevelLinkPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_factor_hdr"); throw new ConcurrentUpdateConflictException (obj, "tl_factor_hdr");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_factor_hdr for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_factor_hdr for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (FactorLevelLinkPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorLevelLinkPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -250,42 +250,42 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -250,42 +250,42 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_factor_hdrPSet = allPSets.getPersistentSet(objectID, "rs_factor_hdr"); PersistentSet tl_factor_hdrPSet = allPSets.getPersistentSet(objectID, "tl_factor_hdr");
LogMgr.log (FactorLevelLinkPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (FactorLevelLinkPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_factor_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factor_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factor_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factor_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_factor_hdr " + "FROM {PREFIX}tl_factor_hdr " +
"WHERE rs_factor_hdr.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_factor_hdr.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_factor_hdr WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_factor_hdr WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_factor_hdr"); throw new ConcurrentUpdateConflictException (obj, "tl_factor_hdr");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_factor_hdr for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_factor_hdr for row:" + objectID;
LogMgr.log (FactorLevelLinkPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (FactorLevelLinkPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -340,7 +340,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -340,7 +340,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_factor_hdrPSet = allPSets.getPersistentSet(objectID, "rs_factor_hdr", PersistentSetStatus.FETCHED); PersistentSet tl_factor_hdrPSet = allPSets.getPersistentSet(objectID, "tl_factor_hdr", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -399,7 +399,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -399,7 +399,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_hdr " + tables + "FROM {PREFIX}tl_factor_hdr " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -419,8 +419,8 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -419,8 +419,8 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_factor_hdr.object_id is not null Object[] searchParams; // paramFilter: tl_factor_hdr.object_id is not null
String preFilter = "(rs_factor_hdr.object_id is not null)" String preFilter = "(tl_factor_hdr.object_id is not null)"
+ " "; + " ";
...@@ -435,7 +435,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -435,7 +435,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_hdr " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_factor_hdr " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -455,23 +455,23 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -455,23 +455,23 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_factor_hdrPSet = allPSets.getPersistentSet(objectID, "rs_factor_hdr", PersistentSetStatus.FETCHED); PersistentSet tl_factor_hdrPSet = allPSets.getPersistentSet(objectID, "tl_factor_hdr", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_factor_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_factor_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_factor_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_factor_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ClassCode, HELPER_ClassCode.getFromRS(dummyClassCode, r, "class_code")); tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ClassCode, HELPER_ClassCode.getFromRS(dummyClassCode, r, "class_code"));
rs_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_Notes, HELPER_Notes.getFromRS(dummyNotes, r, "factor_hdr_notes")); tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_Notes, HELPER_Notes.getFromRS(dummyNotes, r, "factor_hdr_notes"));
rs_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_LeftAnnot, HELPER_LeftAnnot.getFromRS(dummyLeftAnnot, r, "left_annot")); tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_LeftAnnot, HELPER_LeftAnnot.getFromRS(dummyLeftAnnot, r, "left_annot"));
rs_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_RightAnnot, HELPER_RightAnnot.getFromRS(dummyRightAnnot, r, "right_annot")); tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_RightAnnot, HELPER_RightAnnot.getFromRS(dummyRightAnnot, r, "right_annot"));
rs_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ZScoreWeight, HELPER_ZScoreWeight.getFromRS(dummyZScoreWeight, r, "z_score_wght")); tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ZScoreWeight, HELPER_ZScoreWeight.getFromRS(dummyZScoreWeight, r, "z_score_wght"));
rs_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ZScoreWeight2, HELPER_ZScoreWeight2.getFromRS(dummyZScoreWeight2, r, "z_score_wght_2")); tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ZScoreWeight2, HELPER_ZScoreWeight2.getFromRS(dummyZScoreWeight2, r, "z_score_wght_2"));
rs_factor_hdrPSet.setAttrib(FactorLevelLink.SINGLEREFERENCE_Level, r.getObject ("level_number")); tl_factor_hdrPSet.setAttrib(FactorLevelLink.SINGLEREFERENCE_Level, r.getObject ("level_number"));
rs_factor_hdrPSet.setAttrib(FactorLevelLink.SINGLEREFERENCE_Factor, r.getObject ("factor_number")); tl_factor_hdrPSet.setAttrib(FactorLevelLink.SINGLEREFERENCE_Factor, r.getObject ("factor_number"));
} }
...@@ -479,21 +479,21 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -479,21 +479,21 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_factor_hdrPSet = allPSets.getPersistentSet(objectID, "rs_factor_hdr"); PersistentSet tl_factor_hdrPSet = allPSets.getPersistentSet(objectID, "tl_factor_hdr");
if (rs_factor_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factor_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factor_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factor_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_factor_hdr " + "INSERT INTO {PREFIX}tl_factor_hdr " +
" (class_code, factor_hdr_notes, left_annot, right_annot, z_score_wght, z_score_wght_2, level_number, factor_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (class_code, factor_hdr_notes, left_annot, right_annot, z_score_wght, z_score_wght_2, level_number, factor_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, rs_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))) .listEntry (SQLManager.CheckNull((Long)(rs_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(rs_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))) .listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))) .listEntry (objectID.longID ()).toList().toArray());
rs_factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/FactorPersistenceMgr.java
...@@ -41,7 +41,7 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -41,7 +41,7 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_factor.object_id as id, {PREFIX}rs_factor.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_factor.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_factor.factor_hdr_desc, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_factor.object_id as id, {PREFIX}tl_factor.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_factor.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_factor.factor_hdr_desc, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -86,13 +86,13 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -86,13 +86,13 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_factorPSet = allPSets.getPersistentSet(id, "rs_factor", PersistentSetStatus.FETCHED); PersistentSet tl_factorPSet = allPSets.getPersistentSet(id, "tl_factor", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_factorPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_factorPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_factorPSet.containsAttrib(Factor.FIELD_Description)) !tl_factorPSet.containsAttrib(Factor.FIELD_Description))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -115,8 +115,8 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -115,8 +115,8 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor " + "FROM {PREFIX}tl_factor " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_factor.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_factor.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -153,47 +153,47 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -153,47 +153,47 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_factorPSet = allPSets.getPersistentSet(objectID, "rs_factor"); PersistentSet tl_factorPSet = allPSets.getPersistentSet(objectID, "tl_factor");
if (rs_factorPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factorPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factorPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factorPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_factor " + "UPDATE {PREFIX}tl_factor " +
"SET factor_hdr_desc = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET factor_hdr_desc = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_factor.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_factor.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_factorPSet.getAttrib (Factor.FIELD_Description))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_factorPSet.getAttrib (Factor.FIELD_Description))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_factor WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_factor WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_factor", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_factor", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (FactorPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_factor"); throw new ConcurrentUpdateConflictException (obj, "tl_factor");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_factor for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_factor for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (FactorPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_factorPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factorPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -208,42 +208,42 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -208,42 +208,42 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_factorPSet = allPSets.getPersistentSet(objectID, "rs_factor"); PersistentSet tl_factorPSet = allPSets.getPersistentSet(objectID, "tl_factor");
LogMgr.log (FactorPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (FactorPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_factorPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factorPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factorPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factorPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_factor " + "FROM {PREFIX}tl_factor " +
"WHERE rs_factor.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_factor.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_factor WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_factor WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_factor"); throw new ConcurrentUpdateConflictException (obj, "tl_factor");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_factor for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_factor for row:" + objectID;
LogMgr.log (FactorPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (FactorPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_factorPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factorPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -298,7 +298,7 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -298,7 +298,7 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_factorPSet = allPSets.getPersistentSet(objectID, "rs_factor", PersistentSetStatus.FETCHED); PersistentSet tl_factorPSet = allPSets.getPersistentSet(objectID, "tl_factor", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -357,7 +357,7 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -357,7 +357,7 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor " + tables + "FROM {PREFIX}tl_factor " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -373,12 +373,12 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -373,12 +373,12 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_factor.object_id"; String orderBy = " ORDER BY tl_factor.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_factor.object_id is not null Object[] searchParams; // paramFilter: tl_factor.object_id is not null
String preFilter = "(rs_factor.object_id is not null)" String preFilter = "(tl_factor.object_id is not null)"
+ " "; + " ";
...@@ -393,7 +393,7 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -393,7 +393,7 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_factor " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -413,15 +413,15 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -413,15 +413,15 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_factorPSet = allPSets.getPersistentSet(objectID, "rs_factor", PersistentSetStatus.FETCHED); PersistentSet tl_factorPSet = allPSets.getPersistentSet(objectID, "tl_factor", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_factorPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_factorPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_factorPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_factorPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_factorPSet.setAttrib(Factor.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "factor_hdr_desc")); tl_factorPSet.setAttrib(Factor.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "factor_hdr_desc"));
} }
...@@ -430,21 +430,21 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr ...@@ -430,21 +430,21 @@ public class FactorPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_factorPSet = allPSets.getPersistentSet(objectID, "rs_factor"); PersistentSet tl_factorPSet = allPSets.getPersistentSet(objectID, "tl_factor");
if (rs_factorPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factorPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factorPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factorPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_factor " + "INSERT INTO {PREFIX}tl_factor " +
" (factor_hdr_desc, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (factor_hdr_desc, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_factorPSet.getAttrib (Factor.FIELD_Description))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_factorPSet.getAttrib (Factor.FIELD_Description))) .listEntry (objectID.longID ()).toList().toArray());
rs_factorPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factorPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/FactorQuestionLink.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<BUSINESSCLASS name="FactorQuestionLink" package="performa.orm"> <BUSINESSCLASS name="FactorQuestionLink" package="performa.orm">
<TABLE name="rs_factor_lin" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_factor_lin" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="ReverseScore" type="Boolean" dbcol="reverse_score_flag"/> <ATTRIB name="ReverseScore" type="Boolean" dbcol="reverse_score_flag"/>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_factor_lin.object_id is not null" orderBy="rs_factor_lin.object_id" /> <SEARCH type="All" paramFilter="tl_factor_lin.object_id is not null" orderBy="tl_factor_lin.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/FactorQuestionLinkPersistenceMgr.java
...@@ -41,7 +41,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -41,7 +41,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_factor_lin.object_id as id, {PREFIX}rs_factor_lin.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_factor_lin.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_factor_lin.reverse_score_flag, {PREFIX}rs_factor_lin.factor_number, {PREFIX}rs_factor_lin.quest_number, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_factor_lin.object_id as id, {PREFIX}tl_factor_lin.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_factor_lin.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_factor_lin.reverse_score_flag, {PREFIX}tl_factor_lin.factor_number, {PREFIX}tl_factor_lin.quest_number, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -86,15 +86,15 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -86,15 +86,15 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_factor_linPSet = allPSets.getPersistentSet(id, "rs_factor_lin", PersistentSetStatus.FETCHED); PersistentSet tl_factor_linPSet = allPSets.getPersistentSet(id, "tl_factor_lin", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_factor_linPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_factor_linPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_factor_linPSet.containsAttrib(FactorQuestionLink.FIELD_ReverseScore)|| !tl_factor_linPSet.containsAttrib(FactorQuestionLink.FIELD_ReverseScore)||
!rs_factor_linPSet.containsAttrib(FactorQuestionLink.SINGLEREFERENCE_Factor)|| !tl_factor_linPSet.containsAttrib(FactorQuestionLink.SINGLEREFERENCE_Factor)||
!rs_factor_linPSet.containsAttrib(FactorQuestionLink.SINGLEREFERENCE_Question)) !tl_factor_linPSet.containsAttrib(FactorQuestionLink.SINGLEREFERENCE_Question))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -117,8 +117,8 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -117,8 +117,8 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_lin " + "FROM {PREFIX}tl_factor_lin " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_factor_lin.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_factor_lin.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -143,7 +143,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -143,7 +143,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorQuestionLink.SINGLEREFERENCE_Factor)) else if (refName.equals (FactorQuestionLink.SINGLEREFERENCE_Factor))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_lin " + "FROM {PREFIX}tl_factor_lin " +
"WHERE " + SELECT_JOINS + "factor_number = ?"; "WHERE " + SELECT_JOINS + "factor_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -153,7 +153,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -153,7 +153,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorQuestionLink.SINGLEREFERENCE_Question)) else if (refName.equals (FactorQuestionLink.SINGLEREFERENCE_Question))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_lin " + "FROM {PREFIX}tl_factor_lin " +
"WHERE " + SELECT_JOINS + "quest_number = ?"; "WHERE " + SELECT_JOINS + "quest_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -175,47 +175,47 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -175,47 +175,47 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_factor_linPSet = allPSets.getPersistentSet(objectID, "rs_factor_lin"); PersistentSet tl_factor_linPSet = allPSets.getPersistentSet(objectID, "tl_factor_lin");
if (rs_factor_linPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factor_linPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factor_linPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factor_linPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_factor_lin " + "UPDATE {PREFIX}tl_factor_lin " +
"SET reverse_score_flag = ?, factor_number = ? , quest_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET reverse_score_flag = ?, factor_number = ? , quest_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_factor_lin.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_factor_lin.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_ReverseScore.getForSQL(dummyReverseScore, rs_factor_linPSet.getAttrib (FactorQuestionLink.FIELD_ReverseScore))).listEntry (SQLManager.CheckNull((Long)(rs_factor_linPSet.getAttrib (FactorQuestionLink.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(rs_factor_linPSet.getAttrib (FactorQuestionLink.SINGLEREFERENCE_Question)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_ReverseScore.getForSQL(dummyReverseScore, tl_factor_linPSet.getAttrib (FactorQuestionLink.FIELD_ReverseScore))).listEntry (SQLManager.CheckNull((Long)(tl_factor_linPSet.getAttrib (FactorQuestionLink.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_factor_linPSet.getAttrib (FactorQuestionLink.SINGLEREFERENCE_Question)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_factor_lin WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_factor_lin WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_factor_lin", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_factor_lin", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (FactorQuestionLinkPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorQuestionLinkPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_factor_lin"); throw new ConcurrentUpdateConflictException (obj, "tl_factor_lin");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_factor_lin for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_factor_lin for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (FactorQuestionLinkPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorQuestionLinkPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_factor_linPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factor_linPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -230,42 +230,42 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -230,42 +230,42 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_factor_linPSet = allPSets.getPersistentSet(objectID, "rs_factor_lin"); PersistentSet tl_factor_linPSet = allPSets.getPersistentSet(objectID, "tl_factor_lin");
LogMgr.log (FactorQuestionLinkPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (FactorQuestionLinkPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_factor_linPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factor_linPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factor_linPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factor_linPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_factor_lin " + "FROM {PREFIX}tl_factor_lin " +
"WHERE rs_factor_lin.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_factor_lin.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_factor_lin WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_factor_lin WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_factor_lin"); throw new ConcurrentUpdateConflictException (obj, "tl_factor_lin");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_factor_lin for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_factor_lin for row:" + objectID;
LogMgr.log (FactorQuestionLinkPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (FactorQuestionLinkPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_factor_linPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factor_linPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -320,7 +320,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -320,7 +320,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_factor_linPSet = allPSets.getPersistentSet(objectID, "rs_factor_lin", PersistentSetStatus.FETCHED); PersistentSet tl_factor_linPSet = allPSets.getPersistentSet(objectID, "tl_factor_lin", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -379,7 +379,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -379,7 +379,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_lin " + tables + "FROM {PREFIX}tl_factor_lin " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -395,12 +395,12 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -395,12 +395,12 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_factor_lin.object_id"; String orderBy = " ORDER BY tl_factor_lin.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_factor_lin.object_id is not null Object[] searchParams; // paramFilter: tl_factor_lin.object_id is not null
String preFilter = "(rs_factor_lin.object_id is not null)" String preFilter = "(tl_factor_lin.object_id is not null)"
+ " "; + " ";
...@@ -415,7 +415,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -415,7 +415,7 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_factor_lin " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_factor_lin " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -435,18 +435,18 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -435,18 +435,18 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_factor_linPSet = allPSets.getPersistentSet(objectID, "rs_factor_lin", PersistentSetStatus.FETCHED); PersistentSet tl_factor_linPSet = allPSets.getPersistentSet(objectID, "tl_factor_lin", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_factor_linPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_factor_linPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_factor_linPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_factor_linPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_factor_linPSet.setAttrib(FactorQuestionLink.FIELD_ReverseScore, HELPER_ReverseScore.getFromRS(dummyReverseScore, r, "reverse_score_flag")); tl_factor_linPSet.setAttrib(FactorQuestionLink.FIELD_ReverseScore, HELPER_ReverseScore.getFromRS(dummyReverseScore, r, "reverse_score_flag"));
rs_factor_linPSet.setAttrib(FactorQuestionLink.SINGLEREFERENCE_Factor, r.getObject ("factor_number")); tl_factor_linPSet.setAttrib(FactorQuestionLink.SINGLEREFERENCE_Factor, r.getObject ("factor_number"));
rs_factor_linPSet.setAttrib(FactorQuestionLink.SINGLEREFERENCE_Question, r.getObject ("quest_number")); tl_factor_linPSet.setAttrib(FactorQuestionLink.SINGLEREFERENCE_Question, r.getObject ("quest_number"));
} }
...@@ -454,21 +454,21 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -454,21 +454,21 @@ public class FactorQuestionLinkPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_factor_linPSet = allPSets.getPersistentSet(objectID, "rs_factor_lin"); PersistentSet tl_factor_linPSet = allPSets.getPersistentSet(objectID, "tl_factor_lin");
if (rs_factor_linPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_factor_linPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_factor_linPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_factor_linPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_factor_lin " + "INSERT INTO {PREFIX}tl_factor_lin " +
" (reverse_score_flag, factor_number, quest_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (reverse_score_flag, factor_number, quest_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_ReverseScore.getForSQL(dummyReverseScore, rs_factor_linPSet.getAttrib (FactorQuestionLink.FIELD_ReverseScore))) .listEntry (SQLManager.CheckNull((Long)(rs_factor_linPSet.getAttrib (FactorQuestionLink.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(rs_factor_linPSet.getAttrib (FactorQuestionLink.SINGLEREFERENCE_Question)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_ReverseScore.getForSQL(dummyReverseScore, tl_factor_linPSet.getAttrib (FactorQuestionLink.FIELD_ReverseScore))) .listEntry (SQLManager.CheckNull((Long)(tl_factor_linPSet.getAttrib (FactorQuestionLink.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_factor_linPSet.getAttrib (FactorQuestionLink.SINGLEREFERENCE_Question)))) .listEntry (objectID.longID ()).toList().toArray());
rs_factor_linPSet.setStatus (PersistentSetStatus.PROCESSED); tl_factor_linPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/FactorScore.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<TRANSIENT name="ColorCode" type="ColorCode" attribHelper="EnumeratedAttributeHelper"/> <TRANSIENT name="ColorCode" type="ColorCode" attribHelper="EnumeratedAttributeHelper"/>
<TABLE name="rs_score" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_score" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Score" type="Integer" dbcol="score_number"/> <ATTRIB name="Score" type="Integer" dbcol="score_number"/>
<ATTRIB name="ColorRank" type="Integer" dbcol="color_rank" /> <ATTRIB name="ColorRank" type="Integer" dbcol="color_rank" />
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_score.object_id is not null" orderBy="rs_score.object_id" /> <SEARCH type="All" paramFilter="tl_score.object_id is not null" orderBy="tl_score.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/FactorScorePersistenceMgr.java
...@@ -48,7 +48,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -48,7 +48,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_score.object_id as id, {PREFIX}rs_score.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_score.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_score.score_number, {PREFIX}rs_score.color_rank, {PREFIX}rs_score.wghtd_score, {PREFIX}rs_score.test_analysis_id, {PREFIX}rs_score.factor_number, {PREFIX}rs_score.level_number, {PREFIX}rs_score.narrative_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_score.object_id as id, {PREFIX}tl_score.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_score.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_score.score_number, {PREFIX}tl_score.color_rank, {PREFIX}tl_score.wghtd_score, {PREFIX}tl_score.test_analysis_id, {PREFIX}tl_score.factor_number, {PREFIX}tl_score.level_number, {PREFIX}tl_score.narrative_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -93,19 +93,19 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -93,19 +93,19 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_scorePSet = allPSets.getPersistentSet(id, "rs_score", PersistentSetStatus.FETCHED); PersistentSet tl_scorePSet = allPSets.getPersistentSet(id, "tl_score", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_scorePSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_scorePSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_scorePSet.containsAttrib(FactorScore.FIELD_Score)|| !tl_scorePSet.containsAttrib(FactorScore.FIELD_Score)||
!rs_scorePSet.containsAttrib(FactorScore.FIELD_ColorRank)|| !tl_scorePSet.containsAttrib(FactorScore.FIELD_ColorRank)||
!rs_scorePSet.containsAttrib(FactorScore.FIELD_WghtdScore)|| !tl_scorePSet.containsAttrib(FactorScore.FIELD_WghtdScore)||
!rs_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_TestAnalysis)|| !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_TestAnalysis)||
!rs_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Factor)|| !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Factor)||
!rs_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Level)|| !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Level)||
!rs_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Narrative)) !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Narrative))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -128,8 +128,8 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -128,8 +128,8 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_score " + "FROM {PREFIX}tl_score " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_score.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_score.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -154,7 +154,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -154,7 +154,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorScore.SINGLEREFERENCE_TestAnalysis)) else if (refName.equals (FactorScore.SINGLEREFERENCE_TestAnalysis))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_score " + "FROM {PREFIX}tl_score " +
"WHERE " + SELECT_JOINS + "test_analysis_id = ?"; "WHERE " + SELECT_JOINS + "test_analysis_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -164,7 +164,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -164,7 +164,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorScore.SINGLEREFERENCE_Narrative)) else if (refName.equals (FactorScore.SINGLEREFERENCE_Narrative))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_score " + "FROM {PREFIX}tl_score " +
"WHERE " + SELECT_JOINS + "narrative_id = ?"; "WHERE " + SELECT_JOINS + "narrative_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -186,47 +186,47 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -186,47 +186,47 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_scorePSet = allPSets.getPersistentSet(objectID, "rs_score"); PersistentSet tl_scorePSet = allPSets.getPersistentSet(objectID, "tl_score");
if (rs_scorePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_scorePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_scorePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_scorePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_score " + "UPDATE {PREFIX}tl_score " +
"SET score_number = ?, color_rank = ?, wghtd_score = ?, test_analysis_id = ? , factor_number = ? , level_number = ? , narrative_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET score_number = ?, color_rank = ?, wghtd_score = ?, test_analysis_id = ? , factor_number = ? , level_number = ? , narrative_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_score.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_score.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Score.getForSQL(dummyScore, rs_scorePSet.getAttrib (FactorScore.FIELD_Score))).listEntry (HELPER_ColorRank.getForSQL(dummyColorRank, rs_scorePSet.getAttrib (FactorScore.FIELD_ColorRank))).listEntry (HELPER_WghtdScore.getForSQL(dummyWghtdScore, rs_scorePSet.getAttrib (FactorScore.FIELD_WghtdScore))).listEntry (SQLManager.CheckNull((Long)(rs_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_TestAnalysis)))).listEntry (SQLManager.CheckNull((Long)(rs_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(rs_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(rs_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Narrative)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Score.getForSQL(dummyScore, tl_scorePSet.getAttrib (FactorScore.FIELD_Score))).listEntry (HELPER_ColorRank.getForSQL(dummyColorRank, tl_scorePSet.getAttrib (FactorScore.FIELD_ColorRank))).listEntry (HELPER_WghtdScore.getForSQL(dummyWghtdScore, tl_scorePSet.getAttrib (FactorScore.FIELD_WghtdScore))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_TestAnalysis)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Narrative)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_score WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_score WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_score", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_score", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (FactorScorePersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorScorePersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_score"); throw new ConcurrentUpdateConflictException (obj, "tl_score");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_score for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_score for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (FactorScorePersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorScorePersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_scorePSet.setStatus (PersistentSetStatus.PROCESSED); tl_scorePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -241,42 +241,42 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -241,42 +241,42 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_scorePSet = allPSets.getPersistentSet(objectID, "rs_score"); PersistentSet tl_scorePSet = allPSets.getPersistentSet(objectID, "tl_score");
LogMgr.log (FactorScorePersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (FactorScorePersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_scorePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_scorePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_scorePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_scorePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_score " + "FROM {PREFIX}tl_score " +
"WHERE rs_score.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_score.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_score WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_score WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_score"); throw new ConcurrentUpdateConflictException (obj, "tl_score");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_score for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_score for row:" + objectID;
LogMgr.log (FactorScorePersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (FactorScorePersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_scorePSet.setStatus (PersistentSetStatus.PROCESSED); tl_scorePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -331,7 +331,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -331,7 +331,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_scorePSet = allPSets.getPersistentSet(objectID, "rs_score", PersistentSetStatus.FETCHED); PersistentSet tl_scorePSet = allPSets.getPersistentSet(objectID, "tl_score", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -390,7 +390,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -390,7 +390,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_score " + tables + "FROM {PREFIX}tl_score " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -406,12 +406,12 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -406,12 +406,12 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_score.object_id"; String orderBy = " ORDER BY tl_score.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_score.object_id is not null Object[] searchParams; // paramFilter: tl_score.object_id is not null
String preFilter = "(rs_score.object_id is not null)" String preFilter = "(tl_score.object_id is not null)"
+ " "; + " ";
...@@ -426,7 +426,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -426,7 +426,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_score " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_score " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -446,22 +446,22 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -446,22 +446,22 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_scorePSet = allPSets.getPersistentSet(objectID, "rs_score", PersistentSetStatus.FETCHED); PersistentSet tl_scorePSet = allPSets.getPersistentSet(objectID, "tl_score", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_scorePSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_scorePSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_scorePSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_scorePSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_scorePSet.setAttrib(FactorScore.FIELD_Score, HELPER_Score.getFromRS(dummyScore, r, "score_number")); tl_scorePSet.setAttrib(FactorScore.FIELD_Score, HELPER_Score.getFromRS(dummyScore, r, "score_number"));
rs_scorePSet.setAttrib(FactorScore.FIELD_ColorRank, HELPER_ColorRank.getFromRS(dummyColorRank, r, "color_rank")); tl_scorePSet.setAttrib(FactorScore.FIELD_ColorRank, HELPER_ColorRank.getFromRS(dummyColorRank, r, "color_rank"));
rs_scorePSet.setAttrib(FactorScore.FIELD_WghtdScore, HELPER_WghtdScore.getFromRS(dummyWghtdScore, r, "wghtd_score")); tl_scorePSet.setAttrib(FactorScore.FIELD_WghtdScore, HELPER_WghtdScore.getFromRS(dummyWghtdScore, r, "wghtd_score"));
rs_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_TestAnalysis, r.getObject ("test_analysis_id")); tl_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_TestAnalysis, r.getObject ("test_analysis_id"));
rs_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Factor, r.getObject ("factor_number")); tl_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Factor, r.getObject ("factor_number"));
rs_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Level, r.getObject ("level_number")); tl_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Level, r.getObject ("level_number"));
rs_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Narrative, r.getObject ("narrative_id")); tl_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Narrative, r.getObject ("narrative_id"));
} }
...@@ -469,21 +469,21 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr ...@@ -469,21 +469,21 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_scorePSet = allPSets.getPersistentSet(objectID, "rs_score"); PersistentSet tl_scorePSet = allPSets.getPersistentSet(objectID, "tl_score");
if (rs_scorePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_scorePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_scorePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_scorePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_score " + "INSERT INTO {PREFIX}tl_score " +
" (score_number, color_rank, wghtd_score, test_analysis_id, factor_number, level_number, narrative_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (score_number, color_rank, wghtd_score, test_analysis_id, factor_number, level_number, narrative_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Score.getForSQL(dummyScore, rs_scorePSet.getAttrib (FactorScore.FIELD_Score))).listEntry (HELPER_ColorRank.getForSQL(dummyColorRank, rs_scorePSet.getAttrib (FactorScore.FIELD_ColorRank))).listEntry (HELPER_WghtdScore.getForSQL(dummyWghtdScore, rs_scorePSet.getAttrib (FactorScore.FIELD_WghtdScore))) .listEntry (SQLManager.CheckNull((Long)(rs_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_TestAnalysis)))).listEntry (SQLManager.CheckNull((Long)(rs_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(rs_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(rs_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Narrative)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Score.getForSQL(dummyScore, tl_scorePSet.getAttrib (FactorScore.FIELD_Score))).listEntry (HELPER_ColorRank.getForSQL(dummyColorRank, tl_scorePSet.getAttrib (FactorScore.FIELD_ColorRank))).listEntry (HELPER_WghtdScore.getForSQL(dummyWghtdScore, tl_scorePSet.getAttrib (FactorScore.FIELD_WghtdScore))) .listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_TestAnalysis)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Narrative)))) .listEntry (objectID.longID ()).toList().toArray());
rs_scorePSet.setStatus (PersistentSetStatus.PROCESSED); tl_scorePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/FactorScoreResult.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<BUSINESSCLASS name="FactorScoreResult" package="performa.orm"> <BUSINESSCLASS name="FactorScoreResult" package="performa.orm">
<IMPORT value="performa.orm.types.*"/> <IMPORT value="performa.orm.types.*"/>
<TABLE name="rs_level_factor" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_level_factor" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="FromScore" type="Integer" dbcol="from_score"/> <ATTRIB name="FromScore" type="Integer" dbcol="from_score"/>
<ATTRIB name="ToScore" type="Integer" dbcol="to_score"/> <ATTRIB name="ToScore" type="Integer" dbcol="to_score"/>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_level_factor.object_id is not null" orderBy="rs_level_factor.object_id" /> <SEARCH type="All" paramFilter="tl_level_factor.object_id is not null" orderBy="tl_level_factor.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/FactorScoreResultPersistenceMgr.java
...@@ -48,7 +48,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -48,7 +48,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_level_factor.object_id as id, {PREFIX}rs_level_factor.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_level_factor.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_level_factor.from_score, {PREFIX}rs_level_factor.to_score, {PREFIX}rs_level_factor.color_code, {PREFIX}rs_level_factor.factor_number, {PREFIX}rs_level_factor.level_number, {PREFIX}rs_level_factor.narrative_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_level_factor.object_id as id, {PREFIX}tl_level_factor.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_level_factor.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_level_factor.from_score, {PREFIX}tl_level_factor.to_score, {PREFIX}tl_level_factor.color_code, {PREFIX}tl_level_factor.factor_number, {PREFIX}tl_level_factor.level_number, {PREFIX}tl_level_factor.narrative_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -93,18 +93,18 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -93,18 +93,18 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_level_factorPSet = allPSets.getPersistentSet(id, "rs_level_factor", PersistentSetStatus.FETCHED); PersistentSet tl_level_factorPSet = allPSets.getPersistentSet(id, "tl_level_factor", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_level_factorPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_level_factorPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_level_factorPSet.containsAttrib(FactorScoreResult.FIELD_FromScore)|| !tl_level_factorPSet.containsAttrib(FactorScoreResult.FIELD_FromScore)||
!rs_level_factorPSet.containsAttrib(FactorScoreResult.FIELD_ToScore)|| !tl_level_factorPSet.containsAttrib(FactorScoreResult.FIELD_ToScore)||
!rs_level_factorPSet.containsAttrib(FactorScoreResult.FIELD_ColorCode)|| !tl_level_factorPSet.containsAttrib(FactorScoreResult.FIELD_ColorCode)||
!rs_level_factorPSet.containsAttrib(FactorScoreResult.SINGLEREFERENCE_Factor)|| !tl_level_factorPSet.containsAttrib(FactorScoreResult.SINGLEREFERENCE_Factor)||
!rs_level_factorPSet.containsAttrib(FactorScoreResult.SINGLEREFERENCE_Level)|| !tl_level_factorPSet.containsAttrib(FactorScoreResult.SINGLEREFERENCE_Level)||
!rs_level_factorPSet.containsAttrib(FactorScoreResult.SINGLEREFERENCE_Narrative)) !tl_level_factorPSet.containsAttrib(FactorScoreResult.SINGLEREFERENCE_Narrative))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -127,8 +127,8 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -127,8 +127,8 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level_factor " + "FROM {PREFIX}tl_level_factor " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_level_factor.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_level_factor.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -153,7 +153,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -153,7 +153,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorScoreResult.SINGLEREFERENCE_Factor)) else if (refName.equals (FactorScoreResult.SINGLEREFERENCE_Factor))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level_factor " + "FROM {PREFIX}tl_level_factor " +
"WHERE " + SELECT_JOINS + "factor_number = ?"; "WHERE " + SELECT_JOINS + "factor_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -163,7 +163,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -163,7 +163,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorScoreResult.SINGLEREFERENCE_Level)) else if (refName.equals (FactorScoreResult.SINGLEREFERENCE_Level))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level_factor " + "FROM {PREFIX}tl_level_factor " +
"WHERE " + SELECT_JOINS + "level_number = ?"; "WHERE " + SELECT_JOINS + "level_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -173,7 +173,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -173,7 +173,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (FactorScoreResult.SINGLEREFERENCE_Narrative)) else if (refName.equals (FactorScoreResult.SINGLEREFERENCE_Narrative))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level_factor " + "FROM {PREFIX}tl_level_factor " +
"WHERE " + SELECT_JOINS + "narrative_id = ?"; "WHERE " + SELECT_JOINS + "narrative_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -195,47 +195,47 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -195,47 +195,47 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_level_factorPSet = allPSets.getPersistentSet(objectID, "rs_level_factor"); PersistentSet tl_level_factorPSet = allPSets.getPersistentSet(objectID, "tl_level_factor");
if (rs_level_factorPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_level_factorPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_level_factorPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_level_factorPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_level_factor " + "UPDATE {PREFIX}tl_level_factor " +
"SET from_score = ?, to_score = ?, color_code = ?, factor_number = ? , level_number = ? , narrative_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET from_score = ?, to_score = ?, color_code = ?, factor_number = ? , level_number = ? , narrative_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_level_factor.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_level_factor.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_FromScore.getForSQL(dummyFromScore, rs_level_factorPSet.getAttrib (FactorScoreResult.FIELD_FromScore))).listEntry (HELPER_ToScore.getForSQL(dummyToScore, rs_level_factorPSet.getAttrib (FactorScoreResult.FIELD_ToScore))).listEntry (HELPER_ColorCode.getForSQL(dummyColorCode, rs_level_factorPSet.getAttrib (FactorScoreResult.FIELD_ColorCode))).listEntry (SQLManager.CheckNull((Long)(rs_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(rs_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(rs_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Narrative)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_FromScore.getForSQL(dummyFromScore, tl_level_factorPSet.getAttrib (FactorScoreResult.FIELD_FromScore))).listEntry (HELPER_ToScore.getForSQL(dummyToScore, tl_level_factorPSet.getAttrib (FactorScoreResult.FIELD_ToScore))).listEntry (HELPER_ColorCode.getForSQL(dummyColorCode, tl_level_factorPSet.getAttrib (FactorScoreResult.FIELD_ColorCode))).listEntry (SQLManager.CheckNull((Long)(tl_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Narrative)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_level_factor WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_level_factor WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_level_factor", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_level_factor", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (FactorScoreResultPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorScoreResultPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_level_factor"); throw new ConcurrentUpdateConflictException (obj, "tl_level_factor");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_level_factor for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_level_factor for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (FactorScoreResultPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (FactorScoreResultPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_level_factorPSet.setStatus (PersistentSetStatus.PROCESSED); tl_level_factorPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -250,42 +250,42 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -250,42 +250,42 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_level_factorPSet = allPSets.getPersistentSet(objectID, "rs_level_factor"); PersistentSet tl_level_factorPSet = allPSets.getPersistentSet(objectID, "tl_level_factor");
LogMgr.log (FactorScoreResultPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (FactorScoreResultPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_level_factorPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_level_factorPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_level_factorPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_level_factorPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_level_factor " + "FROM {PREFIX}tl_level_factor " +
"WHERE rs_level_factor.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_level_factor.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_level_factor WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_level_factor WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_level_factor"); throw new ConcurrentUpdateConflictException (obj, "tl_level_factor");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_level_factor for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_level_factor for row:" + objectID;
LogMgr.log (FactorScoreResultPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (FactorScoreResultPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_level_factorPSet.setStatus (PersistentSetStatus.PROCESSED); tl_level_factorPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -340,7 +340,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -340,7 +340,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_level_factorPSet = allPSets.getPersistentSet(objectID, "rs_level_factor", PersistentSetStatus.FETCHED); PersistentSet tl_level_factorPSet = allPSets.getPersistentSet(objectID, "tl_level_factor", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -399,7 +399,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -399,7 +399,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level_factor " + tables + "FROM {PREFIX}tl_level_factor " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -415,12 +415,12 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -415,12 +415,12 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_level_factor.object_id"; String orderBy = " ORDER BY tl_level_factor.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_level_factor.object_id is not null Object[] searchParams; // paramFilter: tl_level_factor.object_id is not null
String preFilter = "(rs_level_factor.object_id is not null)" String preFilter = "(tl_level_factor.object_id is not null)"
+ " "; + " ";
...@@ -435,7 +435,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -435,7 +435,7 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level_factor " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_level_factor " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -455,21 +455,21 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -455,21 +455,21 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_level_factorPSet = allPSets.getPersistentSet(objectID, "rs_level_factor", PersistentSetStatus.FETCHED); PersistentSet tl_level_factorPSet = allPSets.getPersistentSet(objectID, "tl_level_factor", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_level_factorPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_level_factorPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_level_factorPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_level_factorPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_level_factorPSet.setAttrib(FactorScoreResult.FIELD_FromScore, HELPER_FromScore.getFromRS(dummyFromScore, r, "from_score")); tl_level_factorPSet.setAttrib(FactorScoreResult.FIELD_FromScore, HELPER_FromScore.getFromRS(dummyFromScore, r, "from_score"));
rs_level_factorPSet.setAttrib(FactorScoreResult.FIELD_ToScore, HELPER_ToScore.getFromRS(dummyToScore, r, "to_score")); tl_level_factorPSet.setAttrib(FactorScoreResult.FIELD_ToScore, HELPER_ToScore.getFromRS(dummyToScore, r, "to_score"));
rs_level_factorPSet.setAttrib(FactorScoreResult.FIELD_ColorCode, HELPER_ColorCode.getFromRS(dummyColorCode, r, "color_code")); tl_level_factorPSet.setAttrib(FactorScoreResult.FIELD_ColorCode, HELPER_ColorCode.getFromRS(dummyColorCode, r, "color_code"));
rs_level_factorPSet.setAttrib(FactorScoreResult.SINGLEREFERENCE_Factor, r.getObject ("factor_number")); tl_level_factorPSet.setAttrib(FactorScoreResult.SINGLEREFERENCE_Factor, r.getObject ("factor_number"));
rs_level_factorPSet.setAttrib(FactorScoreResult.SINGLEREFERENCE_Level, r.getObject ("level_number")); tl_level_factorPSet.setAttrib(FactorScoreResult.SINGLEREFERENCE_Level, r.getObject ("level_number"));
rs_level_factorPSet.setAttrib(FactorScoreResult.SINGLEREFERENCE_Narrative, r.getObject ("narrative_id")); tl_level_factorPSet.setAttrib(FactorScoreResult.SINGLEREFERENCE_Narrative, r.getObject ("narrative_id"));
} }
...@@ -477,21 +477,21 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr ...@@ -477,21 +477,21 @@ public class FactorScoreResultPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_level_factorPSet = allPSets.getPersistentSet(objectID, "rs_level_factor"); PersistentSet tl_level_factorPSet = allPSets.getPersistentSet(objectID, "tl_level_factor");
if (rs_level_factorPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_level_factorPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_level_factorPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_level_factorPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_level_factor " + "INSERT INTO {PREFIX}tl_level_factor " +
" (from_score, to_score, color_code, factor_number, level_number, narrative_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (from_score, to_score, color_code, factor_number, level_number, narrative_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_FromScore.getForSQL(dummyFromScore, rs_level_factorPSet.getAttrib (FactorScoreResult.FIELD_FromScore))).listEntry (HELPER_ToScore.getForSQL(dummyToScore, rs_level_factorPSet.getAttrib (FactorScoreResult.FIELD_ToScore))).listEntry (HELPER_ColorCode.getForSQL(dummyColorCode, rs_level_factorPSet.getAttrib (FactorScoreResult.FIELD_ColorCode))) .listEntry (SQLManager.CheckNull((Long)(rs_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(rs_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(rs_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Narrative)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_FromScore.getForSQL(dummyFromScore, tl_level_factorPSet.getAttrib (FactorScoreResult.FIELD_FromScore))).listEntry (HELPER_ToScore.getForSQL(dummyToScore, tl_level_factorPSet.getAttrib (FactorScoreResult.FIELD_ToScore))).listEntry (HELPER_ColorCode.getForSQL(dummyColorCode, tl_level_factorPSet.getAttrib (FactorScoreResult.FIELD_ColorCode))) .listEntry (SQLManager.CheckNull((Long)(tl_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_level_factorPSet.getAttrib (FactorScoreResult.SINGLEREFERENCE_Narrative)))) .listEntry (objectID.longID ()).toList().toArray());
rs_level_factorPSet.setStatus (PersistentSetStatus.PROCESSED); tl_level_factorPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/Level.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<MULTIPLEREFERENCE name="Narratives" type="Narrative" backreferenceName="Level" /> <MULTIPLEREFERENCE name="Narratives" type="Narrative" backreferenceName="Level" />
<MULTIPLEREFERENCE name="TestAnalysises" type="TestAnalysis" backreferenceName="Level" /> <MULTIPLEREFERENCE name="TestAnalysises" type="TestAnalysis" backreferenceName="Level" />
<TABLE name="rs_level" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_level" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="LevelDescription" type="String" dbcol="level_desc" length="30"/> <ATTRIB name="LevelDescription" type="String" dbcol="level_desc" length="30"/>
<ATTRIB name="LevelNotes" type="String" dbcol="level_notes"/> <ATTRIB name="LevelNotes" type="String" dbcol="level_notes"/>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_level.object_id is not null" orderBy="rs_level.object_id" /> <SEARCH type="All" paramFilter="tl_level.object_id is not null" orderBy="tl_level.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/LevelPersistenceMgr.java
...@@ -47,7 +47,7 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -47,7 +47,7 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_level.object_id as id, {PREFIX}rs_level.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_level.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_level.level_desc, {PREFIX}rs_level.level_notes, {PREFIX}rs_level.rpt_hdr, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_level.object_id as id, {PREFIX}tl_level.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_level.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_level.level_desc, {PREFIX}tl_level.level_notes, {PREFIX}tl_level.rpt_hdr, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -92,15 +92,15 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -92,15 +92,15 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_levelPSet = allPSets.getPersistentSet(id, "rs_level", PersistentSetStatus.FETCHED); PersistentSet tl_levelPSet = allPSets.getPersistentSet(id, "tl_level", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_levelPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_levelPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_levelPSet.containsAttrib(Level.FIELD_LevelDescription)|| !tl_levelPSet.containsAttrib(Level.FIELD_LevelDescription)||
!rs_levelPSet.containsAttrib(Level.FIELD_LevelNotes)|| !tl_levelPSet.containsAttrib(Level.FIELD_LevelNotes)||
!rs_levelPSet.containsAttrib(Level.FIELD_ReportHeader)) !tl_levelPSet.containsAttrib(Level.FIELD_ReportHeader))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -123,8 +123,8 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -123,8 +123,8 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level " + "FROM {PREFIX}tl_level " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_level.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_level.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -161,47 +161,47 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -161,47 +161,47 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_levelPSet = allPSets.getPersistentSet(objectID, "rs_level"); PersistentSet tl_levelPSet = allPSets.getPersistentSet(objectID, "tl_level");
if (rs_levelPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_levelPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_levelPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_levelPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_level " + "UPDATE {PREFIX}tl_level " +
"SET level_desc = ?, level_notes = ?, rpt_hdr = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET level_desc = ?, level_notes = ?, rpt_hdr = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_level.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_level.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_LevelDescription.getForSQL(dummyLevelDescription, rs_levelPSet.getAttrib (Level.FIELD_LevelDescription))).listEntry (HELPER_LevelNotes.getForSQL(dummyLevelNotes, rs_levelPSet.getAttrib (Level.FIELD_LevelNotes))).listEntry (HELPER_ReportHeader.getForSQL(dummyReportHeader, rs_levelPSet.getAttrib (Level.FIELD_ReportHeader))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_LevelDescription.getForSQL(dummyLevelDescription, tl_levelPSet.getAttrib (Level.FIELD_LevelDescription))).listEntry (HELPER_LevelNotes.getForSQL(dummyLevelNotes, tl_levelPSet.getAttrib (Level.FIELD_LevelNotes))).listEntry (HELPER_ReportHeader.getForSQL(dummyReportHeader, tl_levelPSet.getAttrib (Level.FIELD_ReportHeader))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_level WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_level WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_level", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_level", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (LevelPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (LevelPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_level"); throw new ConcurrentUpdateConflictException (obj, "tl_level");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_level for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_level for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (LevelPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (LevelPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_levelPSet.setStatus (PersistentSetStatus.PROCESSED); tl_levelPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -216,42 +216,42 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -216,42 +216,42 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_levelPSet = allPSets.getPersistentSet(objectID, "rs_level"); PersistentSet tl_levelPSet = allPSets.getPersistentSet(objectID, "tl_level");
LogMgr.log (LevelPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (LevelPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_levelPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_levelPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_levelPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_levelPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_level " + "FROM {PREFIX}tl_level " +
"WHERE rs_level.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_level.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_level WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_level WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_level"); throw new ConcurrentUpdateConflictException (obj, "tl_level");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_level for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_level for row:" + objectID;
LogMgr.log (LevelPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (LevelPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_levelPSet.setStatus (PersistentSetStatus.PROCESSED); tl_levelPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -306,7 +306,7 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -306,7 +306,7 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_levelPSet = allPSets.getPersistentSet(objectID, "rs_level", PersistentSetStatus.FETCHED); PersistentSet tl_levelPSet = allPSets.getPersistentSet(objectID, "tl_level", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -365,7 +365,7 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -365,7 +365,7 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level " + tables + "FROM {PREFIX}tl_level " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -381,12 +381,12 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -381,12 +381,12 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_level.object_id"; String orderBy = " ORDER BY tl_level.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_level.object_id is not null Object[] searchParams; // paramFilter: tl_level.object_id is not null
String preFilter = "(rs_level.object_id is not null)" String preFilter = "(tl_level.object_id is not null)"
+ " "; + " ";
...@@ -401,7 +401,7 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -401,7 +401,7 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_level " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_level " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -421,17 +421,17 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -421,17 +421,17 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_levelPSet = allPSets.getPersistentSet(objectID, "rs_level", PersistentSetStatus.FETCHED); PersistentSet tl_levelPSet = allPSets.getPersistentSet(objectID, "tl_level", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_levelPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_levelPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_levelPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_levelPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_levelPSet.setAttrib(Level.FIELD_LevelDescription, HELPER_LevelDescription.getFromRS(dummyLevelDescription, r, "level_desc")); tl_levelPSet.setAttrib(Level.FIELD_LevelDescription, HELPER_LevelDescription.getFromRS(dummyLevelDescription, r, "level_desc"));
rs_levelPSet.setAttrib(Level.FIELD_LevelNotes, HELPER_LevelNotes.getFromRS(dummyLevelNotes, r, "level_notes")); tl_levelPSet.setAttrib(Level.FIELD_LevelNotes, HELPER_LevelNotes.getFromRS(dummyLevelNotes, r, "level_notes"));
rs_levelPSet.setAttrib(Level.FIELD_ReportHeader, HELPER_ReportHeader.getFromRS(dummyReportHeader, r, "rpt_hdr")); tl_levelPSet.setAttrib(Level.FIELD_ReportHeader, HELPER_ReportHeader.getFromRS(dummyReportHeader, r, "rpt_hdr"));
} }
...@@ -440,21 +440,21 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr ...@@ -440,21 +440,21 @@ public class LevelPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_levelPSet = allPSets.getPersistentSet(objectID, "rs_level"); PersistentSet tl_levelPSet = allPSets.getPersistentSet(objectID, "tl_level");
if (rs_levelPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_levelPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_levelPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_levelPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_level " + "INSERT INTO {PREFIX}tl_level " +
" (level_desc, level_notes, rpt_hdr, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (level_desc, level_notes, rpt_hdr, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_LevelDescription.getForSQL(dummyLevelDescription, rs_levelPSet.getAttrib (Level.FIELD_LevelDescription))).listEntry (HELPER_LevelNotes.getForSQL(dummyLevelNotes, rs_levelPSet.getAttrib (Level.FIELD_LevelNotes))).listEntry (HELPER_ReportHeader.getForSQL(dummyReportHeader, rs_levelPSet.getAttrib (Level.FIELD_ReportHeader))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_LevelDescription.getForSQL(dummyLevelDescription, tl_levelPSet.getAttrib (Level.FIELD_LevelDescription))).listEntry (HELPER_LevelNotes.getForSQL(dummyLevelNotes, tl_levelPSet.getAttrib (Level.FIELD_LevelNotes))).listEntry (HELPER_ReportHeader.getForSQL(dummyReportHeader, tl_levelPSet.getAttrib (Level.FIELD_ReportHeader))) .listEntry (objectID.longID ()).toList().toArray());
rs_levelPSet.setStatus (PersistentSetStatus.PROCESSED); tl_levelPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/Narrative.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<MULTIPLEREFERENCE name="Results" type="FactorScoreResult" backreferenceName="Narrative" /> <MULTIPLEREFERENCE name="Results" type="FactorScoreResult" backreferenceName="Narrative" />
<MULTIPLEREFERENCE name="FactorScores" type="FactorScore" backreferenceName="Narrative" /> <MULTIPLEREFERENCE name="FactorScores" type="FactorScore" backreferenceName="Narrative" />
<TABLE name="rs_narrative" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_narrative" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="NarrativeCode" type="String" dbcol="narrative_code" length="15" mandatory="true"/> <ATTRIB name="NarrativeCode" type="String" dbcol="narrative_code" length="15" mandatory="true"/>
<ATTRIB name="Description" type="String" dbcol="narrative_desc" length="30"/> <ATTRIB name="Description" type="String" dbcol="narrative_desc" length="30"/>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_narrative.object_id is not null" orderBy="rs_narrative.object_id" /> <SEARCH type="All" paramFilter="tl_narrative.object_id is not null" orderBy="tl_narrative.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/NarrativePersistenceMgr.java
...@@ -62,7 +62,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -62,7 +62,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_narrative.object_id as id, {PREFIX}rs_narrative.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_narrative.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_narrative.narrative_code, {PREFIX}rs_narrative.narrative_desc, {PREFIX}rs_narrative.graphic_notes, {PREFIX}rs_narrative.exec_sum_notes, {PREFIX}rs_narrative.mod_connect_flag, {PREFIX}rs_narrative.narrative_notes, {PREFIX}rs_narrative.devel_narrative, {PREFIX}rs_narrative.question, {PREFIX}rs_narrative.level_number, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_narrative.object_id as id, {PREFIX}tl_narrative.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_narrative.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_narrative.narrative_code, {PREFIX}tl_narrative.narrative_desc, {PREFIX}tl_narrative.graphic_notes, {PREFIX}tl_narrative.exec_sum_notes, {PREFIX}tl_narrative.mod_connect_flag, {PREFIX}tl_narrative.narrative_notes, {PREFIX}tl_narrative.devel_narrative, {PREFIX}tl_narrative.question, {PREFIX}tl_narrative.level_number, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -107,21 +107,21 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -107,21 +107,21 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_narrativePSet = allPSets.getPersistentSet(id, "rs_narrative", PersistentSetStatus.FETCHED); PersistentSet tl_narrativePSet = allPSets.getPersistentSet(id, "tl_narrative", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_narrativePSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_narrativePSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_narrativePSet.containsAttrib(Narrative.FIELD_NarrativeCode)|| !tl_narrativePSet.containsAttrib(Narrative.FIELD_NarrativeCode)||
!rs_narrativePSet.containsAttrib(Narrative.FIELD_Description)|| !tl_narrativePSet.containsAttrib(Narrative.FIELD_Description)||
!rs_narrativePSet.containsAttrib(Narrative.FIELD_GraphicNotes)|| !tl_narrativePSet.containsAttrib(Narrative.FIELD_GraphicNotes)||
!rs_narrativePSet.containsAttrib(Narrative.FIELD_SummaryNotes)|| !tl_narrativePSet.containsAttrib(Narrative.FIELD_SummaryNotes)||
!rs_narrativePSet.containsAttrib(Narrative.FIELD_ModConnect)|| !tl_narrativePSet.containsAttrib(Narrative.FIELD_ModConnect)||
!rs_narrativePSet.containsAttrib(Narrative.FIELD_NarrativeNotes)|| !tl_narrativePSet.containsAttrib(Narrative.FIELD_NarrativeNotes)||
!rs_narrativePSet.containsAttrib(Narrative.FIELD_DevelNarrative)|| !tl_narrativePSet.containsAttrib(Narrative.FIELD_DevelNarrative)||
!rs_narrativePSet.containsAttrib(Narrative.FIELD_Question)|| !tl_narrativePSet.containsAttrib(Narrative.FIELD_Question)||
!rs_narrativePSet.containsAttrib(Narrative.SINGLEREFERENCE_Level)) !tl_narrativePSet.containsAttrib(Narrative.SINGLEREFERENCE_Level))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -144,8 +144,8 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -144,8 +144,8 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_narrative " + "FROM {PREFIX}tl_narrative " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_narrative.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_narrative.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -170,7 +170,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -170,7 +170,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (Narrative.SINGLEREFERENCE_Level)) else if (refName.equals (Narrative.SINGLEREFERENCE_Level))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_narrative " + "FROM {PREFIX}tl_narrative " +
"WHERE " + SELECT_JOINS + "level_number = ?"; "WHERE " + SELECT_JOINS + "level_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -192,47 +192,47 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -192,47 +192,47 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_narrativePSet = allPSets.getPersistentSet(objectID, "rs_narrative"); PersistentSet tl_narrativePSet = allPSets.getPersistentSet(objectID, "tl_narrative");
if (rs_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_narrative " + "UPDATE {PREFIX}tl_narrative " +
"SET narrative_code = ?, narrative_desc = ?, graphic_notes = ?, exec_sum_notes = ?, mod_connect_flag = ?, narrative_notes = ?, devel_narrative = ?, question = ?, level_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET narrative_code = ?, narrative_desc = ?, graphic_notes = ?, exec_sum_notes = ?, mod_connect_flag = ?, narrative_notes = ?, devel_narrative = ?, question = ?, level_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_narrative.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_narrative.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_NarrativeCode.getForSQL(dummyNarrativeCode, rs_narrativePSet.getAttrib (Narrative.FIELD_NarrativeCode))).listEntry (HELPER_Description.getForSQL(dummyDescription, rs_narrativePSet.getAttrib (Narrative.FIELD_Description))).listEntry (HELPER_GraphicNotes.getForSQL(dummyGraphicNotes, rs_narrativePSet.getAttrib (Narrative.FIELD_GraphicNotes))).listEntry (HELPER_SummaryNotes.getForSQL(dummySummaryNotes, rs_narrativePSet.getAttrib (Narrative.FIELD_SummaryNotes))).listEntry (HELPER_ModConnect.getForSQL(dummyModConnect, rs_narrativePSet.getAttrib (Narrative.FIELD_ModConnect))).listEntry (HELPER_NarrativeNotes.getForSQL(dummyNarrativeNotes, rs_narrativePSet.getAttrib (Narrative.FIELD_NarrativeNotes))).listEntry (HELPER_DevelNarrative.getForSQL(dummyDevelNarrative, rs_narrativePSet.getAttrib (Narrative.FIELD_DevelNarrative))).listEntry (HELPER_Question.getForSQL(dummyQuestion, rs_narrativePSet.getAttrib (Narrative.FIELD_Question))).listEntry (SQLManager.CheckNull((Long)(rs_narrativePSet.getAttrib (Narrative.SINGLEREFERENCE_Level)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_NarrativeCode.getForSQL(dummyNarrativeCode, tl_narrativePSet.getAttrib (Narrative.FIELD_NarrativeCode))).listEntry (HELPER_Description.getForSQL(dummyDescription, tl_narrativePSet.getAttrib (Narrative.FIELD_Description))).listEntry (HELPER_GraphicNotes.getForSQL(dummyGraphicNotes, tl_narrativePSet.getAttrib (Narrative.FIELD_GraphicNotes))).listEntry (HELPER_SummaryNotes.getForSQL(dummySummaryNotes, tl_narrativePSet.getAttrib (Narrative.FIELD_SummaryNotes))).listEntry (HELPER_ModConnect.getForSQL(dummyModConnect, tl_narrativePSet.getAttrib (Narrative.FIELD_ModConnect))).listEntry (HELPER_NarrativeNotes.getForSQL(dummyNarrativeNotes, tl_narrativePSet.getAttrib (Narrative.FIELD_NarrativeNotes))).listEntry (HELPER_DevelNarrative.getForSQL(dummyDevelNarrative, tl_narrativePSet.getAttrib (Narrative.FIELD_DevelNarrative))).listEntry (HELPER_Question.getForSQL(dummyQuestion, tl_narrativePSet.getAttrib (Narrative.FIELD_Question))).listEntry (SQLManager.CheckNull((Long)(tl_narrativePSet.getAttrib (Narrative.SINGLEREFERENCE_Level)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_narrative WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_narrative WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_narrative", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_narrative", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (NarrativePersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (NarrativePersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_narrative"); throw new ConcurrentUpdateConflictException (obj, "tl_narrative");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_narrative for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_narrative for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (NarrativePersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (NarrativePersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_narrativePSet.setStatus (PersistentSetStatus.PROCESSED); tl_narrativePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -247,42 +247,42 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -247,42 +247,42 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_narrativePSet = allPSets.getPersistentSet(objectID, "rs_narrative"); PersistentSet tl_narrativePSet = allPSets.getPersistentSet(objectID, "tl_narrative");
LogMgr.log (NarrativePersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (NarrativePersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_narrative " + "FROM {PREFIX}tl_narrative " +
"WHERE rs_narrative.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_narrative.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_narrative WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_narrative WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_narrative"); throw new ConcurrentUpdateConflictException (obj, "tl_narrative");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_narrative for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_narrative for row:" + objectID;
LogMgr.log (NarrativePersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (NarrativePersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_narrativePSet.setStatus (PersistentSetStatus.PROCESSED); tl_narrativePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -337,7 +337,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -337,7 +337,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_narrativePSet = allPSets.getPersistentSet(objectID, "rs_narrative", PersistentSetStatus.FETCHED); PersistentSet tl_narrativePSet = allPSets.getPersistentSet(objectID, "tl_narrative", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -396,7 +396,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -396,7 +396,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_narrative " + tables + "FROM {PREFIX}tl_narrative " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -412,12 +412,12 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -412,12 +412,12 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_narrative.object_id"; String orderBy = " ORDER BY tl_narrative.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_narrative.object_id is not null Object[] searchParams; // paramFilter: tl_narrative.object_id is not null
String preFilter = "(rs_narrative.object_id is not null)" String preFilter = "(tl_narrative.object_id is not null)"
+ " "; + " ";
...@@ -432,7 +432,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -432,7 +432,7 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_narrative " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_narrative " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -452,24 +452,24 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -452,24 +452,24 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_narrativePSet = allPSets.getPersistentSet(objectID, "rs_narrative", PersistentSetStatus.FETCHED); PersistentSet tl_narrativePSet = allPSets.getPersistentSet(objectID, "tl_narrative", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_narrativePSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_narrativePSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_narrativePSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_narrativePSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_narrativePSet.setAttrib(Narrative.FIELD_NarrativeCode, HELPER_NarrativeCode.getFromRS(dummyNarrativeCode, r, "narrative_code")); tl_narrativePSet.setAttrib(Narrative.FIELD_NarrativeCode, HELPER_NarrativeCode.getFromRS(dummyNarrativeCode, r, "narrative_code"));
rs_narrativePSet.setAttrib(Narrative.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "narrative_desc")); tl_narrativePSet.setAttrib(Narrative.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "narrative_desc"));
rs_narrativePSet.setAttrib(Narrative.FIELD_GraphicNotes, HELPER_GraphicNotes.getFromRS(dummyGraphicNotes, r, "graphic_notes")); tl_narrativePSet.setAttrib(Narrative.FIELD_GraphicNotes, HELPER_GraphicNotes.getFromRS(dummyGraphicNotes, r, "graphic_notes"));
rs_narrativePSet.setAttrib(Narrative.FIELD_SummaryNotes, HELPER_SummaryNotes.getFromRS(dummySummaryNotes, r, "exec_sum_notes")); tl_narrativePSet.setAttrib(Narrative.FIELD_SummaryNotes, HELPER_SummaryNotes.getFromRS(dummySummaryNotes, r, "exec_sum_notes"));
rs_narrativePSet.setAttrib(Narrative.FIELD_ModConnect, HELPER_ModConnect.getFromRS(dummyModConnect, r, "mod_connect_flag")); tl_narrativePSet.setAttrib(Narrative.FIELD_ModConnect, HELPER_ModConnect.getFromRS(dummyModConnect, r, "mod_connect_flag"));
rs_narrativePSet.setAttrib(Narrative.FIELD_NarrativeNotes, HELPER_NarrativeNotes.getFromRS(dummyNarrativeNotes, r, "narrative_notes")); tl_narrativePSet.setAttrib(Narrative.FIELD_NarrativeNotes, HELPER_NarrativeNotes.getFromRS(dummyNarrativeNotes, r, "narrative_notes"));
rs_narrativePSet.setAttrib(Narrative.FIELD_DevelNarrative, HELPER_DevelNarrative.getFromRS(dummyDevelNarrative, r, "devel_narrative")); tl_narrativePSet.setAttrib(Narrative.FIELD_DevelNarrative, HELPER_DevelNarrative.getFromRS(dummyDevelNarrative, r, "devel_narrative"));
rs_narrativePSet.setAttrib(Narrative.FIELD_Question, HELPER_Question.getFromRS(dummyQuestion, r, "question")); tl_narrativePSet.setAttrib(Narrative.FIELD_Question, HELPER_Question.getFromRS(dummyQuestion, r, "question"));
rs_narrativePSet.setAttrib(Narrative.SINGLEREFERENCE_Level, r.getObject ("level_number")); tl_narrativePSet.setAttrib(Narrative.SINGLEREFERENCE_Level, r.getObject ("level_number"));
} }
...@@ -477,21 +477,21 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr ...@@ -477,21 +477,21 @@ public class NarrativePersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_narrativePSet = allPSets.getPersistentSet(objectID, "rs_narrative"); PersistentSet tl_narrativePSet = allPSets.getPersistentSet(objectID, "tl_narrative");
if (rs_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_narrativePSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED) tl_narrativePSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_narrative " + "INSERT INTO {PREFIX}tl_narrative " +
" (narrative_code, narrative_desc, graphic_notes, exec_sum_notes, mod_connect_flag, narrative_notes, devel_narrative, question, level_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (narrative_code, narrative_desc, graphic_notes, exec_sum_notes, mod_connect_flag, narrative_notes, devel_narrative, question, level_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_NarrativeCode.getForSQL(dummyNarrativeCode, rs_narrativePSet.getAttrib (Narrative.FIELD_NarrativeCode))).listEntry (HELPER_Description.getForSQL(dummyDescription, rs_narrativePSet.getAttrib (Narrative.FIELD_Description))).listEntry (HELPER_GraphicNotes.getForSQL(dummyGraphicNotes, rs_narrativePSet.getAttrib (Narrative.FIELD_GraphicNotes))).listEntry (HELPER_SummaryNotes.getForSQL(dummySummaryNotes, rs_narrativePSet.getAttrib (Narrative.FIELD_SummaryNotes))).listEntry (HELPER_ModConnect.getForSQL(dummyModConnect, rs_narrativePSet.getAttrib (Narrative.FIELD_ModConnect))).listEntry (HELPER_NarrativeNotes.getForSQL(dummyNarrativeNotes, rs_narrativePSet.getAttrib (Narrative.FIELD_NarrativeNotes))).listEntry (HELPER_DevelNarrative.getForSQL(dummyDevelNarrative, rs_narrativePSet.getAttrib (Narrative.FIELD_DevelNarrative))).listEntry (HELPER_Question.getForSQL(dummyQuestion, rs_narrativePSet.getAttrib (Narrative.FIELD_Question))) .listEntry (SQLManager.CheckNull((Long)(rs_narrativePSet.getAttrib (Narrative.SINGLEREFERENCE_Level)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_NarrativeCode.getForSQL(dummyNarrativeCode, tl_narrativePSet.getAttrib (Narrative.FIELD_NarrativeCode))).listEntry (HELPER_Description.getForSQL(dummyDescription, tl_narrativePSet.getAttrib (Narrative.FIELD_Description))).listEntry (HELPER_GraphicNotes.getForSQL(dummyGraphicNotes, tl_narrativePSet.getAttrib (Narrative.FIELD_GraphicNotes))).listEntry (HELPER_SummaryNotes.getForSQL(dummySummaryNotes, tl_narrativePSet.getAttrib (Narrative.FIELD_SummaryNotes))).listEntry (HELPER_ModConnect.getForSQL(dummyModConnect, tl_narrativePSet.getAttrib (Narrative.FIELD_ModConnect))).listEntry (HELPER_NarrativeNotes.getForSQL(dummyNarrativeNotes, tl_narrativePSet.getAttrib (Narrative.FIELD_NarrativeNotes))).listEntry (HELPER_DevelNarrative.getForSQL(dummyDevelNarrative, tl_narrativePSet.getAttrib (Narrative.FIELD_DevelNarrative))).listEntry (HELPER_Question.getForSQL(dummyQuestion, tl_narrativePSet.getAttrib (Narrative.FIELD_Question))) .listEntry (SQLManager.CheckNull((Long)(tl_narrativePSet.getAttrib (Narrative.SINGLEREFERENCE_Level)))) .listEntry (objectID.longID ()).toList().toArray());
rs_narrativePSet.setStatus (PersistentSetStatus.PROCESSED); tl_narrativePSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/Question.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<MULTIPLEREFERENCE name="Factors" type="FactorQuestionLink" backreferenceName="Question" /> <MULTIPLEREFERENCE name="Factors" type="FactorQuestionLink" backreferenceName="Question" />
<TABLE name="rs_quest_lin" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_quest_lin" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Description" type="String" dbcol="left_quest" length="80"/> <ATTRIB name="Description" type="String" dbcol="left_quest" length="80"/>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_quest_lin.object_id is not null" orderBy="rs_quest_lin.object_id" /> <SEARCH type="All" paramFilter="tl_quest_lin.object_id is not null" orderBy="tl_quest_lin.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/QuestionPersistenceMgr.java
...@@ -41,7 +41,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -41,7 +41,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_quest_lin.object_id as id, {PREFIX}rs_quest_lin.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_quest_lin.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_quest_lin.left_quest, {PREFIX}rs_quest_lin.section_number, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_quest_lin.object_id as id, {PREFIX}tl_quest_lin.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_quest_lin.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_quest_lin.left_quest, {PREFIX}tl_quest_lin.section_number, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -86,14 +86,14 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -86,14 +86,14 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_quest_linPSet = allPSets.getPersistentSet(id, "rs_quest_lin", PersistentSetStatus.FETCHED); PersistentSet tl_quest_linPSet = allPSets.getPersistentSet(id, "tl_quest_lin", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_quest_linPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_quest_linPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_quest_linPSet.containsAttrib(Question.FIELD_Description)|| !tl_quest_linPSet.containsAttrib(Question.FIELD_Description)||
!rs_quest_linPSet.containsAttrib(Question.SINGLEREFERENCE_Section)) !tl_quest_linPSet.containsAttrib(Question.SINGLEREFERENCE_Section))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -116,8 +116,8 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -116,8 +116,8 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_quest_lin " + "FROM {PREFIX}tl_quest_lin " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_quest_lin.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_quest_lin.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -142,7 +142,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -142,7 +142,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (Question.SINGLEREFERENCE_Section)) else if (refName.equals (Question.SINGLEREFERENCE_Section))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_quest_lin " + "FROM {PREFIX}tl_quest_lin " +
"WHERE " + SELECT_JOINS + "section_number = ?"; "WHERE " + SELECT_JOINS + "section_number = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -164,47 +164,47 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -164,47 +164,47 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_quest_linPSet = allPSets.getPersistentSet(objectID, "rs_quest_lin"); PersistentSet tl_quest_linPSet = allPSets.getPersistentSet(objectID, "tl_quest_lin");
if (rs_quest_linPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_quest_linPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_quest_linPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_quest_linPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_quest_lin " + "UPDATE {PREFIX}tl_quest_lin " +
"SET left_quest = ?, section_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET left_quest = ?, section_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_quest_lin.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_quest_lin.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_quest_linPSet.getAttrib (Question.FIELD_Description))).listEntry (SQLManager.CheckNull((Long)(rs_quest_linPSet.getAttrib (Question.SINGLEREFERENCE_Section)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_quest_linPSet.getAttrib (Question.FIELD_Description))).listEntry (SQLManager.CheckNull((Long)(tl_quest_linPSet.getAttrib (Question.SINGLEREFERENCE_Section)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_quest_lin WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_quest_lin WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_quest_lin", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_quest_lin", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (QuestionPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (QuestionPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_quest_lin"); throw new ConcurrentUpdateConflictException (obj, "tl_quest_lin");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_quest_lin for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_quest_lin for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (QuestionPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (QuestionPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_quest_linPSet.setStatus (PersistentSetStatus.PROCESSED); tl_quest_linPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -219,42 +219,42 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -219,42 +219,42 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_quest_linPSet = allPSets.getPersistentSet(objectID, "rs_quest_lin"); PersistentSet tl_quest_linPSet = allPSets.getPersistentSet(objectID, "tl_quest_lin");
LogMgr.log (QuestionPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (QuestionPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_quest_linPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_quest_linPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_quest_linPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_quest_linPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_quest_lin " + "FROM {PREFIX}tl_quest_lin " +
"WHERE rs_quest_lin.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_quest_lin.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_quest_lin WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_quest_lin WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_quest_lin"); throw new ConcurrentUpdateConflictException (obj, "tl_quest_lin");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_quest_lin for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_quest_lin for row:" + objectID;
LogMgr.log (QuestionPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (QuestionPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_quest_linPSet.setStatus (PersistentSetStatus.PROCESSED); tl_quest_linPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -309,7 +309,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -309,7 +309,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_quest_linPSet = allPSets.getPersistentSet(objectID, "rs_quest_lin", PersistentSetStatus.FETCHED); PersistentSet tl_quest_linPSet = allPSets.getPersistentSet(objectID, "tl_quest_lin", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -368,7 +368,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -368,7 +368,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_quest_lin " + tables + "FROM {PREFIX}tl_quest_lin " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -384,12 +384,12 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -384,12 +384,12 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_quest_lin.object_id"; String orderBy = " ORDER BY tl_quest_lin.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_quest_lin.object_id is not null Object[] searchParams; // paramFilter: tl_quest_lin.object_id is not null
String preFilter = "(rs_quest_lin.object_id is not null)" String preFilter = "(tl_quest_lin.object_id is not null)"
+ " "; + " ";
...@@ -404,7 +404,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -404,7 +404,7 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_quest_lin " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_quest_lin " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -424,17 +424,17 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -424,17 +424,17 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_quest_linPSet = allPSets.getPersistentSet(objectID, "rs_quest_lin", PersistentSetStatus.FETCHED); PersistentSet tl_quest_linPSet = allPSets.getPersistentSet(objectID, "tl_quest_lin", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_quest_linPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_quest_linPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_quest_linPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_quest_linPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_quest_linPSet.setAttrib(Question.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "left_quest")); tl_quest_linPSet.setAttrib(Question.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "left_quest"));
rs_quest_linPSet.setAttrib(Question.SINGLEREFERENCE_Section, r.getObject ("section_number")); tl_quest_linPSet.setAttrib(Question.SINGLEREFERENCE_Section, r.getObject ("section_number"));
} }
...@@ -442,21 +442,21 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr ...@@ -442,21 +442,21 @@ public class QuestionPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_quest_linPSet = allPSets.getPersistentSet(objectID, "rs_quest_lin"); PersistentSet tl_quest_linPSet = allPSets.getPersistentSet(objectID, "tl_quest_lin");
if (rs_quest_linPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_quest_linPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_quest_linPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_quest_linPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_quest_lin " + "INSERT INTO {PREFIX}tl_quest_lin " +
" (left_quest, section_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (left_quest, section_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_quest_linPSet.getAttrib (Question.FIELD_Description))) .listEntry (SQLManager.CheckNull((Long)(rs_quest_linPSet.getAttrib (Question.SINGLEREFERENCE_Section)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_quest_linPSet.getAttrib (Question.FIELD_Description))) .listEntry (SQLManager.CheckNull((Long)(tl_quest_linPSet.getAttrib (Question.SINGLEREFERENCE_Section)))) .listEntry (objectID.longID ()).toList().toArray());
rs_quest_linPSet.setStatus (PersistentSetStatus.PROCESSED); tl_quest_linPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/Section.xml
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<MULTIPLEREFERENCE name="Questions" type="Question" backreferenceName="Section" /> <MULTIPLEREFERENCE name="Questions" type="Question" backreferenceName="Section" />
<TABLE name="rs_quest_hdr" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_quest_hdr" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Description" type="String" dbcol="quest_hdr_desc" length="30"/> <ATTRIB name="Description" type="String" dbcol="quest_hdr_desc" length="30"/>
<ATTRIB name="QuestionType" type="QuestionType" dbcol="quest_type_flag" attribHelper="EnumeratedAttributeHelper" /> <ATTRIB name="QuestionType" type="QuestionType" dbcol="quest_type_flag" attribHelper="EnumeratedAttributeHelper" />
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_quest_hdr.object_id is not null" orderBy="rs_quest_hdr.object_id" /> <SEARCH type="All" paramFilter="tl_quest_hdr.object_id is not null" orderBy="tl_quest_hdr.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/SectionPersistenceMgr.java
...@@ -45,7 +45,7 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -45,7 +45,7 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_quest_hdr.object_id as id, {PREFIX}rs_quest_hdr.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_quest_hdr.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_quest_hdr.quest_hdr_desc, {PREFIX}rs_quest_hdr.quest_type_flag, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_quest_hdr.object_id as id, {PREFIX}tl_quest_hdr.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_quest_hdr.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_quest_hdr.quest_hdr_desc, {PREFIX}tl_quest_hdr.quest_type_flag, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -90,14 +90,14 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -90,14 +90,14 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_quest_hdrPSet = allPSets.getPersistentSet(id, "rs_quest_hdr", PersistentSetStatus.FETCHED); PersistentSet tl_quest_hdrPSet = allPSets.getPersistentSet(id, "tl_quest_hdr", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_quest_hdrPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_quest_hdrPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_quest_hdrPSet.containsAttrib(Section.FIELD_Description)|| !tl_quest_hdrPSet.containsAttrib(Section.FIELD_Description)||
!rs_quest_hdrPSet.containsAttrib(Section.FIELD_QuestionType)) !tl_quest_hdrPSet.containsAttrib(Section.FIELD_QuestionType))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -120,8 +120,8 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -120,8 +120,8 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_quest_hdr " + "FROM {PREFIX}tl_quest_hdr " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_quest_hdr.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_quest_hdr.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -158,47 +158,47 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -158,47 +158,47 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_quest_hdrPSet = allPSets.getPersistentSet(objectID, "rs_quest_hdr"); PersistentSet tl_quest_hdrPSet = allPSets.getPersistentSet(objectID, "tl_quest_hdr");
if (rs_quest_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_quest_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_quest_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_quest_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_quest_hdr " + "UPDATE {PREFIX}tl_quest_hdr " +
"SET quest_hdr_desc = ?, quest_type_flag = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET quest_hdr_desc = ?, quest_type_flag = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_quest_hdr.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_quest_hdr.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_quest_hdrPSet.getAttrib (Section.FIELD_Description))).listEntry (HELPER_QuestionType.getForSQL(dummyQuestionType, rs_quest_hdrPSet.getAttrib (Section.FIELD_QuestionType))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_quest_hdrPSet.getAttrib (Section.FIELD_Description))).listEntry (HELPER_QuestionType.getForSQL(dummyQuestionType, tl_quest_hdrPSet.getAttrib (Section.FIELD_QuestionType))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_quest_hdr WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_quest_hdr WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_quest_hdr", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_quest_hdr", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (SectionPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (SectionPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_quest_hdr"); throw new ConcurrentUpdateConflictException (obj, "tl_quest_hdr");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_quest_hdr for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_quest_hdr for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (SectionPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (SectionPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_quest_hdrPSet.setStatus (PersistentSetStatus.PROCESSED); tl_quest_hdrPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -213,42 +213,42 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -213,42 +213,42 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_quest_hdrPSet = allPSets.getPersistentSet(objectID, "rs_quest_hdr"); PersistentSet tl_quest_hdrPSet = allPSets.getPersistentSet(objectID, "tl_quest_hdr");
LogMgr.log (SectionPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (SectionPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_quest_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_quest_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_quest_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_quest_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_quest_hdr " + "FROM {PREFIX}tl_quest_hdr " +
"WHERE rs_quest_hdr.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_quest_hdr.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_quest_hdr WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_quest_hdr WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_quest_hdr"); throw new ConcurrentUpdateConflictException (obj, "tl_quest_hdr");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_quest_hdr for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_quest_hdr for row:" + objectID;
LogMgr.log (SectionPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (SectionPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_quest_hdrPSet.setStatus (PersistentSetStatus.PROCESSED); tl_quest_hdrPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -303,7 +303,7 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -303,7 +303,7 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_quest_hdrPSet = allPSets.getPersistentSet(objectID, "rs_quest_hdr", PersistentSetStatus.FETCHED); PersistentSet tl_quest_hdrPSet = allPSets.getPersistentSet(objectID, "tl_quest_hdr", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -362,7 +362,7 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -362,7 +362,7 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_quest_hdr " + tables + "FROM {PREFIX}tl_quest_hdr " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -378,12 +378,12 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -378,12 +378,12 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_quest_hdr.object_id"; String orderBy = " ORDER BY tl_quest_hdr.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_quest_hdr.object_id is not null Object[] searchParams; // paramFilter: tl_quest_hdr.object_id is not null
String preFilter = "(rs_quest_hdr.object_id is not null)" String preFilter = "(tl_quest_hdr.object_id is not null)"
+ " "; + " ";
...@@ -398,7 +398,7 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -398,7 +398,7 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_quest_hdr " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_quest_hdr " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -418,16 +418,16 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -418,16 +418,16 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_quest_hdrPSet = allPSets.getPersistentSet(objectID, "rs_quest_hdr", PersistentSetStatus.FETCHED); PersistentSet tl_quest_hdrPSet = allPSets.getPersistentSet(objectID, "tl_quest_hdr", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_quest_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_quest_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_quest_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_quest_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_quest_hdrPSet.setAttrib(Section.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "quest_hdr_desc")); tl_quest_hdrPSet.setAttrib(Section.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "quest_hdr_desc"));
rs_quest_hdrPSet.setAttrib(Section.FIELD_QuestionType, HELPER_QuestionType.getFromRS(dummyQuestionType, r, "quest_type_flag")); tl_quest_hdrPSet.setAttrib(Section.FIELD_QuestionType, HELPER_QuestionType.getFromRS(dummyQuestionType, r, "quest_type_flag"));
} }
...@@ -436,21 +436,21 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr ...@@ -436,21 +436,21 @@ public class SectionPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_quest_hdrPSet = allPSets.getPersistentSet(objectID, "rs_quest_hdr"); PersistentSet tl_quest_hdrPSet = allPSets.getPersistentSet(objectID, "tl_quest_hdr");
if (rs_quest_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_quest_hdrPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_quest_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_quest_hdrPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_quest_hdr " + "INSERT INTO {PREFIX}tl_quest_hdr " +
" (quest_hdr_desc, quest_type_flag, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (quest_hdr_desc, quest_type_flag, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, rs_quest_hdrPSet.getAttrib (Section.FIELD_Description))).listEntry (HELPER_QuestionType.getForSQL(dummyQuestionType, rs_quest_hdrPSet.getAttrib (Section.FIELD_QuestionType))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, tl_quest_hdrPSet.getAttrib (Section.FIELD_Description))).listEntry (HELPER_QuestionType.getForSQL(dummyQuestionType, tl_quest_hdrPSet.getAttrib (Section.FIELD_QuestionType))) .listEntry (objectID.longID ()).toList().toArray());
rs_quest_hdrPSet.setStatus (PersistentSetStatus.PROCESSED); tl_quest_hdrPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/src/performa/orm/TestAnalysis.xml
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
<MULTIPLEREFERENCE name="FactorScores" type="FactorScore" backreferenceName="TestAnalysis" /> <MULTIPLEREFERENCE name="FactorScores" type="FactorScore" backreferenceName="TestAnalysis" />
<TABLE name="rs_test_analysis" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_test_analysis" tablePrefix="object" polymorphic="FALSE">
<SINGLEREFERENCE name="Level" type="Level" dbcol="level_id" backreferenceName="TestAnalysises"/> <SINGLEREFERENCE name="Level" type="Level" dbcol="level_id" backreferenceName="TestAnalysises"/>
<SINGLEREFERENCE name="Candidate" type="Candidate" dbcol="candidate_id" backreferenceName="TestAnalysises"/> <SINGLEREFERENCE name="Candidate" type="Candidate" dbcol="candidate_id" backreferenceName="TestAnalysises"/>
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="rs_test_analysis.object_id is not null" orderBy="rs_test_analysis.object_id" /> <SEARCH type="All" paramFilter="tl_test_analysis.object_id is not null" orderBy="tl_test_analysis.object_id" />
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/orm/TestAnalysisPersistenceMgr.java
...@@ -38,7 +38,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -38,7 +38,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}rs_test_analysis.object_id as id, {PREFIX}rs_test_analysis.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}rs_test_analysis.object_CREATED_DATE as CREATED_DATE, {PREFIX}rs_test_analysis.level_id, {PREFIX}rs_test_analysis.candidate_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_test_analysis.object_id as id, {PREFIX}tl_test_analysis.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_test_analysis.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_test_analysis.level_id, {PREFIX}tl_test_analysis.candidate_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -83,14 +83,14 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -83,14 +83,14 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
} }
} }
PersistentSet rs_test_analysisPSet = allPSets.getPersistentSet(id, "rs_test_analysis", PersistentSetStatus.FETCHED); PersistentSet tl_test_analysisPSet = allPSets.getPersistentSet(id, "tl_test_analysis", PersistentSetStatus.FETCHED);
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !rs_test_analysisPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_test_analysisPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!rs_test_analysisPSet.containsAttrib(TestAnalysis.SINGLEREFERENCE_Level)|| !tl_test_analysisPSet.containsAttrib(TestAnalysis.SINGLEREFERENCE_Level)||
!rs_test_analysisPSet.containsAttrib(TestAnalysis.SINGLEREFERENCE_Candidate)) !tl_test_analysisPSet.containsAttrib(TestAnalysis.SINGLEREFERENCE_Candidate))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -113,8 +113,8 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -113,8 +113,8 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
if (idsToFetch.size () > 0) if (idsToFetch.size () > 0)
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_test_analysis " + "FROM {PREFIX}tl_test_analysis " +
"WHERE " + SELECT_JOINS + "{PREFIX}rs_test_analysis.object_id IN ?"; "WHERE " + SELECT_JOINS + "{PREFIX}tl_test_analysis.object_id IN ?";
BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false); BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
...@@ -139,7 +139,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -139,7 +139,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (TestAnalysis.SINGLEREFERENCE_Level)) else if (refName.equals (TestAnalysis.SINGLEREFERENCE_Level))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_test_analysis " + "FROM {PREFIX}tl_test_analysis " +
"WHERE " + SELECT_JOINS + "level_id = ?"; "WHERE " + SELECT_JOINS + "level_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -149,7 +149,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -149,7 +149,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
else if (refName.equals (TestAnalysis.SINGLEREFERENCE_Candidate)) else if (refName.equals (TestAnalysis.SINGLEREFERENCE_Candidate))
{ {
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_test_analysis " + "FROM {PREFIX}tl_test_analysis " +
"WHERE " + SELECT_JOINS + "candidate_id = ?"; "WHERE " + SELECT_JOINS + "candidate_id = ?";
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
...@@ -171,47 +171,47 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -171,47 +171,47 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave()) if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
{ {
PersistentSet rs_test_analysisPSet = allPSets.getPersistentSet(objectID, "rs_test_analysis"); PersistentSet tl_test_analysisPSet = allPSets.getPersistentSet(objectID, "tl_test_analysis");
if (rs_test_analysisPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_test_analysisPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_test_analysisPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_test_analysisPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}rs_test_analysis " + "UPDATE {PREFIX}tl_test_analysis " +
"SET level_id = ? , candidate_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET level_id = ? , candidate_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE rs_test_analysis.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_test_analysis.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (SQLManager.CheckNull((Long)(rs_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(rs_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Candidate)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Candidate)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}rs_test_analysis WHERE object_id = ?", "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}tl_test_analysis WHERE object_id = ?",
new Object[] { objectID.longID () }); new Object[] { objectID.longID () });
if (r.next ()) if (r.next ())
{ {
Date d = new java.util.Date (r.getTimestamp (2).getTime()); Date d = new java.util.Date (r.getTimestamp (2).getTime());
String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", String errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]",
new Object[] { "rs_test_analysis", objectID.longID (), obj.getObjectLastModified (), d }, new Object[] { "tl_test_analysis", objectID.longID (), obj.getObjectLastModified (), d },
sqlMgr.getPortabilityServices ()); sqlMgr.getPortabilityServices ());
LogMgr.log (TestAnalysisPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (TestAnalysisPersistence, LogLevel.BUSINESS1, errorMsg);
throw new ConcurrentUpdateConflictException (obj, "rs_test_analysis"); throw new ConcurrentUpdateConflictException (obj, "tl_test_analysis");
} }
else else
{ {
String errorMsg = "Attempt to update nonexistent row in table:rs_test_analysis for row:" + objectID + " objDate:" + obj.getObjectLastModified (); String errorMsg = "Attempt to update nonexistent row in table:tl_test_analysis for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
LogMgr.log (TestAnalysisPersistence, LogLevel.BUSINESS1, errorMsg); LogMgr.log (TestAnalysisPersistence, LogLevel.BUSINESS1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_test_analysisPSet.setStatus (PersistentSetStatus.PROCESSED); tl_test_analysisPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -226,42 +226,42 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -226,42 +226,42 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_test_analysisPSet = allPSets.getPersistentSet(objectID, "rs_test_analysis"); PersistentSet tl_test_analysisPSet = allPSets.getPersistentSet(objectID, "tl_test_analysis");
LogMgr.log (TestAnalysisPersistence, LogLevel.DEBUG2, "Deleting:", objectID); LogMgr.log (TestAnalysisPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
if (rs_test_analysisPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_test_analysisPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_test_analysisPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_test_analysisPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
int rowsDeleted = executeStatement (sqlMgr, int rowsDeleted = executeStatement (sqlMgr,
"DELETE " + "DELETE " +
"FROM {PREFIX}rs_test_analysis " + "FROM {PREFIX}tl_test_analysis " +
"WHERE rs_test_analysis.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ", "WHERE tl_test_analysis.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
new Object[] { objectID.longID(), obj.getObjectLastModified () }); new Object[] { objectID.longID(), obj.getObjectLastModified () });
if (rowsDeleted != 1) if (rowsDeleted != 1)
{ {
// Error, either a concurrency error or a not-exists error // Error, either a concurrency error or a not-exists error
ResultSet r = executeQuery (sqlMgr, ResultSet r = executeQuery (sqlMgr,
"SELECT object_id FROM {PREFIX}rs_test_analysis WHERE object_id = ?", "SELECT object_id FROM {PREFIX}tl_test_analysis WHERE object_id = ?",
new Object[] { objectID.longID() }); new Object[] { objectID.longID() });
if (r.next ()) if (r.next ())
{ {
throw new ConcurrentUpdateConflictException (obj, "rs_test_analysis"); throw new ConcurrentUpdateConflictException (obj, "tl_test_analysis");
} }
else else
{ {
String errorMsg = "Attempt to delete nonexistent row in table:rs_test_analysis for row:" + objectID; String errorMsg = "Attempt to delete nonexistent row in table:tl_test_analysis for row:" + objectID;
LogMgr.log (TestAnalysisPersistence, LogLevel.SYSTEMERROR1, errorMsg); LogMgr.log (TestAnalysisPersistence, LogLevel.SYSTEMERROR1, errorMsg);
throw new RuntimeException (errorMsg); throw new RuntimeException (errorMsg);
} }
} }
rs_test_analysisPSet.setStatus (PersistentSetStatus.PROCESSED); tl_test_analysisPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
...@@ -316,7 +316,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -316,7 +316,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
} }
else else
{ {
PersistentSet rs_test_analysisPSet = allPSets.getPersistentSet(objectID, "rs_test_analysis", PersistentSetStatus.FETCHED); PersistentSet tl_test_analysisPSet = allPSets.getPersistentSet(objectID, "tl_test_analysis", PersistentSetStatus.FETCHED);
createPersistentSetFromRS(allPSets, r, objectID); createPersistentSetFromRS(allPSets, r, objectID);
...@@ -375,7 +375,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -375,7 +375,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_test_analysis " + tables + "FROM {PREFIX}tl_test_analysis " + tables +
"WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy; "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false); BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
...@@ -391,12 +391,12 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -391,12 +391,12 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
String orderBy = " ORDER BY rs_test_analysis.object_id"; String orderBy = " ORDER BY tl_test_analysis.object_id";
String tables = " "; String tables = " ";
Set<String> joinTableSet = new HashSet<String>(); Set<String> joinTableSet = new HashSet<String>();
String filter; String filter;
Object[] searchParams; // paramFilter: rs_test_analysis.object_id is not null Object[] searchParams; // paramFilter: tl_test_analysis.object_id is not null
String preFilter = "(rs_test_analysis.object_id is not null)" String preFilter = "(tl_test_analysis.object_id is not null)"
+ " "; + " ";
...@@ -411,7 +411,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -411,7 +411,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
Integer maxRows = context.getLoadingAttributes ().getMaxRows (); Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded(); boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS + String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}rs_test_analysis " + tables + tableSetToSQL(joinTableSet) + "FROM {PREFIX}tl_test_analysis " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy; "WHERE " + SELECT_JOINS + " " + filter + orderBy;
...@@ -431,17 +431,17 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -431,17 +431,17 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
{ {
PersistentSet rs_test_analysisPSet = allPSets.getPersistentSet(objectID, "rs_test_analysis", PersistentSetStatus.FETCHED); PersistentSet tl_test_analysisPSet = allPSets.getPersistentSet(objectID, "tl_test_analysis", PersistentSetStatus.FETCHED);
// Object Modified // Object Modified
rs_test_analysisPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE")); tl_test_analysisPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
// Object Created // Object Created
rs_test_analysisPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_test_analysisPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
rs_test_analysisPSet.setAttrib(TestAnalysis.SINGLEREFERENCE_Level, r.getObject ("level_id")); tl_test_analysisPSet.setAttrib(TestAnalysis.SINGLEREFERENCE_Level, r.getObject ("level_id"));
rs_test_analysisPSet.setAttrib(TestAnalysis.SINGLEREFERENCE_Candidate, r.getObject ("candidate_id")); tl_test_analysisPSet.setAttrib(TestAnalysis.SINGLEREFERENCE_Candidate, r.getObject ("candidate_id"));
} }
...@@ -449,21 +449,21 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr ...@@ -449,21 +449,21 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
{ {
ObjectID objectID = obj.getID (); ObjectID objectID = obj.getID ();
PersistentSet rs_test_analysisPSet = allPSets.getPersistentSet(objectID, "rs_test_analysis"); PersistentSet tl_test_analysisPSet = allPSets.getPersistentSet(objectID, "tl_test_analysis");
if (rs_test_analysisPSet.getStatus () != PersistentSetStatus.PROCESSED && if (tl_test_analysisPSet.getStatus () != PersistentSetStatus.PROCESSED &&
rs_test_analysisPSet.getStatus () != PersistentSetStatus.DEFERRED) tl_test_analysisPSet.getStatus () != PersistentSetStatus.DEFERRED)
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}rs_test_analysis " + "INSERT INTO {PREFIX}tl_test_analysis " +
" ( level_id, candidate_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " ( level_id, candidate_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" ( ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " ( ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils .listEntry (SQLManager.CheckNull((Long)(rs_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(rs_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Candidate)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils .listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Candidate)))) .listEntry (objectID.longID ()).toList().toArray());
rs_test_analysisPSet.setStatus (PersistentSetStatus.PROCESSED); tl_test_analysisPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
} }
......
cmsWebApp/webroot/extensions/performa/upgrades/20170526_FactorScore.xml
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">rs_score</tableName> <tableName factory="String">tl_score</tableName>
<column name="test_analysis_id" type="Long" length="11" nullable="true"/> <column name="test_analysis_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_score" indexName="idx_rs_score_test_analysis_id" isUnique="false"><column name="test_analysis_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_score" indexName="idx_tl_score_test_analysis_id" isUnique="false"><column name="test_analysis_id"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/performa/upgrades/20170526_TestAnalysis.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector"> <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
<tableName factory="String">rs_test_analysis</tableName> <tableName factory="String">tl_test_analysis</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<column name="candidate_id" type="Long" length="11" nullable="true"/> <column name="candidate_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_test_analysis" indexName="idx_rs_test_analysis_level_id" isUnique="false"><column name="level_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_test_analysis" indexName="idx_tl_test_analysis_level_id" isUnique="false"><column name="level_id"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="rs_test_analysis" indexName="idx_rs_test_analysis_candidate_id" isUnique="false"><column name="candidate_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_test_analysis" indexName="idx_tl_test_analysis_candidate_id" isUnique="false"><column name="candidate_id"/></NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment