From fd6e4d8171779458c398edc5882fb367e673db25 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 9 Nov 2023 08:37:31 -0500 Subject: [PATCH] Clean-up `select_add_order_by` (#6636) --- abaplint.json | 6 +- src/apack/zcl_abapgit_apack_helper.clas.abap | 3 +- src/apack/zcl_abapgit_apack_reader.clas.abap | 6 +- .../zcl_abapgit_data_deserializer.clas.abap | 4 +- .../zcl_abapgit_data_serializer.clas.abap | 4 +- src/data/zcl_abapgit_data_supporter.clas.abap | 3 +- .../zcl_abapgit_code_inspector.clas.abap | 5 +- .../texts/zcl_abapgit_longtexts.clas.abap | 8 +- .../texts/zcl_abapgit_sotr_handler.clas.abap | 6 +- .../zcl_abapgit_object_filter_tran.clas.abap | 97 +++++++++---------- .../zcl_abapgit_services_abapgit.clas.abap | 3 +- 11 files changed, 75 insertions(+), 70 deletions(-) diff --git a/abaplint.json b/abaplint.json index f855b7c96..1b1bce4bb 100644 --- a/abaplint.json +++ b/abaplint.json @@ -449,11 +449,9 @@ "slow_parameter_passing": true, "double_space": true, "select_single_full_key": true, - "whitespace_end": true - }, - "targetRules": { "select_add_order_by": { "skipForAllEntries": true - } + }, + "whitespace_end": true } } diff --git a/src/apack/zcl_abapgit_apack_helper.clas.abap b/src/apack/zcl_abapgit_apack_helper.clas.abap index 5aff830a1..3d34f202b 100644 --- a/src/apack/zcl_abapgit_apack_helper.clas.abap +++ b/src/apack/zcl_abapgit_apack_helper.clas.abap @@ -247,7 +247,8 @@ CLASS zcl_abapgit_apack_helper IMPLEMENTATION. AND tadir~object = 'CLAS' AND seometarel~version = '1' AND ( seometarel~refclsname = zif_abapgit_apack_definitions=>c_apack_interface_cust - OR seometarel~refclsname = zif_abapgit_apack_definitions=>c_apack_interface_sap ). + OR seometarel~refclsname = zif_abapgit_apack_definitions=>c_apack_interface_sap ) + ORDER BY clsname devclass. LOOP AT lt_manifest_implementation INTO ls_manifest_implementation. CLEAR: lo_manifest_provider, lo_apack_reader. diff --git a/src/apack/zcl_abapgit_apack_reader.clas.abap b/src/apack/zcl_abapgit_apack_reader.clas.abap index 443590028..d18a9dea9 100644 --- a/src/apack/zcl_abapgit_apack_reader.clas.abap +++ b/src/apack/zcl_abapgit_apack_reader.clas.abap @@ -187,7 +187,8 @@ CLASS zcl_abapgit_apack_reader IMPLEMENTATION. WHERE tadir~pgmid = 'R3TR' AND tadir~object = 'CLAS' AND seometarel~version = '1' AND - seometarel~refclsname = zif_abapgit_apack_definitions=>c_apack_interface_cust. + seometarel~refclsname = zif_abapgit_apack_definitions=>c_apack_interface_cust + ORDER BY clsname devclass. SELECT seometarel~clsname tadir~devclass FROM seometarel "#EC CI_NOORDER INNER JOIN tadir ON seometarel~clsname = tadir~obj_name "#EC CI_BUFFJOIN @@ -195,7 +196,8 @@ CLASS zcl_abapgit_apack_reader IMPLEMENTATION. WHERE tadir~pgmid = 'R3TR' AND tadir~object = 'CLAS' AND seometarel~version = '1' AND - seometarel~refclsname = zif_abapgit_apack_definitions=>c_apack_interface_sap. + seometarel~refclsname = zif_abapgit_apack_definitions=>c_apack_interface_sap + ORDER BY clsname devclass. LOOP AT lt_packages INTO lv_package. READ TABLE lt_manifest_implementation INTO ls_manifest_implementation WITH KEY devclass = lv_package. diff --git a/src/data/zcl_abapgit_data_deserializer.clas.abap b/src/data/zcl_abapgit_data_deserializer.clas.abap index f9125c490..637400db9 100644 --- a/src/data/zcl_abapgit_data_deserializer.clas.abap +++ b/src/data/zcl_abapgit_data_deserializer.clas.abap @@ -163,10 +163,10 @@ CLASS zcl_abapgit_data_deserializer IMPLEMENTATION. ASSIGN rr_data->* TO . LOOP AT it_where INTO lv_where. - SELECT * FROM (iv_name) APPENDING TABLE WHERE (lv_where). + SELECT * FROM (iv_name) APPENDING TABLE WHERE (lv_where) ORDER BY PRIMARY KEY. ENDLOOP. IF lines( it_where ) = 0. - SELECT * FROM (iv_name) INTO TABLE . + SELECT * FROM (iv_name) INTO TABLE ORDER BY PRIMARY KEY. ENDIF. ENDMETHOD. diff --git a/src/data/zcl_abapgit_data_serializer.clas.abap b/src/data/zcl_abapgit_data_serializer.clas.abap index b0d8b778d..03bce341a 100644 --- a/src/data/zcl_abapgit_data_serializer.clas.abap +++ b/src/data/zcl_abapgit_data_serializer.clas.abap @@ -82,10 +82,10 @@ CLASS zcl_abapgit_data_serializer IMPLEMENTATION. TRY. LOOP AT it_where INTO lv_where. - SELECT * FROM (iv_name) APPENDING TABLE WHERE (lv_where). + SELECT * FROM (iv_name) APPENDING TABLE WHERE (lv_where) ORDER BY PRIMARY KEY. ENDLOOP. IF lines( it_where ) = 0. - SELECT * FROM (iv_name) INTO TABLE . + SELECT * FROM (iv_name) INTO TABLE ORDER BY PRIMARY KEY. ENDIF. CATCH cx_sy_sql_error INTO lx_sql. zcx_abapgit_exception=>raise( diff --git a/src/data/zcl_abapgit_data_supporter.clas.abap b/src/data/zcl_abapgit_data_supporter.clas.abap index 14488c6ab..8077f51b7 100644 --- a/src/data/zcl_abapgit_data_supporter.clas.abap +++ b/src/data/zcl_abapgit_data_supporter.clas.abap @@ -40,7 +40,8 @@ CLASS zcl_abapgit_data_supporter IMPLEMENTATION. AND dd09l~tabart = 'APPL2' AND dd09l~as4user <> 'SAP' AND dd09l~as4local = 'A' "Only active tables - AND dd02l~contflag = 'C'. "Only customizing tables + AND dd02l~contflag = 'C' "Only customizing tables + ORDER BY dd02l~tabname. LOOP AT lt_tables INTO lv_tabname. ls_object-type = zif_abapgit_data_config=>c_data_type-tabu. diff --git a/src/inspect/zcl_abapgit_code_inspector.clas.abap b/src/inspect/zcl_abapgit_code_inspector.clas.abap index 6ae95558d..9044cb34c 100644 --- a/src/inspect/zcl_abapgit_code_inspector.clas.abap +++ b/src/inspect/zcl_abapgit_code_inspector.clas.abap @@ -81,7 +81,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_CODE_INSPECTOR IMPLEMENTATION. +CLASS zcl_abapgit_code_inspector IMPLEMENTATION. METHOD cleanup. @@ -334,7 +334,8 @@ CLASS ZCL_ABAPGIT_CODE_INSPECTOR IMPLEMENTATION. ON scichkv_hd~checkvid = scichkv_tx~checkvid AND scichkv_hd~ciuser = scichkv_tx~ciuser AND scichkv_tx~language = sy-langu - WHERE scichkv_hd~ciuser = space. + WHERE scichkv_hd~ciuser = space + ORDER BY name. ENDMETHOD. diff --git a/src/objects/texts/zcl_abapgit_longtexts.clas.abap b/src/objects/texts/zcl_abapgit_longtexts.clas.abap index 2ce3d8032..da4f6047e 100644 --- a/src/objects/texts/zcl_abapgit_longtexts.clas.abap +++ b/src/objects/texts/zcl_abapgit_longtexts.clas.abap @@ -34,7 +34,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_LONGTEXTS IMPLEMENTATION. +CLASS zcl_abapgit_longtexts IMPLEMENTATION. METHOD escape_name. @@ -168,7 +168,8 @@ CLASS ZCL_ABAPGIT_LONGTEXTS IMPLEMENTATION. SELECT * FROM dokil INTO TABLE lt_dokil - WHERE id = iv_longtext_id AND object LIKE lv_object ESCAPE '#'. + WHERE id = iv_longtext_id AND object LIKE lv_object ESCAPE '#' + ORDER BY PRIMARY KEY. LOOP AT lt_dokil ASSIGNING . @@ -231,7 +232,8 @@ CLASS ZCL_ABAPGIT_LONGTEXTS IMPLEMENTATION. " If not, delete the texts SELECT * FROM dokil INTO TABLE lt_dokil - WHERE id = iv_longtext_id AND object LIKE lv_object ESCAPE '#'. + WHERE id = iv_longtext_id AND object LIKE lv_object ESCAPE '#' + ORDER BY PRIMARY KEY. LOOP AT lt_dokil ASSIGNING . diff --git a/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap b/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap index 16e3d8945..e6885fda0 100644 --- a/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap +++ b/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap @@ -71,7 +71,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_SOTR_HANDLER IMPLEMENTATION. +CLASS zcl_abapgit_sotr_handler IMPLEMENTATION. METHOD create_sotr. @@ -210,7 +210,7 @@ CLASS ZCL_ABAPGIT_SOTR_HANDLER IMPLEMENTATION. FIELD-SYMBOLS LIKE LINE OF lt_sotr_head. - SELECT * FROM sotr_head INTO TABLE lt_sotr_head WHERE paket = iv_package. + SELECT * FROM sotr_head INTO TABLE lt_sotr_head WHERE paket = iv_package ORDER BY PRIMARY KEY. LOOP AT lt_sotr_head ASSIGNING WHERE concept IS NOT INITIAL. @@ -233,7 +233,7 @@ CLASS ZCL_ABAPGIT_SOTR_HANDLER IMPLEMENTATION. ENDLOOP. " Nothing left, then delete SOTR from TADIR - SELECT * FROM sotr_head INTO TABLE lt_sotr_head WHERE paket = iv_package. + SELECT * FROM sotr_head INTO TABLE lt_sotr_head WHERE paket = iv_package ORDER BY PRIMARY KEY. IF sy-subrc <> 0. SELECT SINGLE obj_name FROM tadir INTO lv_obj_name WHERE pgmid = 'R3TR' AND object = 'SOTR' AND obj_name = iv_package. diff --git a/src/repo/zcl_abapgit_object_filter_tran.clas.abap b/src/repo/zcl_abapgit_object_filter_tran.clas.abap index 61616f7b7..4bc43a791 100644 --- a/src/repo/zcl_abapgit_object_filter_tran.clas.abap +++ b/src/repo/zcl_abapgit_object_filter_tran.clas.abap @@ -63,55 +63,6 @@ ENDCLASS. CLASS zcl_abapgit_object_filter_tran IMPLEMENTATION. - METHOD generate_local_filter. - DATA lt_e071_filter TYPE ty_e071_filter_tt. - - SELECT DISTINCT pgmid - object - obj_name - INTO CORRESPONDING FIELDS OF TABLE lt_e071_filter - FROM e071 - WHERE trkorr IN it_r_trkorr. - IF sy-subrc <> 0. - CLEAR lt_e071_filter. - ENDIF. - rt_filter = adjust_local_filter( - iv_package = iv_package - it_e071_filter = lt_e071_filter ). - ENDMETHOD. - - - METHOD get_filter_values. - et_r_trkorr = mt_r_trkorr. - ev_package = mv_package. - ENDMETHOD. - - - METHOD zif_abapgit_object_filter~get_filter. - rt_filter = mt_filter. - ENDMETHOD. - - - METHOD init. - CLEAR mt_filter. - CLEAR mt_r_trkorr. - CLEAR mv_package. - ENDMETHOD. - - - METHOD set_filter_values. - init( ). - mt_r_trkorr = it_r_trkorr. - mv_package = iv_package. - IF it_r_trkorr IS NOT INITIAL. - mt_filter = generate_local_filter( - iv_package = mv_package - it_r_trkorr = mt_r_trkorr ). - - ENDIF. - ENDMETHOD. - - METHOD adjust_local_filter. DATA lt_e071_filter TYPE ty_e071_filter_tt. @@ -178,6 +129,23 @@ CLASS zcl_abapgit_object_filter_tran IMPLEMENTATION. ENDMETHOD. + METHOD generate_local_filter. + DATA lt_e071_filter TYPE ty_e071_filter_tt. + + SELECT DISTINCT pgmid object obj_name + INTO CORRESPONDING FIELDS OF TABLE lt_e071_filter + FROM e071 + WHERE trkorr IN it_r_trkorr + ORDER BY pgmid object obj_name. + IF sy-subrc <> 0. + CLEAR lt_e071_filter. + ENDIF. + rt_filter = adjust_local_filter( + iv_package = iv_package + it_e071_filter = lt_e071_filter ). + ENDMETHOD. + + METHOD get_all_sub_packages. DATA li_package TYPE REF TO zif_abapgit_sap_package. @@ -195,4 +163,35 @@ CLASS zcl_abapgit_object_filter_tran IMPLEMENTATION. ENDLOOP. ENDMETHOD. + + + METHOD get_filter_values. + et_r_trkorr = mt_r_trkorr. + ev_package = mv_package. + ENDMETHOD. + + + METHOD init. + CLEAR mt_filter. + CLEAR mt_r_trkorr. + CLEAR mv_package. + ENDMETHOD. + + + METHOD set_filter_values. + init( ). + mt_r_trkorr = it_r_trkorr. + mv_package = iv_package. + IF it_r_trkorr IS NOT INITIAL. + mt_filter = generate_local_filter( + iv_package = mv_package + it_r_trkorr = mt_r_trkorr ). + + ENDIF. + ENDMETHOD. + + + METHOD zif_abapgit_object_filter~get_filter. + rt_filter = mt_filter. + ENDMETHOD. ENDCLASS. diff --git a/src/ui/routing/zcl_abapgit_services_abapgit.clas.abap b/src/ui/routing/zcl_abapgit_services_abapgit.clas.abap index a5700415c..9bbc4346c 100644 --- a/src/ui/routing/zcl_abapgit_services_abapgit.clas.abap +++ b/src/ui/routing/zcl_abapgit_services_abapgit.clas.abap @@ -110,7 +110,8 @@ CLASS zcl_abapgit_services_abapgit IMPLEMENTATION. FROM tstc INTO TABLE lt_tcodes WHERE pgmna = sy-cprog - AND cinfo = lc_report_tcode_hex. + AND cinfo = lc_report_tcode_hex + ORDER BY tcode. IF lines( lt_tcodes ) > 0. READ TABLE lt_tcodes INDEX 1 INTO rv_tcode.