f.spilla/typeorm-model-generator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't ask for port number if instance name is specified

Browse Source
This commit is contained in:
kononnable 2020-10-27 18:28:34 +01:00
parent 535d5b77ff
commit 6423c0499f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/index.ts
View File

@ -374,6 +374,19 @@ async function useInquirer(options: options): Promise<options> {
options.connectionOptions.schemaName = driver.standardSchema;
}
if (options.connectionOptions.databaseType !== "sqlite") {
if (options.connectionOptions.databaseType === "mssql") {
options.connectionOptions.instanceName = (
await inquirer.prompt([
{
default: options.connectionOptions.instanceName,
message:
"Instance name(leave empty if using port number):",
name: "instanceName",
type: "input",
},
])
).instanceName;
}
const answ = await inquirer.prompt([
{
default: options.connectionOptions.host,
@ -386,6 +399,7 @@ async function useInquirer(options: options): Promise<options> {
name: "port",
type: "input",
default: options.connectionOptions.port,
when: !options.connectionOptions.instanceName,
validate(value) {
const valid = !Number.isNaN(parseInt(value, 10));
return valid || "Please enter a valid port number";
@ -432,18 +446,6 @@ async function useInquirer(options: options): Promise<options> {
])
).schema;
}
if (options.connectionOptions.databaseType === "mssql") {
options.connectionOptions.instanceName = (
await inquirer.prompt([
{
default: options.connectionOptions.instanceName,
message: "Named instance:",
name: "instanceName",
type: "input",
},
])
).instanceName;
}
options.connectionOptions.port = parseInt(answ.port, 10);
options.connectionOptions.host = answ.host;
options.connectionOptions.user = answ.login;