Shirly Radco has uploaded a new change for review. Change subject: history: fixed etl-update users delete date ......................................................................
history: fixed etl-update users delete date fixed bug that delete date of user did not update in the history db. Change-Id: I49726c2302f1fbd5b1697defcb941b790503a87c Bug-Url: https://bugzilla.redhat.com/1124458 Signed-off-by: Shirly Radco <[email protected]> --- M etl_export/src/ovirt_engine_dwh/configurationsync_3_5/ConfigurationSync.java M tos_project/process/ConfigurationSync_3.5.item M tos_project/process/ConfigurationSync_3.5.properties 3 files changed, 122 insertions(+), 143 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/44/31044/1 diff --git a/etl_export/src/ovirt_engine_dwh/configurationsync_3_5/ConfigurationSync.java b/etl_export/src/ovirt_engine_dwh/configurationsync_3_5/ConfigurationSync.java index 9c723fd..21288f5 100644 --- a/etl_export/src/ovirt_engine_dwh/configurationsync_3_5/ConfigurationSync.java +++ b/etl_export/src/ovirt_engine_dwh/configurationsync_3_5/ConfigurationSync.java @@ -4409,17 +4409,11 @@ routines.system.IPersistableRow<delete_usersStruct> { final static byte[] commonByteArrayLock_OVIRT_ENGINE_DWH_ConfigurationSync = new byte[0]; static byte[] commonByteArray_OVIRT_ENGINE_DWH_ConfigurationSync = new byte[0]; - protected static final int DEFAULT_HASHCODE = 1; - protected static final int PRIME = 31; - protected int hashCode = DEFAULT_HASHCODE; - public boolean hashCodeDirty = true; - public String loopKey; + public String user_id; - public String user_join_id; - - public String getUser_join_id() { - return this.user_join_id; + public String getUser_id() { + return this.user_id; } public String first_name; @@ -4494,68 +4488,6 @@ return this.delete_date; } - @Override - public int hashCode() { - if (this.hashCodeDirty) { - final int prime = PRIME; - int result = DEFAULT_HASHCODE; - - result = prime - * result - + ((this.user_join_id == null) ? 0 : this.user_join_id - .hashCode()); - - this.hashCode = result; - this.hashCodeDirty = false; - } - return this.hashCode; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final delete_usersStruct other = (delete_usersStruct) obj; - - if (this.user_join_id == null) { - if (other.user_join_id != null) - return false; - - } else if (!this.user_join_id.equals(other.user_join_id)) - - return false; - - return true; - } - - public void copyDataTo(delete_usersStruct other) { - - other.user_join_id = this.user_join_id; - other.first_name = this.first_name; - other.last_name = this.last_name; - other.domain = this.domain; - other.username = this.username; - other.department = this.department; - other.user_role_title = this.user_role_title; - other.email = this.email; - other.external_id = this.external_id; - other.active = this.active; - other.create_date = this.create_date; - other.update_date = this.update_date; - other.delete_date = this.delete_date; - - } - - public void copyKeysDataTo(delete_usersStruct other) { - - other.user_join_id = this.user_join_id; - - } - private String readString(ObjectInputStream dis) throws IOException { String strReturn = null; int length = 0; @@ -4623,7 +4555,7 @@ int length = 0; - this.user_join_id = readString(dis); + this.user_id = readString(dis); this.first_name = readString(dis); @@ -4668,7 +4600,7 @@ // String - writeString(this.user_join_id, dos); + writeString(this.user_id, dos); // String @@ -4734,7 +4666,7 @@ StringBuilder sb = new StringBuilder(); sb.append(super.toString()); sb.append("["); - sb.append("user_join_id=" + user_join_id); + sb.append("user_id=" + user_id); sb.append(",first_name=" + first_name); sb.append(",last_name=" + last_name); sb.append(",domain=" + domain); @@ -4758,12 +4690,6 @@ public int compareTo(delete_usersStruct other) { int returnValue = -1; - - returnValue = checkNullsAndCompare(this.user_join_id, - other.user_join_id); - if (returnValue != 0) { - return returnValue; - } return returnValue; } @@ -4796,6 +4722,12 @@ routines.system.IPersistableRow<row57Struct> { final static byte[] commonByteArrayLock_OVIRT_ENGINE_DWH_ConfigurationSync = new byte[0]; static byte[] commonByteArray_OVIRT_ENGINE_DWH_ConfigurationSync = new byte[0]; + + public String user_id; + + public String getUser_id() { + return this.user_id; + } public String user_join_id; @@ -4936,6 +4868,8 @@ int length = 0; + this.user_id = readString(dis); + this.user_join_id = readString(dis); this.first_name = readString(dis); @@ -4976,6 +4910,10 @@ public void writeData(ObjectOutputStream dos) { try { + + // String + + writeString(this.user_id, dos); // String @@ -5041,7 +4979,8 @@ StringBuilder sb = new StringBuilder(); sb.append(super.toString()); sb.append("["); - sb.append("user_join_id=" + user_join_id); + sb.append("user_id=" + user_id); + sb.append(",user_join_id=" + user_join_id); sb.append(",first_name=" + first_name); sb.append(",last_name=" + last_name); sb.append(",domain=" + domain); @@ -5102,6 +5041,12 @@ public boolean hashCodeDirty = true; public String loopKey; + + public String user_id; + + public String getUser_id() { + return this.user_id; + } public String user_join_id; @@ -5215,6 +5160,7 @@ public void copyDataTo(after_tJDBCInput_11Struct other) { + other.user_id = this.user_id; other.user_join_id = this.user_join_id; other.first_name = this.first_name; other.last_name = this.last_name; @@ -5303,6 +5249,8 @@ int length = 0; + this.user_id = readString(dis); + this.user_join_id = readString(dis); this.first_name = readString(dis); @@ -5343,6 +5291,10 @@ public void writeData(ObjectOutputStream dos) { try { + + // String + + writeString(this.user_id, dos); // String @@ -5408,7 +5360,8 @@ StringBuilder sb = new StringBuilder(); sb.append(super.toString()); sb.append("["); - sb.append("user_join_id=" + user_join_id); + sb.append("user_id=" + user_id); + sb.append(",user_join_id=" + user_join_id); sb.append(",first_name=" + first_name); sb.append(",last_name=" + last_name); sb.append(",domain=" + domain); @@ -5503,7 +5456,7 @@ int tos_count_tJDBCOutput_10 = 0; - int updateKeyCount_tJDBCOutput_10 = 1; + int updateKeyCount_tJDBCOutput_10 = 0; if (updateKeyCount_tJDBCOutput_10 < 1) { throw new RuntimeException( "For update, Schema must have a key"); @@ -5531,7 +5484,7 @@ String update_tJDBCOutput_10 = "UPDATE " + "users_details_history" - + " SET first_name = ?,last_name = ?,domain = ?,username = ?,department = ?,user_role_title = ?,email = ?,external_id = ?,active = ?,create_date = ?,update_date = ?,delete_date = ? WHERE user_join_id = ?"; + + " SET user_id = ?,first_name = ?,last_name = ?,domain = ?,username = ?,department = ?,user_role_title = ?,email = ?,external_id = ?,active = ?,create_date = ?,update_date = ?,delete_date = ? WHERE "; java.sql.PreparedStatement pstmt_tJDBCOutput_10 = connection_tJDBCOutput_10 .prepareStatement(update_tJDBCOutput_10); @@ -5595,7 +5548,7 @@ java.sql.Statement stmt_tJDBCInput_11 = conn_tJDBCInput_11 .createStatement(); - String dbquery_tJDBCInput_11 = "SELECT upper(cast(user_id as char(36))) as user_join_id, first_name, last_name, domain, username, department, user_role_title, email, external_id, active, create_date, update_date FROM v3_5_latest_users_details"; + String dbquery_tJDBCInput_11 = "SELECT user_id, upper(cast(user_id as char(36))) as user_join_id, first_name, last_name, domain, username, department, user_role_title, email, external_id, active, create_date, update_date FROM v3_5_latest_users_details"; globalMap.put("tJDBCInput_11_QUERY", dbquery_tJDBCInput_11); java.sql.ResultSet rs_tJDBCInput_11 = null; @@ -5616,6 +5569,22 @@ column_index_tJDBCInput_11 = 1; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { + row57.user_id = null; + } else { + + tmpContent_tJDBCInput_11 = rs_tJDBCInput_11 + .getString(column_index_tJDBCInput_11); + if (tmpContent_tJDBCInput_11 != null) { + row57.user_id = tmpContent_tJDBCInput_11; + } else { + row57.user_id = null; + } + + } + + column_index_tJDBCInput_11 = 2; + + if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.user_join_id = null; } else { @@ -5629,7 +5598,7 @@ } - column_index_tJDBCInput_11 = 2; + column_index_tJDBCInput_11 = 3; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.first_name = null; @@ -5645,7 +5614,7 @@ } - column_index_tJDBCInput_11 = 3; + column_index_tJDBCInput_11 = 4; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.last_name = null; @@ -5661,7 +5630,7 @@ } - column_index_tJDBCInput_11 = 4; + column_index_tJDBCInput_11 = 5; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.domain = null; @@ -5677,7 +5646,7 @@ } - column_index_tJDBCInput_11 = 5; + column_index_tJDBCInput_11 = 6; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.username = null; @@ -5693,7 +5662,7 @@ } - column_index_tJDBCInput_11 = 6; + column_index_tJDBCInput_11 = 7; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.department = null; @@ -5709,7 +5678,7 @@ } - column_index_tJDBCInput_11 = 7; + column_index_tJDBCInput_11 = 8; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.user_role_title = null; @@ -5725,7 +5694,7 @@ } - column_index_tJDBCInput_11 = 8; + column_index_tJDBCInput_11 = 9; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.email = null; @@ -5741,7 +5710,7 @@ } - column_index_tJDBCInput_11 = 9; + column_index_tJDBCInput_11 = 10; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.external_id = null; @@ -5757,7 +5726,7 @@ } - column_index_tJDBCInput_11 = 10; + column_index_tJDBCInput_11 = 11; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.active = null; @@ -5773,7 +5742,7 @@ } - column_index_tJDBCInput_11 = 11; + column_index_tJDBCInput_11 = 12; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.create_date = null; @@ -5791,7 +5760,7 @@ } - column_index_tJDBCInput_11 = 12; + column_index_tJDBCInput_11 = 13; if (colQtyInRs_tJDBCInput_11 < column_index_tJDBCInput_11) { row57.update_date = null; @@ -5906,7 +5875,7 @@ // # Output reject table : 'delete_users' // # Filter conditions if (rejectedInnerJoin_tMap_10) { - delete_users_tmp.user_join_id = row57.user_join_id; + delete_users_tmp.user_id = row57.user_id; delete_users_tmp.first_name = row57.first_name; delete_users_tmp.last_name = row57.last_name; delete_users_tmp.domain = row57.domain; @@ -5942,117 +5911,117 @@ currentComponent = "tJDBCOutput_10"; whetherReject_tJDBCOutput_10 = false; - if (delete_users.first_name == null) { + if (delete_users.user_id == null) { pstmt_tJDBCOutput_10.setNull(1, java.sql.Types.VARCHAR); } else { pstmt_tJDBCOutput_10.setString(1, - delete_users.first_name); + delete_users.user_id); } - if (delete_users.last_name == null) { + if (delete_users.first_name == null) { pstmt_tJDBCOutput_10.setNull(2, java.sql.Types.VARCHAR); } else { pstmt_tJDBCOutput_10.setString(2, - delete_users.last_name); + delete_users.first_name); } - if (delete_users.domain == null) { + if (delete_users.last_name == null) { pstmt_tJDBCOutput_10.setNull(3, java.sql.Types.VARCHAR); } else { pstmt_tJDBCOutput_10.setString(3, - delete_users.domain); + delete_users.last_name); } - if (delete_users.username == null) { + if (delete_users.domain == null) { pstmt_tJDBCOutput_10.setNull(4, java.sql.Types.VARCHAR); } else { pstmt_tJDBCOutput_10.setString(4, - delete_users.username); + delete_users.domain); } - if (delete_users.department == null) { + if (delete_users.username == null) { pstmt_tJDBCOutput_10.setNull(5, java.sql.Types.VARCHAR); } else { pstmt_tJDBCOutput_10.setString(5, - delete_users.department); + delete_users.username); } - if (delete_users.user_role_title == null) { + if (delete_users.department == null) { pstmt_tJDBCOutput_10.setNull(6, java.sql.Types.VARCHAR); } else { pstmt_tJDBCOutput_10.setString(6, - delete_users.user_role_title); + delete_users.department); } - if (delete_users.email == null) { + if (delete_users.user_role_title == null) { pstmt_tJDBCOutput_10.setNull(7, java.sql.Types.VARCHAR); } else { pstmt_tJDBCOutput_10.setString(7, - delete_users.email); + delete_users.user_role_title); } - if (delete_users.external_id == null) { + if (delete_users.email == null) { pstmt_tJDBCOutput_10.setNull(8, java.sql.Types.VARCHAR); } else { pstmt_tJDBCOutput_10.setString(8, + delete_users.email); + } + + if (delete_users.external_id == null) { + pstmt_tJDBCOutput_10.setNull(9, + java.sql.Types.VARCHAR); + } else { + pstmt_tJDBCOutput_10.setString(9, delete_users.external_id); } if (delete_users.active == null) { - pstmt_tJDBCOutput_10.setNull(9, + pstmt_tJDBCOutput_10.setNull(10, java.sql.Types.BOOLEAN); } else { - pstmt_tJDBCOutput_10.setBoolean(9, + pstmt_tJDBCOutput_10.setBoolean(10, delete_users.active); } if (delete_users.create_date != null) { pstmt_tJDBCOutput_10.setTimestamp( - 10, - new java.sql.Timestamp( - delete_users.create_date - .getTime())); - } else { - pstmt_tJDBCOutput_10.setNull(10, - java.sql.Types.DATE); - } - - if (delete_users.update_date != null) { - pstmt_tJDBCOutput_10.setTimestamp( 11, new java.sql.Timestamp( - delete_users.update_date + delete_users.create_date .getTime())); } else { pstmt_tJDBCOutput_10.setNull(11, java.sql.Types.DATE); } - if (delete_users.delete_date != null) { + if (delete_users.update_date != null) { pstmt_tJDBCOutput_10.setTimestamp( 12, new java.sql.Timestamp( - delete_users.delete_date + delete_users.update_date .getTime())); } else { pstmt_tJDBCOutput_10.setNull(12, java.sql.Types.DATE); } - if (delete_users.user_join_id == null) { - pstmt_tJDBCOutput_10.setNull(13, - java.sql.Types.VARCHAR); + if (delete_users.delete_date != null) { + pstmt_tJDBCOutput_10.setTimestamp( + 13, + new java.sql.Timestamp( + delete_users.delete_date + .getTime())); } else { - pstmt_tJDBCOutput_10.setString(13, - delete_users.user_join_id); + pstmt_tJDBCOutput_10.setNull(13, + java.sql.Types.DATE); } try { @@ -64767,6 +64736,6 @@ ResumeUtil resumeUtil = null; } /************************************************************************************************ - * 1762881 characters generated by Talend Open Studio for Data Integration on - * the May 18, 2014 9:18:25 AM IDT + * 1761968 characters generated by Talend Open Studio for Data Integration on + * the August 4, 2014 10:15:33 PM IDT ************************************************************************************************/ diff --git a/tos_project/process/ConfigurationSync_3.5.item b/tos_project/process/ConfigurationSync_3.5.item index d4853a0..8100ae9 100644 --- a/tos_project/process/ConfigurationSync_3.5.item +++ b/tos_project/process/ConfigurationSync_3.5.item @@ -8096,7 +8096,7 @@ <elementParameter field="TECHNICAL" name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/> <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" value="BUILT_IN"/> <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" value=""""/> - <elementParameter field="MEMO_SQL" name="QUERY" value=""SELECT
 upper(cast(user_id as char(36))) as user_join_id,
 first_name,
 last_name,
 domain,
 username,
 department,
 user_role_title,
 email,
 external_id,
 active,
 create_date,
 update_date
