Skip to content

Commit 856381f

Browse files
committed
fixup! Introduce git-history domain
1 parent 40c7c9a commit 856381f

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

domains/git-history/import/importGit.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ echo "importGit: SCRIPTS_DIR=${SCRIPTS_DIR}"
6464
GIT_LOG_CYPHER_DIR="${GIT_HISTORY_IMPORT_DIR}/../queries/enrichment"
6565
echo "importGit: GIT_LOG_CYPHER_DIR=${GIT_LOG_CYPHER_DIR}"
6666

67+
# Cypher validation queries are in this domain's queries/validation directory.
68+
GIT_LOG_VALIDATION_CYPHER_DIR="${GIT_HISTORY_IMPORT_DIR}/../queries/validation"
69+
echo "importGit: GIT_LOG_VALIDATION_CYPHER_DIR=${GIT_LOG_VALIDATION_CYPHER_DIR}"
70+
6771
# Define functions (like execute_cypher and execute_cypher_summarized) to execute cypher queries from within a given file
6872
source "${SCRIPTS_DIR}/executeQueryFunctions.sh"
6973

@@ -139,11 +143,11 @@ commonPostGitImport() {
139143
# Since it's currently not possible to rule out ambiguity in git<->code file matching,
140144
# the following verifications are only an additional info in the log rather than an error.
141145
echo "importGit: Running verification queries for troubleshooting (non failing)..."
142-
execute_cypher "${GIT_LOG_CYPHER_DIR}/Verify_git_to_code_file_unambiguous.cypher"
143-
execute_cypher "${GIT_LOG_CYPHER_DIR}/Verify_code_to_git_file_unambiguous.cypher"
144-
execute_cypher "${GIT_LOG_CYPHER_DIR}/Verify_git_missing_CHANGED_TOGETHER_WITH_properties.cypher"
146+
execute_cypher "${GIT_LOG_VALIDATION_CYPHER_DIR}/Verify_git_to_code_file_unambiguous.cypher"
147+
execute_cypher "${GIT_LOG_VALIDATION_CYPHER_DIR}/Verify_code_to_git_file_unambiguous.cypher"
148+
execute_cypher "${GIT_LOG_VALIDATION_CYPHER_DIR}/Verify_git_missing_CHANGED_TOGETHER_WITH_properties.cypher"
145149

146-
dataVerificationResult=$( execute_cypher "${GIT_LOG_CYPHER_DIR}/Verify_git_missing_create_date.cypher")
150+
dataVerificationResult=$( execute_cypher "${GIT_LOG_VALIDATION_CYPHER_DIR}/Verify_git_missing_create_date.cypher")
147151
if ! is_csv_column_greater_zero "${dataVerificationResult}" "numberOfMissingCreateDateEntries"; then
148152
# Warning: The git file creation date must not be missing. However, this is not important enough to stop the analysis.
149153
# Therefore, it will only be a warning and subsequent queries will use a default date in these cases.

0 commit comments

Comments
 (0)