Shirly Radco has uploaded a new change for review. Change subject: history: fixed users external_id type due to engine change ......................................................................
history: fixed users external_id type due to engine change external_id feild changed to type text on engine. update etl and history db accordingly. Change-Id: I328a5d27ca90eb4ebb338cedf41fe9d0e4f49f7e Signed-off-by: Shirly Radco <[email protected]> --- A packaging/dbscripts/upgrade/03_05_0050_updated_users_history_table_external_id.sql M tos_project/process/ConfigurationSync_3.5.item M tos_project/process/ConfigurationSync_3.5.properties 3 files changed, 17 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/42/29542/1 diff --git a/packaging/dbscripts/upgrade/03_05_0050_updated_users_history_table_external_id.sql b/packaging/dbscripts/upgrade/03_05_0050_updated_users_history_table_external_id.sql new file mode 100644 index 0000000..dd7dbef --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_0050_updated_users_history_table_external_id.sql @@ -0,0 +1,4 @@ +-- Changed external_id type to text to allow match engine +ALTER TABLE users_details_history ALTER COLUMN external_id DROP DEFAULT; +SELECT fn_db_change_column_type('users_details_history', 'external_id', 'bytea', 'text'); +ALTER TABLE users_details_history ALTER COLUMN external_id SET NOT NULL; diff --git a/tos_project/process/ConfigurationSync_3.5.item b/tos_project/process/ConfigurationSync_3.5.item index a3cead3..45a93da 100644 --- a/tos_project/process/ConfigurationSync_3.5.item +++ b/tos_project/process/ConfigurationSync_3.5.item @@ -7892,7 +7892,7 @@ <column comment="" key="false" length="255" name="department" nullable="true" pattern="" precision="0" sourceType="" type="id_String" usefulColumn="true"/> <column comment="" key="false" length="255" name="user_role_title" nullable="true" pattern="" precision="0" sourceType="" type="id_String" usefulColumn="true"/> <column comment="" key="false" length="255" name="email" nullable="true" pattern="" precision="0" sourceType="" type="id_String" usefulColumn="true"/> - <column comment="" key="false" length="2147483647" name="external_id" nullable="true" pattern="" precision="0" sourceType="" type="id_String" usefulColumn="true"/> + <column comment="" key="false" name="external_id" nullable="true" pattern="" precision="0" sourceType="" type="id_String" usefulColumn="true"/> <column comment="" defaultValue="" key="false" length="1" name="active" nullable="true" pattern="" precision="0" sourceType="" type="id_Boolean" usefulColumn="true"/> <column comment="" key="false" length="35" name="create_date" nullable="true" pattern=""dd-MM-yyyy"" precision="6" sourceType="" type="id_Date" usefulColumn="true"/> <column comment="" key="false" length="35" name="update_date" nullable="true" pattern=""dd-MM-yyyy"" precision="6" sourceType="" type="id_Date" usefulColumn="true"/> @@ -7921,13 +7921,13 @@ <column comment="" key="false" length="255" name="department" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="user_role_title" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="email" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> - <column comment="" key="false" length="2147483647" name="external_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> + <column comment="" key="false" name="external_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="1" name="active" nullable="true" pattern="" sourceType="" type="id_Boolean" originalLength="1" usefulColumn="true"/> <column comment="" key="false" length="35" name="create_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> <column comment="" key="false" length="35" name="update_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" minimized="true"/> <outputTables sizeState="INTERMEDIATE" name="insert_new_users"> <mapperTableEntries name="user_id" expression="row55.user_id " type="id_Object"/> @@ -8059,7 +8059,7 @@ <column comment="" key="false" length="255" name="department" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="user_role_title" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="email" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> - <column comment="" key="false" length="2147483647" name="external_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> + <column comment="" key="false" name="external_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="1" name="active" nullable="true" pattern="" sourceType="" type="id_Boolean" originalLength="1" usefulColumn="true"/> <column comment="" key="false" length="35" name="create_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> <column comment="" key="false" length="35" name="update_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> @@ -8073,7 +8073,7 @@ <column comment="" key="false" length="255" name="department" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="user_role_title" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="email" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> - <column comment="" key="false" length="2147483647" name="external_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> + <column comment="" key="false" name="external_id" nullable="false" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="1" name="active" nullable="true" pattern="" sourceType="" type="id_Boolean" originalLength="1" usefulColumn="true"/> <column comment="" key="false" length="35" name="create_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> <column comment="" key="false" length="35" name="update_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> @@ -8145,7 +8145,7 @@ <column comment="" key="false" length="255" name="department" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="user_role_title" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="email" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> - <column comment="" key="false" length="255" name="external_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> + <column comment="" key="false" name="external_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" defaultValue="" key="false" length="1" name="active" nullable="true" pattern="" sourceType="" type="id_Boolean" originalLength="1" usefulColumn="true"/> <column comment="" key="false" length="35" name="create_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> <column comment="" key="false" length="35" name="update_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> @@ -8174,7 +8174,7 @@ <column comment="" key="false" length="255" name="department" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="user_role_title" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="email" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> - <column comment="" key="false" length="255" name="external_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> + <column comment="" key="false" name="external_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" defaultValue="" key="false" length="1" name="active" nullable="true" pattern="" sourceType="" type="id_Boolean" originalLength="1" usefulColumn="true"/> <column comment="" key="false" length="35" name="create_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> <column comment="" key="false" length="35" name="update_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> @@ -8360,7 +8360,7 @@ <column comment="" key="false" length="255" name="department" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="user_role_title" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="email" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> - <column comment="" key="false" length="255" name="external_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> + <column comment="" key="false" name="external_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" defaultValue="" key="false" length="1" name="active" nullable="true" pattern="" sourceType="" type="id_Boolean" originalLength="1" usefulColumn="true"/> <column comment="" key="false" length="35" name="create_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> <column comment="" key="false" length="35" name="update_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> @@ -8375,7 +8375,7 @@ <column comment="" key="false" length="255" name="department" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="user_role_title" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" key="false" length="255" name="email" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> - <column comment="" key="false" length="255" name="external_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> + <column comment="" key="false" name="external_id" nullable="true" pattern="" sourceType="" type="id_String" originalLength="255" usefulColumn="true"/> <column comment="" defaultValue="" key="false" length="1" name="active" nullable="true" pattern="" sourceType="" type="id_Boolean" originalLength="1" usefulColumn="true"/> <column comment="" key="false" length="35" name="create_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> <column comment="" key="false" length="35" name="update_date" nullable="true" pattern=""dd-MM-yyyy"" sourceType="" type="id_Date" originalLength="35" usefulColumn="true"/> diff --git a/tos_project/process/ConfigurationSync_3.5.properties b/tos_project/process/ConfigurationSync_3.5.properties index f562785..b5158a3 100644 --- a/tos_project/process/ConfigurationSync_3.5.properties +++ b/tos_project/process/ConfigurationSync_3.5.properties @@ -1,9 +1,11 @@ <?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-05-18T09:18:07.822+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-07-03T13:16:51.072+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=""/> + <TalendProperties:ItemState xmi:id="_sTiOMUP_EeC5PvJxFZIIsw" path="" locked="true" lockDate="2014-07-03T12:42:31.420+0300"> + <locker href="../talend.project#_9rn8MCu-EeGwyfNuL-eF9g"/> + </TalendProperties:ItemState> <TalendProperties:ProcessItem xmi:id="_sTiOMkP_EeC5PvJxFZIIsw" property="_sTiOMEP_EeC5PvJxFZIIsw" state="_sTiOMUP_EeC5PvJxFZIIsw"> <process href="ConfigurationSync_3.5.item#/"/> </TalendProperties:ProcessItem> -- To view, visit http://gerrit.ovirt.org/29542 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I328a5d27ca90eb4ebb338cedf41fe9d0e4f49f7e 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