FROM v3_5_latest_users_details""/> + <elementParameter field="MEMO_SQL" name="QUERY" value=""SELECT
 user_id,
 upper(cast(user_id as char(36))) as user_join_id,
 first_name,
 last_name,
 domain,
 username,
 department,
 user_role_title,
 email,
 external_id,
 active,
 create_date,
 update_date
FROM v3_5_latest_users_details""/> <elementParameter field="LABEL" name="NOTE" value="This option only applies when deploying and running in the Talend Runtime"/> <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" value="false"/> <elementParameter field="TEXT" name="DATASOURCE_ALIAS" value=""""/> @@ -8106,6 +8106,8 @@ <elementParameter field="TEXT" name="CURSOR_SIZE" value="1000"/> <elementParameter field="CHECK" name="TRIM_ALL_COLUMN" value="false"/> <elementParameter field="TABLE" name="TRIM_COLUMN"> + <elementValue elementRef="SCHEMA_COLUMN" value="user_id"/> + <elementValue elementRef="TRIM" value="false"/> <elementValue elementRef="SCHEMA_COLUMN" value="user_join_id"/> <elementValue elementRef="TRIM" value="false"/> <elementValue elementRef="SCHEMA_COLUMN" value="first_name"/> @@ -8137,6 +8139,7 @@ <elementParameter field="MEMO" name="COMMENT" value=""/> <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/> <metadata connector="FLOW" name="tJDBCInput_11"> + <column comment="" key="false" length="36" name="user_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="36" usefulColumn="true"/> <column comment="" key="true" length="36" name="user_join_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="16" usefulColumn="true"/> <column comment="" key="false" length="255" name="first_name" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="last_name" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> @@ -8166,7 +8169,7 @@ <elementParameter field="MEMO" name="COMMENT" value=""/> <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/> <metadata connector="FLOW" name="delete_users"> - <column comment="" key="true" length="36" name="user_join_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="16" usefulColumn="true"/> + <column comment="" key="false" length="36" name="user_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="36" usefulColumn="true"/> <column comment="" key="false" length="255" name="first_name" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="last_name" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="domain" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> @@ -8181,10 +8184,10 @@ <column comment="" key="false" length="35" name="delete_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties/> + <uiProperties shellMaximized="true"/> <varTables sizeState="INTERMEDIATE" name="Var"/> <outputTables sizeState="INTERMEDIATE" name="delete_users" activateCondensedTool="true" rejectInnerJoin="true"> - <mapperTableEntries name="user_join_id" expression="row57.user_join_id " type="id_String" nullable="true"/> + <mapperTableEntries name="user_id" expression="row57.user_id " type="id_String"/> <mapperTableEntries name="first_name" expression="row57.first_name " type="id_String" nullable="true"/> <mapperTableEntries name="last_name" expression="row57.last_name " type="id_String" nullable="true"/> <mapperTableEntries name="domain" expression="row57.domain " type="id_String" nullable="true"/> @@ -8199,6 +8202,7 @@ <mapperTableEntries name="delete_date" expression="context.runTime" type="id_Date" nullable="true"/> </outputTables> <inputTables sizeState="INTERMEDIATE" name="row57" matchingMode="UNIQUE_MATCH" lookupMode="LOAD_ONCE"> + <mapperTableEntries name="user_id" type="id_String" nullable="true"/> <mapperTableEntries name="user_join_id" type="id_String" nullable="true"/> <mapperTableEntries name="first_name" type="id_String" nullable="true"/> <mapperTableEntries name="last_name" type="id_String" nullable="true"/> @@ -8278,7 +8282,7 @@ <elementParameter field="TABLE" name="ADD_COLS"/> <elementParameter field="CHECK" name="USE_FIELD_OPTIONS" value="false"/> <elementParameter field="TABLE" name="FIELD_OPTIONS"> - <elementValue elementRef="SCHEMA_COLUMN" value="user_join_id"/> + <elementValue elementRef="SCHEMA_COLUMN" value="user_id"/> <elementValue elementRef="UPDATE_KEY" value="false"/> <elementValue elementRef="DELETE_KEY" value="false"/> <elementValue elementRef="UPDATABLE" value="true"/> @@ -8352,7 +8356,7 @@ <elementParameter field="MEMO" name="COMMENT" value=""/> <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/> <metadata connector="FLOW" name="tJDBCOutput_10"> - <column comment="" key="true" length="36" name="user_join_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="16" usefulColumn="true"/> + <column comment="" key="false" length="36" name="user_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="36" usefulColumn="true"/> <column comment="" key="false" length="255" name="first_name" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="last_name" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="domain" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> @@ -8367,7 +8371,7 @@ <column comment="" key="false" length="35" name="delete_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> </metadata> <metadata connector="REJECT" name="REJECT"> - <column comment="" key="true" length="36" name="user_join_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="16" usefulColumn="true"/> + <column comment="" key="false" length="36" name="user_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="36" usefulColumn="true"/> <column comment="" key="false" length="255" name="first_name" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="last_name" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="domain" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> @@ -11975,6 +11979,9 @@ <elementValue elementRef="TRACE_COLUMN" value="vm_interface_join_id"/> <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> + <elementValue elementRef="TRACE_COLUMN" value="user_id"/> + <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> + <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> </elementParameter> <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/> <elementParameter field="CHECK" name="USEROWLABEL" value="true"/> @@ -12031,6 +12038,9 @@ <elementValue elementRef="TRACE_COLUMN" value="delete_date"/> <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> + <elementValue elementRef="TRACE_COLUMN" value="user_id"/> + <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> + <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> </elementParameter> <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/> <elementParameter field="CHECK" name="USEROWLABEL" value="true"/> diff --git a/tos_project/process/ConfigurationSync_3.5.properties b/tos_project/process/ConfigurationSync_3.5.properties index 2f0c8d6..ba7b99c 100644 --- a/tos_project/process/ConfigurationSync_3.5.properties +++ b/tos_project/process/ConfigurationSync_3.5.properties @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:TalendProperties="http://www.talend.org/properties";> - <TalendProperties:Property xmi:id="_sTiOMEP_EeC5PvJxFZIIsw" id="_sTgZAEP_EeC5PvJxFZIIsw" label="ConfigurationSync" creationDate="2011-07-06T14:17:03.952+0300" modificationDate="2014-07-03T13:47:38.088+0300" version="3.5" statusCode="" item="_sTiOMkP_EeC5PvJxFZIIsw" displayName="ConfigurationSync"> + <TalendProperties:Property xmi:id="_sTiOMEP_EeC5PvJxFZIIsw" id="_sTgZAEP_EeC5PvJxFZIIsw" label="ConfigurationSync" creationDate="2011-07-06T14:17:03.952+0300" modificationDate="2014-08-04T22:12:45.533+0300" version="3.5" statusCode="" item="_sTiOMkP_EeC5PvJxFZIIsw" displayName="ConfigurationSync"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_sTiOMUP_EeC5PvJxFZIIsw" path=""/> -- To view, visit http://gerrit.ovirt.org/31044 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49726c2302f1fbd5b1697defcb941b790503a87c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Shirly Radco <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
