Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use JGit to filter newly added/modified sql queries only for codegen #188

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Use JGit to filter newly added/modified sql queries only for codegen #188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
172325d
use jgit to filter modified files
swanandvk Apr 22, 2021
b7e4d77
If git repository is not found then generate code for all sql files
swanandvk Jun 7, 2021
9a005b6
SK | generate code for untracked modified files in git if file is not…
swanandvk Jun 7, 2021
bdcdc47
MODIFY | Fix test for untracked file , add mock for repo builder
swanandvk Jun 7, 2021
5a69ff4
MODIFY | clean up tests , add mockk dependency for cli tests
swanandvk Jun 7, 2021
b0eadc0
MODIFY | remove unnecessary vals
swanandvk Jun 7, 2021
9ae212c
Merge branch 'master' into feature/support-git-diff
swanandvk Sep 6, 2021
37062d9
remove duplicate clikt from build gradle
swanandvk Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ mainClassName = "norm.cli.NormCliKt"
dependencies {
implementation project(":codegen")
implementation "com.github.ajalt:clikt:2.7.1"
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.11.0.202103091610-r'
}

14 changes: 13 additions & 1 deletion cli/src/main/kotlin/norm/cli/NormCli.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import norm.api.NormApi
import norm.fs.IO
import norm.fs.globSearch
import norm.util.withPgConnection
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.storage.file.FileRepositoryBuilder
import java.io.File


Expand Down Expand Up @@ -67,7 +69,9 @@ class NormCli : CliktCommand( // command name is inferred as norm-cli

// If dir is provided, relativize to itself
inputDir?.let { dir ->
globSearch(dir, "**.sql").forEach { sqlFile ->
val fileList =globSearch(dir, "**.sql")
val modifiedFiles = fileList.filter { modifiedFilesFromGitOnly().contains(it) }
modifiedFiles.forEach { sqlFile ->
IO(sqlFile, dir, outDir).process(normApi::generate)
}
}
Expand All @@ -77,6 +81,14 @@ class NormCli : CliktCommand( // command name is inferred as norm-cli
IO(sqlFile, basePath, outDir).process(normApi::generate)
}
}

fun modifiedFilesFromGitOnly(): List<String> {
val builder = FileRepositoryBuilder()
val repo = builder.setGitDir(File("." + "/.git")).setMustExist(true)
swanandvk marked this conversation as resolved.
Show resolved Hide resolved
.build()
val git = Git(repo)
return git.diff().call().map { diffEntry -> diffEntry.newPath }
}
}