Skip to content

Commit

Permalink
Merge pull request #258 from litencatt/improve-non-interactive-mode-e…
Browse files Browse the repository at this point in the history
…xecution

Improve query a database non-interactive mode execution
  • Loading branch information
litencatt committed Jan 3, 2024
2 parents 39c0fed + 49e9edf commit 8aa4ef6
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/commands/db/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,19 @@ export default class DbQuery extends Command {
databaseId = promptSelectedDbResult.database_id
}

// Set a filter
let filter: object | undefined
try {
if (flags.rawFilter != undefined) {
filter = JSON.parse(flags.rawFilter)
} else if (flags.fileFilter != undefined) {
const fp = path.join('./', flags.fileFilter)
const fj = fs.readFileSync(fp, { encoding: 'utf-8' })
filter = JSON.parse(fj)
// If args is set, run as non-interactive mode.
if (Object.keys(args).length !== 0) {
if (flags.rawFilter != undefined) {
filter = JSON.parse(flags.rawFilter)
} else if (flags.fileFilter != undefined) {
const fp = path.join('./', flags.fileFilter)
const fj = fs.readFileSync(fp, { encoding: 'utf-8' })
filter = JSON.parse(fj)
}
} else {
let CombineOperator = undefined

const promptAddFilterResult = await prompts(
[
{
Expand Down Expand Up @@ -241,6 +242,7 @@ export default class DbQuery extends Command {
} catch (e) {
this.error(e, { exit: 1 })
}

if (filter != undefined && flags.rawFilter == undefined && flags.fileFilter == undefined) {
console.log('')
console.log('Filter:')
Expand Down

0 comments on commit 8aa4ef6

Please sign in to comment.