feat: add support for multiple accdb files

Author: jacksoncougar

action.yml

@@ -7,7 +7,7 @@ outputs:
     value: ${{ steps.list-accdb-files.outputs.has-accdb-files }}
   accdb-diffs:
     description: "Text of accdb diff"
-    value: ${{ steps.generate-accdb-diff.outputs.accdb-diff }}
+    value: ${{ steps.generate-accdb-diff.outputs.accdb-diffs }}
 
 runs:
   using: "composite"
@@ -22,42 +22,34 @@ runs:
         if [ -n "$result" ]
         then 
           echo "HAS_ACCDB_FILES=true" >> $GITHUB_ENV
-          echo "::set-output name=has-accdb-files::$result" 
+          echo "::set-output name=has_accdb_files::true" 
         else          
           echo "HAS_ACCDB_FILES=false" >> $GITHUB_ENV
+          echo "::set-output name=has_accdb_files::false" 
         fi
+        echo "::debug::$result"
       shell: bash
 
     - id: install-mdbtools
       run: |
-        if [ ${{ env.HAS_ACCDB_FILES }} = true ]
-        then
-          sudo apt update
-          sudo apt --assume-yes install mdbtools
-        fi
+        sudo apt --assume-yes install mdbtools
       shell: bash
 
     - id: install-csvtojson
       run: |
-        if [ ${{ env.HAS_ACCDB_FILES }} = true ]
-         then
-           sudo npm i -g csvtojson
-         fi
+        sudo npm i -g csvtojson
       shell: bash
 
     - id: generate-accdb-diff
       env:
         GITHUB_ACTION_PATH: ${{ github.action_path }}
+        WORKSPACE: ${{ github.workspace }}
       run: |
-        if [ ${{ env.HAS_ACCDB_FILES }} = true ]
-         then
-           IFS=$'\n'
-           result=($(${{ github.action_path }}/diff-accdb-files.sh \
-             ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.base.sha }} \
-             | ${{ github.action_path }}/convert-to-markdown-comment.sh \
-             | jq --slurp --raw-input '.' \
-             | { cat; echo; } )) 
-           echo "::set-output name=accdb-diff::${result[@]}"
-           echo "${result[@]}"
-         fi
+        echo "V: 024"
+        echo "::debug::$(${{ github.action_path }}/list-accdb-files.sh ${{ github.event.pull_request.head.sha }} "A" )"
+        echo "::debug::$(${{ github.action_path }}/list-accdb-files.sh ${{ github.event.pull_request.head.sha }} "M" )"
+        result=$(${{ github.action_path }}/diff-accdb-files.sh \
+                ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.base.sha }})
+
+        echo "::set-output name=accdb-diffs::${result}"
       shell: bash

diff-accdb-files.sh

@@ -4,10 +4,17 @@ BASE=$2
 
 # gets the names of accdb files that have been modified in the given commit
 # and then pipes that into a custom diff script.
-${GITHUB_ACTION_PATH}/list-accdb-files.sh $HEAD "M" |
-	xargs -I{} \
-		git difftool --extcmd="${GITHUB_ACTION_PATH}/diff-modified-accdb-file.sh" "$BASE" {} --no-prompt
 
-${GITHUB_ACTION_PATH}/list-accdb-files.sh $HEAD "A" |
-	xargs -I{} \
-		git difftool --extcmd="${GITHUB_ACTION_PATH}/diff-added-accdb-file.sh" "$BASE" {} --no-prompt
+{
+    $GITHUB_ACTION_PATH/list-accdb-files.sh $HEAD M | while read -r f ;
+    do
+        git difftool --extcmd="$GITHUB_ACTION_PATH/diff-modified-accdb-file.sh" "$BASE" "$f" --no-prompt \
+        | jq -s --join-output --compact-output --arg filename "$f" --raw-input '. | { name: $filename, text: . }'
+    done
+    
+    $GITHUB_ACTION_PATH/list-accdb-files.sh $HEAD A | while read -r f ;
+    do
+        git difftool --extcmd="$GITHUB_ACTION_PATH/diff-added-accdb-file.sh" "$BASE" "$f" --no-prompt \
+        | jq -s --join-output --compact-output --arg filename "$f" --raw-input '. | { name: $filename, text: . }'
+    done
+} | jq --join-output --compact-output --slurp '. | { files: . }'

diff-added-accdb-file.sh

@@ -5,6 +5,7 @@ AFTER="${2%.accdb}.json"
 ACCESS_TO_JSON="${GITHUB_ACTION_PATH}/export-accdb-tables-to-json.sh"
 
 echo "" >"$BEFORE"
-$ACCESS_TO_JSON $2 "$AFTER"
+$ACCESS_TO_JSON "$2" "$AFTER"
+
+git diff --no-ext-diff --no-index "$BEFORE" "$AFTER"
 
-git diff --no-ext-diff --no-index $BEFORE $AFTER

diff-modified-accdb-file.sh

@@ -4,8 +4,10 @@ BEFORE="${2%.accdb}.json"
 AFTER="${1%.accdb}.json"
 ACCESS_TO_JSON="${GITHUB_ACTION_PATH}/export-accdb-tables-to-json.sh"
 
-$ACCESS_TO_JSON $2 "$BEFORE"
-$ACCESS_TO_JSON $1 "$AFTER"
+echo "2: $2" >&2
+echo "1: $1" >&2
 
-git diff --no-ext-diff --no-index $AFTER $BEFORE
+$ACCESS_TO_JSON "$2" "$BEFORE"
+$ACCESS_TO_JSON "$1" "$AFTER"
 
+git diff --no-ext-diff --no-index "$AFTER" "$BEFORE"

export-accdb-tables-to-json.sh

@@ -6,7 +6,7 @@ DIFF_OUTPUT=$2
 
 truncate --size 0 $DIFF_OUTPUT
 {
-	for table in $(mdb-tables $ACCDB_FILE | tr " " "\n" | sort); do
-		mdb-export $ACCDB_FILE $table | csvtojson | jq --slurp ". | {"$table": .}" >>$DIFF_OUTPUT
-	done
-} >/dev/null
+    for table in $(mdb-tables "$ACCDB_FILE" | tr " " "\n" | sort); do
+        mdb-export "$ACCDB_FILE" $table | csvtojson | jq --slurp  ".[] | {"$table": . }" >>$DIFF_OUTPUT
+    done
+} >/dev/null