From 28374b59966972afba034ce839c0b8a3444cb383 Mon Sep 17 00:00:00 2001 From: devinleighsmith Date: Tue, 18 Jul 2023 13:15:16 -0700 Subject: [PATCH] psp-6585 updates to allow etl to overwrite null expiry date on yearly financial codes. --- .../PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtproj | 4 +- .../PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtsx | 1342 ++++++++--------- 2 files changed, 657 insertions(+), 689 deletions(-) diff --git a/etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtproj b/etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtproj index d3f621a342..265368fab8 100644 --- a/etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtproj +++ b/etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtproj @@ -41,10 +41,10 @@ PAIMS_PIMS_CODES 1 0 - 1406 + 1413 - {5BB42B30-09D9-4E62-9A8E-E77E1E840BDB} + {4AD6A5F9-CB28-45F8-8DBE-C1808D7673CA} 8 diff --git a/etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtsx b/etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtsx index 47ff2b47e8..f3eb78bf06 100644 --- a/etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtsx +++ b/etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtsx @@ -14,8 +14,8 @@ DTS:PackageType="5" DTS:ProtectionLevel="0" DTS:TransactionOption="0" - DTS:VersionBuild="1406" - DTS:VersionGUID="{5BB42B30-09D9-4E62-9A8E-E77E1E840BDB}"> + DTS:VersionBuild="1414" + DTS:VersionGUID="{C11AAC78-0890-4F3D-BE31-6A3B86EBEF6B}"> 8 @@ -28,7 +28,7 @@ + DTS:ConnectionString="Data Source=lizzard.th.gov.bc.ca:20208/dev03;User ID=desmith;Provider=OraOLEDB.Oracle.1;" /> + DTS:ConnectionString="Data Source=localhost,5433;User ID=admin;Initial Catalog=pims;Provider=SQLNCLI11.1;Auto Translate=False;Application Name=SSIS-Package2-{397DB851-677E-4A08-84AE-EE76A4654BC7}PIMS;" /> @@ -10894,7 +10894,7 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT expressionType="Notify" name="SqlCommandParam" UITypeEditor="Microsoft.DataTransformationServices.Controls.ModalMultilineStringEditor, Microsoft.DataTransformationServices.Controls, Version=16.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">select * from (select * from [dbo].[PIMS_YEARLY_FINANCIAL_CODE]) [refTable] -where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refTable].[CODE] = ? and [refTable].[APP_CREATE_USERID] = ? +where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[CODE] = ? and [refTable].[APP_CREATE_USERID] = ? #{Package\Load Financial Codes\PAIMS.Outputs[OLE DB Source Output].Columns[EFFECTIVE_DATE]};#{Package\Load Financial Codes\PAIMS.Outputs[OLE DB Source Output].Columns[EXPIRY_DATE]};#{Package\Load Financial Codes\Data Conversion.Outputs[Data Conversion Output].Columns[Copy of STOB_CODE]};#{Package\Load Financial Codes\Audit Trail.Outputs[Derived Column Output].Columns[APP_CREATE_USERID]}; + name="ParameterMap">#{Package\Load Financial Codes\PAIMS.Outputs[OLE DB Source Output].Columns[EFFECTIVE_DATE]};#{Package\Load Financial Codes\Data Conversion.Outputs[Data Conversion Output].Columns[Copy of STOB_CODE]};#{Package\Load Financial Codes\Audit Trail.Outputs[Derived Column Output].Columns[APP_CREATE_USERID]}; - - - EXPIRY_DATE - - - select * from (select * from [dbo].[PIMS_YEARLY_FINANCIAL_CODE]) [refTable] -where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refTable].[DESCRIPTION] = ? and [refTable].[CODE] = ? +where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[DESCRIPTION] = ? and [refTable].[CODE] = ? #{Package\Load Financial Codes\PAIMS.Outputs[OLE DB Source Output].Columns[EFFECTIVE_DATE]};#{Package\Load Financial Codes\PAIMS.Outputs[OLE DB Source Output].Columns[EXPIRY_DATE]};#{Package\Load Financial Codes\Data Conversion.Outputs[Data Conversion Output].Columns[Copy of VOTE_DESCRIPTION]};#{Package\Load Financial Codes\Data Conversion.Outputs[Data Conversion Output].Columns[Copy of YEARLY_FINANCIAL_CODES_ID]}; + name="ParameterMap">#{Package\Load Financial Codes\PAIMS.Outputs[OLE DB Source Output].Columns[EFFECTIVE_DATE]};#{Package\Load Financial Codes\Data Conversion.Outputs[Data Conversion Output].Columns[Copy of VOTE_DESCRIPTION]};#{Package\Load Financial Codes\Data Conversion.Outputs[Data Conversion Output].Columns[Copy of YEARLY_FINANCIAL_CODES_ID]}; - - - EXPIRY_DATE - - - +WHERE (CODE = @CODE OR CODE = @OLD_CODE) AND EFFECTIVE_DATE = @EFFECTIVE_DATE AND (EXPIRY_DATE = @EXPIRY_DATE OR (EXPIRY_DATE IS NULL AND @EXPIRY_DATE IS NOT NULL)) and APP_LAST_UPDATE_USERID = ? + Size="153,42" + Id="Package\Load Account Codes\UPDATE PIMS" + TopLeft="741,313" /> + + - @@ -19264,6 +19236,54 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT RelativePosition="Any" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19422,58 +19442,6 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19523,6 +19491,10 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19721,82 +19765,6 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19889,14 +19857,14 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT Size="166,42" Id="Package\Load Cost Type Codes\ETL ERROR LOG" TopLeft="328.22437035331,470.703220506331" /> - + + + Size="153,42" + Id="Package\Load Cost Type Codes\PIMS UPDATE" + TopLeft="710,310" /> + Id="Package\Load Cost Type Codes.Paths[OLE DB Source Output]" + TopLeft="402.715389828146,61.0580642968137"> + End="0,20.4419357031863"> + End="0,20.4419357031863" /> - + + Id="Package\Load Cost Type Codes.Paths[OLE DB Destination Error Output]" + TopLeft="408.357697986005,360.6"> + End="0,26.045154543151"> + End="0,26.045154543151" /> + Id="Package\Load Cost Type Codes.Paths[OLE DB Command Error Output]" + TopLeft="790.350011737531,352"> + End="0,32.309674983235"> + End="0,32.309674983235" /> + Id="Package\Load Cost Type Codes.Paths[Lookup No Match Output1]" + TopLeft="796.884633188418,274.85483645847"> + End="-10.384633188418,27.64516354153"> + End="0,13.572581770765" /> + + + + - + + Id="Package\Load Cost Type Codes.Paths[Lookup No Match Output]" + TopLeft="407.600002567585,276.12257747154"> + End="0,35.37742252846"> + End="0,35.37742252846" /> - + + Id="Package\Load Cost Type Codes.Paths[Lookup Match Output]" + TopLeft="542.80000513517,254.488706965005"> + End="95.5846280532479,0"> + End="95.5846280532479,0" /> - + + Id="Package\Load Cost Type Codes.Paths[Derived Column Output2]" + TopLeft="409.06988316266,435.745154543151"> + End="0,27.4580659631799"> + End="0,27.4580659631799" /> @@ -20086,19 +20074,19 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT + Id="Package\Load Cost Type Codes.Paths[Derived Column Output1]" + TopLeft="794.412202966349,433.409674983235"> + End="0,26.903227305105"> + End="0,26.903227305105" /> @@ -20107,68 +20095,48 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - + Id="Package\Load Cost Type Codes.Paths[Derived Column Output]" + TopLeft="405.19616242358,201.535480826355"> + End="0,25.487096645185"> - - - - + End="0,25.487096645185" /> - + + Id="Package\Load Cost Type Codes.Paths[Data Conversion Output]" + TopLeft="404.196159855995,130.6"> + End="0,21.8354808263549"> + End="0,21.8354808263549" /> - + @@ -20272,14 +20240,14 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - + + + - @@ -20337,8 +20309,68 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT + Id="Package\Load Financial Activity Codes.Paths[OLE DB Command Error Output]" + TopLeft="800.350012012629,397"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20660,9 +20628,33 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT + Size="307,42" + Id="Package\Load Financial Codes\Existing PIMS_Yearly_Financial_Code records" + TopLeft="254.00000513517,233.32257747154" /> + + + + + + + Size="166,42" + Id="Package\Load Financial Codes\ETL ERROR LOG" + TopLeft="330.82437035331,569.703220506331" /> - - - + Size="166,42" + Id="Package\Load Financial Codes\ETL ERROR LOG 1" + TopLeft="995.00000513517,517.406447811436" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Id="Package\Load Financial Codes.Paths[Merge Output 1]" + TopLeft="850,290"> + End="54.3846331884179,-26.14516354153"> + End="0,-22.14516354153" /> + + - + + Id="Package\Load Financial Codes.Paths[Lookup No Match Output2]" + TopLeft="1079.38463318842,284.85483645847"> + End="-17.3846331884179,29.64516354153"> + End="0,14.572581770765" /> + Point1="0,14.572581770765" + Point2="0,18.572581770765" + Point3="-4,18.572581770765" /> + End="-13.3846331884179,18.572581770765" /> + + - + + + + + + + + + + + + + + + @@ -21035,28 +20947,32 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - - + Id="Package\Load Financial Codes.Paths[Sort Output1]" + TopLeft="733,260"> + End="54.5,45.3333333333333"> + End="31.8348623853211,0" /> + + + + @@ -21065,43 +20981,95 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - + Id="Package\Load Financial Codes.Paths[Sort Output]" + TopLeft="726,347"> + End="61.5,-36"> + End="30.5,0" /> + Point1="30.5,0" + Point2="34.5,0" + Point3="34.5,-4" /> + End="34.5,-32" /> + Point1="34.5,-32" + Point2="34.5,-36" + Point3="38.5,-36" /> + End="61.5,-36" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21150,7 +21118,7 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT OverwriteParamsSQLProp false + type="q2:boolean">false UsedTableName @@ -21173,7 +21141,7 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT OverwriteParamsSQLProp false + type="q2:boolean">false UsedTableName @@ -21252,14 +21220,18 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - + + + - @@ -21312,7 +21284,55 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21360,7 +21380,7 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT @@ -21474,58 +21494,6 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21631,18 +21599,14 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT Size="166,42" Id="Package\Load Work Activity Codes\ETL ERROR LOG 1" TopLeft="729.516690798896,467.81290228834" /> - + Size="174,42" + Id="Package\Load Work Activity Codes\PAM_Work_Activity" + TopLeft="310.092317511203,20.2774191290729" /> + + + Size="238,42" + Id="Package\Load Work Activity Codes\Insert PIMS_Work_Activity_Code" + TopLeft="283.41538405108,322.296774161296" /> + Id="Package\Load Work Activity Codes.Paths[OLE DB Source Output]" + TopLeft="400.246158755602,61.8774191290729"> + End="0,19.6225808709271"> + End="0,19.6225808709271" /> - + + Id="Package\Load Work Activity Codes.Paths[OLE DB Destination Error Output]" + TopLeft="404.865390011545,363.896774161296"> + End="0,22.748380381855"> + End="0,22.748380381855" /> + Id="Package\Load Work Activity Codes.Paths[OLE DB Command Error Output]" + TopLeft="797.5,355"> + End="11.700024025258,29.729029815494"> + End="0,14.614514907747" /> + + + + + Id="Package\Load Work Activity Codes.Paths[Lookup No Match Output1]" + TopLeft="806.384633188418,274.85483645847"> + End="-8.88463318841798,30.64516354153"> + End="0,15.072581770765" /> + + + + - + + Id="Package\Load Work Activity Codes.Paths[Lookup No Match Output]" + TopLeft="401.73846361228,274.864512974762"> + End="0,39.9322611865339"> + End="0,39.9322611865339" /> - + + Id="Package\Load Work Activity Codes.Paths[Lookup Match Output]" + TopLeft="544.86154317348,254.059674716616"> + End="93.523090014938,0"> + End="93.523090014938,0" /> - + + Id="Package\Load Work Activity Codes.Paths[Derived Column Output2]" + TopLeft="409.06988316266,435.745154543151"> + End="0,27.4580659631799"> + End="0,27.4580659631799" /> @@ -21828,19 +21828,19 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT + Id="Package\Load Work Activity Codes.Paths[Derived Column Output1]" + TopLeft="810.758357412077,433.829029815494"> + End="0,26.4838724728457"> + End="0,26.4838724728457" /> @@ -21849,80 +21849,48 @@ where [refTable].[EFFECTIVE_DATE] = ? and [refTable].[EXPIRY_DATE] = ? and [refT - + Id="Package\Load Work Activity Codes.Paths[Derived Column Output]" + TopLeft="402.826931442735,201.535480826355"> + End="0,24.229032148407"> - - - - + End="0,24.229032148407" /> - + + Id="Package\Load Work Activity Codes.Paths[Data Conversion Output]" + TopLeft="404.196159855995,130.6"> + End="0,21.8354808263549"> - - - - + End="0,21.8354808263549" /> - +