stepzen 0.45.0-beta.2 → 0.45.0-beta.4

package/lib/commands/import/oracle.d.ts

@@ -2,65 +2,29 @@ import type { CommonImportOptions } from '../../generate/import-command.js';
 import type { DBIntrospectionOptions, OraclesqlImportOptions } from '../../generate/sql2sdl.js';
 import type { FlagsT } from '../../shared/types.js';
 import { ImportCommandBase } from '../../generate/import-command.js';
-type ParsedDsn = {
-    driver: string;
-    host: string;
-    user?: string;
-    password?: string;
-    port?: number;
-    db?: string;
-    schema?: string;
-};
-type ParserSuccessResult = {
-    success: true;
-    value: ParsedDsn;
-};
-type ParserErrorResult = {
-    success: false;
-    message: string;
-};
-export type ParserResult = ParserSuccessResult | ParserErrorResult;
-export type OracleSQLAnswers = Pick<OraclesqlImportOptions, 'host' | 'user' | 'password' | 'database' | 'schema' | 'linkTypes'>;
+export type OracleSQLAnswers = Pick<OraclesqlImportOptions, 'jdbcUrl' | 'schema' | 'linkTypes'>;
 export default class ImportOracle extends ImportCommandBase {
     get source(): "oracle";
     static description: string;
     static flags: {
-        'db-host': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        'db-user': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        'db-password': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        'db-database': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'db-schema': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'db-link-types': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'db-include': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'db-use-deprecated-2022-naming': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        dsn: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        jdbcUrl: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     protected import(commonOptions: CommonImportOptions): Promise<import("../../shared/types.js").ErrorOr<import("../../generate/helpers.js").IntrospectionServiceResponse>>;
     getImportOptionsFromFlags(flags: FlagsT<typeof ImportOracle>): {
-        host: string | undefined;
-        user: string | undefined;
-        password: string | undefined;
-        database: string | undefined;
         schema: string | undefined;
         linkTypes: boolean;
         include: "tables-only" | "views-only" | "tables-and-views" | undefined;
         introspectionOptions: DBIntrospectionOptions;
     };
     getImportOptionsFromDsn(possibleDsn: string): {
-        host: string;
-        user: string | undefined;
-        password: string | undefined;
-        database: string | undefined;
-        schema: string | undefined;
+        jdbcUrl: string;
     };
     getImportOptionsInteractively(defaults?: Partial<OracleSQLAnswers>): Promise<OracleSQLAnswers>;
-    parseDsn(dsn: string): ParserResult;
-    isValidJdbcOracleUrl(dsnString: string): {
-        status: boolean;
-        message?: string;
-    };
 }
-export {};
 //# sourceMappingURL=oracle.d.ts.map

package/lib/commands/import/oracle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../../src/commands/import/oracle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAA;AACzE,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAU,MAAM,EAAC,MAAM,uBAAuB,CAAA;AAQ1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAOlE,KAAK,SAAS,GAAG;IACf,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,IAAI,CAAA;IACb,KAAK,EAAE,SAAS,CAAA;CACjB,CAAA;AACD,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,KAAK,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AACD,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAAG,iBAAiB,CAAA;AAElE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,sBAAsB,EACtB,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,CACnE,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,IAAI,MAAM,aAET;IAED,MAAM,CAAC,WAAW,SAMkC;IAEpD,MAAM,CAAC,KAAK;;;;;;;;;MAUX;IAED,MAAM,CAAC,IAAI;;MASV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;IAmFzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC;;;;;;;;;;IAmB5D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;;;;;IAoBrC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACvC,OAAO,CAAC,gBAAgB,CAAC;IAgB5B,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAwDnC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC;CAqC7E"}
+{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../../src/commands/import/oracle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAA;AACzE,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAU,MAAM,EAAC,MAAM,uBAAuB,CAAA;AAQ1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAQlE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,sBAAsB,EACtB,SAAS,GAAG,QAAQ,GAAG,WAAW,CACnC,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,IAAI,MAAM,aAET;IAED,MAAM,CAAC,WAAW,SAMkC;IAEpD,MAAM,CAAC,KAAK;;;;;MAMX;IAED,MAAM,CAAC,IAAI;;MAQV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;IA0EzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC;;;;;;IAe5D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;IAerC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACvC,OAAO,CAAC,gBAAgB,CAAC;CAY7B"}

package/lib/commands/import/oracle.js

@@ -9,6 +9,7 @@ import { ImportQuestions } from '../../generate/questions.js';
 import { sql2sdl } from '../../generate/sql2sdl.js';
 import { readConfiguration } from '../../shared/configuration.js';
 import * as inquirer from '../../shared/inquirer.js';
+import { isValidJdbcUrl } from '../../shared/url-helpers.js';
 import { rewriteLocalhostToHostGateway } from '../../shared/utils.js';
 export default class ImportOracle extends ImportCommandBase {
     get source() {
@@ -22,35 +23,27 @@ export default class ImportOracle extends ImportCommandBase {
         ` queries and mutations into your GraphQL schema.`;
     static flags = {
         ...ImportCommandBase.flags,
-        'db-host': ImportFlags.dbHost(),
-        'db-user': ImportFlags.dbUser(),
-        'db-password': ImportFlags.dbPassword(),
-        'db-database': ImportFlags.dbDatabase(),
         'db-schema': ImportFlags.dbSchema(),
         'db-link-types': ImportFlags.dbLinkTypes(),
         'db-include': ImportFlags.dbInclude(),
         'db-use-deprecated-2022-naming': ImportFlags.dbUseDeprecatedNaming(),
     };
     static args = {
-        dsn: Args.string({
-            description: chalk `{italic (optional)} Data Source Name (DSN) of an Oracle database.` +
+        jdbcUrl: Args.string({
+            description: chalk `{italic (optional)} JDBC URL of an Oracle database.` +
                 chalk `\nExample: {bold 'jdbc:oracle:thin:user/password@//host:port/db?currentschema=schema'}` +
                 chalk `\n` +
-                chalk `\nFlags, such as {bold --db-host}, override the corresponding` +
-                chalk ` parts of the DSN (if both are provided).`,
+                chalk `\nThe {bold --db-schema} flag overrides the schema part of the JDBC URL (if both are provided).`,
         }),
     };
     async import(commonOptions) {
         const { args, flags } = await this.parse(ImportOracle);
         const nonInteractiveOptions = {
-            ...(args.dsn ? this.getImportOptionsFromDsn(args.dsn) : {}),
+            ...(args.jdbcUrl ? this.getImportOptionsFromDsn(args.jdbcUrl) : {}),
             ...this.getImportOptionsFromFlags(flags),
         };
         const requiredOptions = [
-            'host',
-            'user',
-            'password',
-            'database',
+            'jdbcUrl',
             'schema',
         ];
         const hasRequiredOptions = requiredOptions.every(option => nonInteractiveOptions[option] !== undefined);
@@ -67,7 +60,7 @@ export default class ImportOracle extends ImportCommandBase {
         }
         else {
             if (flags['non-interactive']) {
-                throw new CLIError('Please provide a Data Source Name (DSN) string for an Oracle database.' +
+                throw new CLIError('Please provide a JDBC URL for a Db2 database.' +
                     chalk `\nSee more help with {bold stepzen import oracle --help}`);
             }
             // no parameters given: start an interactive prompt
@@ -92,15 +85,11 @@ export default class ImportOracle extends ImportCommandBase {
             };
         }
         const configuration = await readConfiguration();
-        sql2sdlOptions.host = rewriteLocalhostToHostGateway(configuration, sql2sdlOptions.host);
+        sql2sdlOptions.jdbcUrl = rewriteLocalhostToHostGateway(configuration, sql2sdlOptions.jdbcUrl);
         return this.wrapInProgressAndTimeout(sql2sdl(sql2sdlOptions, configuration));
     }
     getImportOptionsFromFlags(flags) {
         const options = {
-            host: flags['db-host'],
-            user: flags['db-user'],
-            password: flags['db-password'],
-            database: flags['db-database'],
             schema: flags['db-schema'],
             linkTypes: flags['db-link-types'],
             include: flags['db-include'],
@@ -114,116 +103,23 @@ export default class ImportOracle extends ImportCommandBase {
         return pickBy(options, value => value !== undefined);
     }
     getImportOptionsFromDsn(possibleDsn) {
-        possibleDsn = possibleDsn.replace('jdbc:', '');
-        const parsed = this.parseDsn(possibleDsn);
-        if (parsed.success) {
-            const value = parsed.value;
+        // check the jdbc prefix
+        const parsed = isValidJdbcUrl(possibleDsn);
+        if (parsed.status) {
             const options = {
-                host: value.host + (value.port ? `:${value.port}` : ''),
-                user: value.user,
-                password: value.password,
-                database: value.db,
-                schema: value.schema,
+                jdbcUrl: possibleDsn,
             };
-            // Remove `undefined`-valued properties
-            return pickBy(options, value => value !== undefined);
+            return options;
         }
-        throw new CLIError(parsed.message);
+        throw new CLIError(parsed && parsed.message ? parsed.message : `Cannot parse DSN`);
     }
     async getImportOptionsInteractively(defaults = {}) {
         const questions = inquirer.overrideDefaults([
-            ImportQuestions.dbHost(),
-            ImportQuestions.dbUser(),
-            ImportQuestions.dbPassword(),
-            ImportQuestions.dbDatabase(),
-            ImportQuestions.dbSchema({ required: true }),
+            ImportQuestions.jdbcUrl(),
+            ImportQuestions.dbSchema({ dbDriver: 'oracle', required: false }),
             ImportQuestions.dbLinkTypes(),
         ], defaults);
         return inquirer.prompt(`import-${this.source}`, questions);
     }
-    parseDsn(dsn) {
-        const isValidDsn = this.isValidJdbcOracleUrl(dsn);
-        // No jdbc: prefix in the input
-        if (isValidDsn.status) {
-            const parsedDsn = { driver: 'jdbc:oracle:thin' };
-            const [mainDsn, queryParams] = dsn.split('?');
-            // Remove the 'oracle:thin:' prefix since the input doesn't have jdbc: at the front
-            const urlWithoutPrefix = mainDsn.replace(/^oracle:thin:/i, '');
-            if (urlWithoutPrefix.includes('@')) {
-                const [userInfo, hostInfo] = urlWithoutPrefix.split('@//');
-                // Extract user and password from userInfo, handling optional quotes around the password
-                const userPasswordRegex = /([^/]+)\/("?[^"]+"?)/;
-                const matches = userInfo.match(userPasswordRegex);
-                if (matches) {
-                    parsedDsn.user = matches[1]; // Extracted user
-                    parsedDsn.password = matches[2].replaceAll('"', ''); // Extracted password, removing quotes if present
-                }
-                // Extract host, port, and database from hostInfo
-                const separateHost = hostInfo.split('/');
-                const hostPort = separateHost[0].split(':');
-                parsedDsn.host = hostPort[0]; // Hostname
-                parsedDsn.port = Number.parseInt(hostPort[1], 10); // Port number
-                parsedDsn.db = separateHost[1]; // Database name
-            }
-            else {
-                // Handle URL format with parameters
-                const [hostInfo, dbInfo] = urlWithoutPrefix.split('/');
-                const [host, port] = hostInfo.split(':');
-                parsedDsn.host = host; // Hostname
-                parsedDsn.port = Number.parseInt(port, 10); // Port number
-                parsedDsn.db = dbInfo; // Database name
-            }
-            // Parse query params (if any)
-            if (queryParams) {
-                const params = new URLSearchParams(queryParams);
-                parsedDsn.user = params.get('user') || parsedDsn.user;
-                parsedDsn.password = params.get('password') || parsedDsn.password;
-                parsedDsn.schema = params.get('currentschema') || parsedDsn.schema;
-            }
-            return { success: true, value: parsedDsn };
-        }
-        return {
-            success: false,
-            message: isValidDsn.message || 'Cannot parse DSN',
-        };
-    }
-    isValidJdbcOracleUrl(dsnString) {
-        const patterns = [
-            /^oracle:thin:(\w+\/)?[^\s@]+@\/\/[\w.-]+:\d+\/[\w-]+(\?currentschema=[\w-]+)?$/, // With user/password in the path
-            /^oracle:thin:@[\w.-]+:\d+\/\w+(\?user=\w+&password=[^&]+(&currentschema=\w+)?)?$/, // With user/password as query parameters
-        ];
-        // Check if the DSN string matches any of the patterns
-        const isValid = patterns.some(pattern => pattern.test(dsnString));
-        if (!isValid) {
-            let message;
-            if (dsnString.startsWith('oracle:thin:') === false) {
-                message = `Missing 'oracle:thin:' prefix`;
-            }
-            else {
-                const urlWithoutPrefix = dsnString.replace(/^oracle:thin:/i, '');
-                if (urlWithoutPrefix.includes('@')) {
-                    const [userInfo, hostInfo] = urlWithoutPrefix.split('@//');
-                    if (!userInfo.includes('/')) {
-                        message = `User or password missing or improperly formatted in the provided URL`;
-                    }
-                    else if (!hostInfo.startsWith('//')) {
-                        message = `Host section must start with '//' after '@'`;
-                    }
-                    else if (!hostInfo.includes(':')) {
-                        message = `Host or port missing in the provided URL`;
-                    }
-                    else if (!hostInfo.includes('/')) {
-                        message = `Database name missing in the provided URL`;
-                    }
-                }
-                else {
-                    // Handle the format without user/password before @
-                    message = `Host section must start with '@' or '@//'`;
-                }
-            }
-            return { status: false, message };
-        }
-        return { status: true };
-    }
 }
 //# sourceMappingURL=oracle.js.map

package/lib/commands/import/oracle.js.map

@@ -1 +1 @@
-{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../src/commands/import/oracle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../src/commands/import/oracle.ts"],"names":[],"mappings":"AAAA,iCAAiC;AASjC,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAA;AAChC,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAC,OAAO,EAAC,MAAM,2BAA2B,CAAA;AACjD,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAC,6BAA6B,EAAC,MAAM,uBAAuB,CAAA;AAOnE,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,IAAI,MAAM;QACR,OAAO,QAAiB,CAAA;IAC1B,CAAC;IAED,MAAM,CAAC,WAAW,GAChB,iEAAiE;QACjE,IAAI;QACJ,KAAK,CAAA,6DAA6D;QAClE,iEAAiE;QACjE,kEAAkE;QAClE,kDAAkD,CAAA;IAEpD,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,iBAAiB,CAAC,KAAK;QAC1B,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;QACnC,eAAe,EAAE,WAAW,CAAC,WAAW,EAAE;QAC1C,YAAY,EAAE,WAAW,CAAC,SAAS,EAAE;QACrC,+BAA+B,EAAE,WAAW,CAAC,qBAAqB,EAAE;KACrE,CAAA;IAED,MAAM,CAAC,IAAI,GAAG;QACZ,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;YACnB,WAAW,EACT,KAAK,CAAA,qDAAqD;gBAC1D,KAAK,CAAA,wFAAwF;gBAC7F,KAAK,CAAA,IAAI;gBACT,KAAK,CAAA,iGAAiG;SACzG,CAAC;KACH,CAAA;IAES,KAAK,CAAC,MAAM,CAAC,aAAkC;QACvD,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QACpD,MAAM,qBAAqB,GAAG;YAC5B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACnE,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;SACzC,CAAA;QACD,MAAM,eAAe,GAA8C;YACjE,SAAS;YACT,QAAQ;SACT,CAAA;QACD,MAAM,kBAAkB,GAAG,eAAe,CAAC,KAAK,CAC9C,MAAM,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,SAAS,CACtD,CAAA;QACD,IAAI,cAAsC,CAAA;QAC1C,IAAI,kBAAkB,EAAE,CAAC;YACvB,oFAAoF;YACpF,MAAM,0BAA0B,GAC9B,qBACwD,CAAA;YAE1D,wBAAwB;YACxB,cAAc,GAAG;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,aAAa;gBAChB,GAAG,0BAA0B;aAC9B,CAAA;QACH,CAAC;aAAM,CAAC;YACN,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,QAAQ,CAChB,+CAA+C;oBAC7C,KAAK,CAAA,0DAA0D,CAClE,CAAA;YACH,CAAC;YAED,mDAAmD;YACnD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBAClB,IAAI,CAAC,GAAG,EAAE,CAAA;gBACV,IAAI,CAAC,GAAG,CACN,KAAK,CAAA,iCAAiC;oBACpC,KAAK,CAAC,GAAG,CACP,6DAA6D;wBAC3D,iEAAiE;wBACjE,iBAAiB,CACpB,CACJ,CAAA;gBACD,IAAI,CAAC,GAAG,EAAE,CAAA;YACZ,CAAC;YAED,2EAA2E;YAC3E,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CACjE,qBAAqB,CACtB,CAAA;YAED,cAAc,GAAG;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,aAAa;gBAChB,oEAAoE;gBACpE,sEAAsE;gBACtE,0DAA0D;gBAC1D,GAAG,qBAAqB;gBACxB,GAAG,kBAAkB;aACtB,CAAA;QACH,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,iBAAiB,EAAE,CAAA;QAE/C,cAAc,CAAC,OAAO,GAAG,6BAA6B,CACpD,aAAa,EACb,cAAc,CAAC,OAAO,CACvB,CAAA;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAA;IAC9E,CAAC;IAED,yBAAyB,CAAC,KAAkC;QAC1D,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC;YAC1B,SAAS,EAAE,KAAK,CAAC,eAAe,CAAC;YACjC,OAAO,EAAE,KAAK,CAAC,YAAY,CAAsC;YACjE,oBAAoB,EAAE;gBACpB,iEAAiE;gBACjE,uDAAuD;gBACvD,MAAM,EAAE,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;aACvC;SAC5B,CAAA;QACD,uCAAuC;QACvC,OAAO,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,SAAS,CAAmB,CAAA;IACxE,CAAC;IAED,uBAAuB,CAAC,WAAmB;QACzC,wBAAwB;QACxB,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAC,CAAA;QAC1C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG;gBACd,OAAO,EAAE,WAAW;aACrB,CAAA;YACD,OAAO,OAAO,CAAA;QAChB,CAAC;QAED,MAAM,IAAI,QAAQ,CAChB,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAC/D,CAAA;IACH,CAAC;IAED,KAAK,CAAC,6BAA6B,CACjC,WAAsC,EAAE;QAExC,MAAM,SAAS,GAAG,QAAQ,CAAC,gBAAgB,CACzC;YACE,eAAe,CAAC,OAAO,EAAE;YACzB,eAAe,CAAC,QAAQ,CAAC,EAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC;YAC/D,eAAe,CAAC,WAAW,EAAE;SAC9B,EACD,QAAQ,CACT,CAAA;QAED,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,CAAA;IAC5D,CAAC"}

package/lib/generate/flags.d.ts

@@ -6,6 +6,7 @@ export declare const ImportFlags: {
     header: () => import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
     headerParam: () => import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
     dbHost: () => import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    jdbcUrl: () => import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     dbUser: () => import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     dbPassword: () => import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     dbDatabase: () => import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/lib/generate/flags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../../src/generate/flags.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,WAAW;;;;;;;;sBAoDL;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC;;;;CAoCpC,CAAA"}
+{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../../src/generate/flags.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,WAAW;;;;;;;;;sBAwDL;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC;;;;CAoCpC,CAAA"}

package/lib/generate/flags.js

@@ -33,6 +33,9 @@ export const ImportFlags = {
     dbHost: () => Flags.string({
         description: 'Database host and optional port (as HOST[:PORT])',
     }),
+    jdbcUrl: () => Flags.string({
+        description: 'Full JDBC URL',
+    }),
     dbUser: () => Flags.string({
         description: 'Database user name',
     }),

package/lib/generate/flags.js.map

@@ -1 +1 @@
-{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/generate/flags.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM,EAAE,GAAG,EAAE,CACX,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,qDAAqD;KACnE,CAAC;IACJ,MAAM,EAAE,GAAG,EAAE,CACX,KAAK,CAAC,MAAM,CAAC;QACX,IAAI,EAAE,GAAG;QACT,WAAW,EACT,oCAAoC;YACpC,IAAI;YACJ,YAAY;YACZ,4DAA4D;YAC5D,UAAU,KAAK,CAAC,IAAI,CAAC,2CAA2C,CAAC,EAAE;QACrE,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,IAAI;KACxB,CAAC;IACJ,WAAW,EAAE,GAAG,EAAE,CAChB,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EACT,0CAA0C;YAC1C,8BAA8B,KAAK,CAAC,IAAI,CACtC,cAAc,CACf,yBAAyB;YAC1B,6CAA6C,KAAK,CAAC,IAAI,CACrD,YAAY,CACb,uEAAuE;YACxE,IAAI;YACJ,YAAY;YACZ,4DAA4D;YAC5D,qDAAqD;YACrD,6CAA6C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG;QACvE,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,IAAI;KACxB,CAAC;IAEJ,MAAM,EAAE,GAAG,EAAE,CACX,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,kDAAkD;KAChE,CAAC;IACJ,MAAM,EAAE,GAAG,EAAE,CACX,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,oBAAoB;KAClC,CAAC;IACJ,UAAU,EAAE,GAAG,EAAE,CACf,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,mBAAmB;KACjC,CAAC;IACJ,UAAU,EAAE,GAAG,EAAE,CACf,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,4BAA4B;KAC1C,CAAC;IACJ,QAAQ,EAAE,CAAC,OAA2B,EAAE,EAAE,EAAE,CAC1C,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,mDACX,IAAI,CAAC,OAAO,IAAI,QAClB,GAAG;KACJ,CAAC;IACJ,WAAW,EAAE,GAAG,EAAE,CAChB,KAAK,CAAC,OAAO,CAAC;QACZ,WAAW,EACT,mCAAmC;YACnC,gDAAgD;YAChD,IAAI,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,EAAE;KACvE,CAAC;IACJ,SAAS,EAAE,GAAG,EAAE,CACd,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EACT,qCAAqC;YACrC,6DAA6D;QAC/D,OAAO,EAAE,CAAC,aAAa,EAAE,YAAY,EAAE,kBAAkB,CAAC;KAC3D,CAAC;IACJ,qBAAqB,EAAE,GAAG,EAAE,CAC1B,KAAK,CAAC,OAAO,CAAC;QACZ,WAAW,EACT,KAAK,CAAA,+DAA+D;YACpE,KAAK,CAAA,4BAA4B;YACjC,KAAK,CAAA,kEAAkE;YACvE,KAAK,CAAA,kBAAkB;YACvB,KAAK,CAAA,kEAAkE;YACvE,KAAK,CAAA,kCAAkC;YACvC,KAAK,CAAA,IAAI;YACT,KAAK,CAAA,gEAAgE;YACrE,KAAK,CAAA,+DAA+D;YACpE,KAAK,CAAA,4BAA4B;YACjC,KAAK,CAAA,+DAA+D;YACpE,KAAK,CAAA,+BAA+B;KACvC,CAAC;CACL,CAAA"}
+{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/generate/flags.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM,EAAE,GAAG,EAAE,CACX,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,qDAAqD;KACnE,CAAC;IACJ,MAAM,EAAE,GAAG,EAAE,CACX,KAAK,CAAC,MAAM,CAAC;QACX,IAAI,EAAE,GAAG;QACT,WAAW,EACT,oCAAoC;YACpC,IAAI;YACJ,YAAY;YACZ,4DAA4D;YAC5D,UAAU,KAAK,CAAC,IAAI,CAAC,2CAA2C,CAAC,EAAE;QACrE,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,IAAI;KACxB,CAAC;IACJ,WAAW,EAAE,GAAG,EAAE,CAChB,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EACT,0CAA0C;YAC1C,8BAA8B,KAAK,CAAC,IAAI,CACtC,cAAc,CACf,yBAAyB;YAC1B,6CAA6C,KAAK,CAAC,IAAI,CACrD,YAAY,CACb,uEAAuE;YACxE,IAAI;YACJ,YAAY;YACZ,4DAA4D;YAC5D,qDAAqD;YACrD,6CAA6C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG;QACvE,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,IAAI;KACxB,CAAC;IAEJ,MAAM,EAAE,GAAG,EAAE,CACX,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,kDAAkD;KAChE,CAAC;IACJ,OAAO,EAAE,GAAG,EAAE,CACZ,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,eAAe;KAC7B,CAAC;IACJ,MAAM,EAAE,GAAG,EAAE,CACX,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,oBAAoB;KAClC,CAAC;IACJ,UAAU,EAAE,GAAG,EAAE,CACf,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,mBAAmB;KACjC,CAAC;IACJ,UAAU,EAAE,GAAG,EAAE,CACf,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,4BAA4B;KAC1C,CAAC;IACJ,QAAQ,EAAE,CAAC,OAA2B,EAAE,EAAE,EAAE,CAC1C,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EAAE,mDACX,IAAI,CAAC,OAAO,IAAI,QAClB,GAAG;KACJ,CAAC;IACJ,WAAW,EAAE,GAAG,EAAE,CAChB,KAAK,CAAC,OAAO,CAAC;QACZ,WAAW,EACT,mCAAmC;YACnC,gDAAgD;YAChD,IAAI,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,EAAE;KACvE,CAAC;IACJ,SAAS,EAAE,GAAG,EAAE,CACd,KAAK,CAAC,MAAM,CAAC;QACX,WAAW,EACT,qCAAqC;YACrC,6DAA6D;QAC/D,OAAO,EAAE,CAAC,aAAa,EAAE,YAAY,EAAE,kBAAkB,CAAC;KAC3D,CAAC;IACJ,qBAAqB,EAAE,GAAG,EAAE,CAC1B,KAAK,CAAC,OAAO,CAAC;QACZ,WAAW,EACT,KAAK,CAAA,+DAA+D;YACpE,KAAK,CAAA,4BAA4B;YACjC,KAAK,CAAA,kEAAkE;YACvE,KAAK,CAAA,kBAAkB;YACvB,KAAK,CAAA,kEAAkE;YACvE,KAAK,CAAA,kCAAkC;YACvC,KAAK,CAAA,IAAI;YACT,KAAK,CAAA,gEAAgE;YACrE,KAAK,CAAA,+DAA+D;YACpE,KAAK,CAAA,4BAA4B;YACjC,KAAK,CAAA,+DAA+D;YACpE,KAAK,CAAA,+BAA+B;KACvC,CAAC;CACL,CAAA"}

package/lib/generate/questions.d.ts

@@ -6,6 +6,9 @@ export declare const ImportQuestions: {
     prefix: () => DistinctQuestion<{
         typePrefix?: string | undefined;
     }>;
+    jdbcUrl: () => DistinctQuestion<{
+        jdbcUrl?: string | undefined;
+    }>;
     dbHost: () => DistinctQuestion<{
         host: string;
     }>;
@@ -20,6 +23,7 @@ export declare const ImportQuestions: {
     }>;
     dbSchema: (opts?: {
         required?: boolean;
+        dbDriver?: string;
     }) => DistinctQuestion<{
         schema?: string | undefined;
     }>;

package/lib/generate/questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../src/generate/questions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAA;AAM9C;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;cAaK,MAAM;;;cAMN,MAAM;;;kBAMF,MAAM;;;kBAON,MAAM;;sBACxB;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC;;;;mBAkBD,OAAO;;;uBAOH,OAAO;;CAChD,CAAA"}
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../src/generate/questions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAA;AAM9C;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;cAqBK,MAAM;;;cAMN,MAAM;;;kBAMF,MAAM;;;kBAON,MAAM;;sBACxB;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAC;;;;mBA6BpB,OAAO;;;uBAOH,OAAO;;CAChD,CAAA"}

package/lib/generate/questions.js

@@ -1,6 +1,6 @@
 // Copyright IBM Corp. 2020, 2024
 import chalk from 'chalk';
-import { parseHost } from '../shared/url-helpers.js';
+import { isValidJdbcUrl, parseHost } from '../shared/url-helpers.js';
 /**
  * A helper to share interactive questions between several import commands.
  */
@@ -9,6 +9,12 @@ export const ImportQuestions = {
         name: 'typePrefix',
         message: 'Prefix to add to all generated type names (leave blank for none)',
     }),
+    jdbcUrl: () => ({
+        name: 'jdbcUrl',
+        message: 'What is your JDBC Url?',
+        validate: input => isValidJdbcUrl(input).status ||
+            `Could not parse "${input}" as a JDBC Url.`,
+    }),
     dbHost: () => ({
         name: 'host',
         message: 'What is your host? (and optional port as host:port)',
@@ -31,10 +37,23 @@ export const ImportQuestions = {
     }),
     dbSchema: (opts = {}) => ({
         name: 'schema',
-        message: `What is your database schema${opts.required ? '' : ' (leave blank to use defaults)'}?`,
-        validate: opts.required
-            ? input => input.trim() !== '' || 'Schema must not be empty'
-            : undefined,
+        message() {
+            const { dbDriver, required } = opts;
+            const isDb2OrOracle = dbDriver === 'db2' || dbDriver === 'oracle';
+            let message;
+            message = isDb2OrOracle
+                ? `What is your schema (Optional)`
+                : `What is your database schema`;
+            // Additional info for DB2 or Oracle
+            if (isDb2OrOracle && !required) {
+                message +=
+                    ' If schema is not provided, it will take the default schema from JDBC URL connection.';
+            }
+            else if (!isDb2OrOracle && !required) {
+                message += ' (leave blank to use defaults)';
+            }
+            return message;
+        },
     }),
     dbLinkTypes: () => ({
         name: 'linkTypes',

package/lib/generate/questions.js.map

@@ -1 +1 @@
-{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../src/generate/questions.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAIjC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAA;AAElD;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,YAAY;QAClB,OAAO,EACL,kEAAkE;KACzB,CAAA;IAC/C,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,qDAAqD;QAC9D,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,IAAI,oBAAoB,KAAK,kBAAkB;KACrC,CAAA;IACxC,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,uBAAuB;QAChC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,4BAA4B;KAClC,CAAA;IACxC,UAAU,EAAE,GAAG,EAAE,CACf,CAAC;QACC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,uBAAuB;QAChC,IAAI,EAAE,UAAU;KACwB,CAAA;IAC5C,UAAU,EAAE,GAAG,EAAE,CACf,CAAC;QACC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,iCAAiC;KAClB,CAAA;IAC5C,QAAQ,EAAE,CAAC,OAA6B,EAAE,EAAE,EAAE,CAC5C,CAAC;QACC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,+BACP,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gCACvB,GAAG;QACH,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACrB,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,0BAA0B;YAC5D,CAAC,CAAC,SAAS;KAC0B,CAAA;IAC3C,WAAW,EAAE,GAAG,EAAE,CAChB,CAAC;QACC,IAAI,EAAE,WAAW;QACjB,OAAO,EACL,iFAAiF;YACjF,MAAM,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,EAAE;QACxE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KAC4B,CAAA;IAC9C,aAAa,EAAE,GAAG,EAAE,CAClB,CAAC;QACC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACgC,CAAA;CACnD,CAAA"}
+{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../src/generate/questions.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAIjC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAC,cAAc,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAA;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,YAAY;QAClB,OAAO,EACL,kEAAkE;KACzB,CAAA;IAC/C,OAAO,EAAE,GAAG,EAAE,CACZ,CAAC;QACC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,wBAAwB;QACjC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM;YAC5B,oBAAoB,KAAK,kBAAkB;KACL,CAAA;IAC5C,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,qDAAqD;QAC9D,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,IAAI,oBAAoB,KAAK,kBAAkB;KACrC,CAAA;IACxC,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,uBAAuB;QAChC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,4BAA4B;KAClC,CAAA;IACxC,UAAU,EAAE,GAAG,EAAE,CACf,CAAC;QACC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,uBAAuB;QAChC,IAAI,EAAE,UAAU;KACwB,CAAA;IAC5C,UAAU,EAAE,GAAG,EAAE,CACf,CAAC;QACC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,iCAAiC;KAClB,CAAA;IAC5C,QAAQ,EAAE,CAAC,OAAgD,EAAE,EAAE,EAAE,CAC/D,CAAC;QACC,IAAI,EAAE,QAAQ;QACd,OAAO;YACL,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAA;YACjC,MAAM,aAAa,GAAG,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,QAAQ,CAAA;YACjE,IAAI,OAAe,CAAA;YACnB,OAAO,GAAG,aAAa;gBACrB,CAAC,CAAC,gCAAgC;gBAClC,CAAC,CAAC,8BAA8B,CAAA;YAClC,oCAAoC;YACpC,IAAI,aAAa,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC/B,OAAO;oBACL,uFAAuF,CAAA;YAC3F,CAAC;iBAAM,IAAI,CAAC,aAAa,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACvC,OAAO,IAAI,gCAAgC,CAAA;YAC7C,CAAC;YAED,OAAO,OAAO,CAAA;QAChB,CAAC;KACsC,CAAA;IAC3C,WAAW,EAAE,GAAG,EAAE,CAChB,CAAC;QACC,IAAI,EAAE,WAAW;QACjB,OAAO,EACL,iFAAiF;YACjF,MAAM,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,EAAE;QACxE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KAC4B,CAAA;IAC9C,aAAa,EAAE,GAAG,EAAE,CAClB,CAAC;QACC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACgC,CAAA;CACnD,CAAA"}

package/lib/generate/sql2sdl.d.ts

@@ -22,10 +22,10 @@ export type PostgresqlImportOptions = CommonSqlImportOptions & {
     dbType: 'postgresql';
     schema?: string;
 };
-export type Db2sqlImportOptions = CommonSqlImportOptions & {
+export type Db2sqlImportOptions = Omit<CommonSqlImportOptions, 'host' | 'database' | 'user' | 'password'> & {
     dbType: 'db2';
     schema?: string;
-    sslConnection: boolean;
+    jdbcUrl: string;
 };
 export type SnowflakeImportOptions = Omit<CommonSqlImportOptions, 'host'> & {
     dbType: 'snowflake';
@@ -38,8 +38,14 @@ export type PrestoImportOptions = Omit<CommonSqlImportOptions, 'database'> & {
     catalog: string;
     schema: string;
 };
-export type OraclesqlImportOptions = CommonSqlImportOptions & {
+export type OraclesqlImportOptions = Omit<CommonSqlImportOptions, 'host' | 'database' | 'user' | 'password'> & {
     dbType: 'oracle';
+    jdbcUrl: string;
+    schema?: string;
+};
+export type JdbcParsedDsn = {
+    driver: string;
+    jdbcUrl: string;
     schema?: string;
 };
 export type SqlImportOptions = MysqlImportOptions | PostgresqlImportOptions | SnowflakeImportOptions | PrestoImportOptions | Db2sqlImportOptions | OraclesqlImportOptions;

package/lib/generate/sql2sdl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql2sdl.d.ts","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;AACrE,OAAO,KAAK,EAAC,4BAA4B,EAAC,MAAM,cAAc,CAAA;AAC9D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,qBAAqB,CAAA;AAc5D,MAAM,MAAM,MAAM,GACd,OAAO,GACP,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,KAAK,GACL,QAAQ,CAAA;AACZ,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,mBAAmB,GAAG;IACzD,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY,GAAG,kBAAkB,CAAA;IAC3D,oBAAoB,CAAC,EAAE,sBAAsB,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,GAAG;IACxD,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,sBAAsB,GAAG;IAC7D,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,sBAAsB,GAAG;IACzD,MAAM,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,GAAG;IAC1E,MAAM,EAAE,WAAW,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,GAAG;IAC3E,MAAM,EAAE,QAAQ,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG;IAC5D,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,gBAAgB,GACxB,kBAAkB,GAClB,uBAAuB,GACvB,sBAAsB,GACtB,mBAAmB,GACnB,mBAAmB,GACnB,sBAAsB,CAAA;AAE1B,eAAO,MAAM,OAAO,YACT,gBAAgB,iBACV,oBAAoB,KAClC,QAAQ,QAAQ,4BAA4B,CAAC,CAqK/C,CAAA"}
+{"version":3,"file":"sql2sdl.d.ts","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;AACrE,OAAO,KAAK,EAAC,4BAA4B,EAAC,MAAM,cAAc,CAAA;AAC9D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,qBAAqB,CAAA;AAc5D,MAAM,MAAM,MAAM,GACd,OAAO,GACP,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,KAAK,GACL,QAAQ,CAAA;AACZ,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,mBAAmB,GAAG;IACzD,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY,GAAG,kBAAkB,CAAA;IAC3D,oBAAoB,CAAC,EAAE,sBAAsB,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,GAAG;IACxD,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,sBAAsB,GAAG;IAC7D,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,sBAAsB,EACtB,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,UAAU,CAC1C,GAAG;IACF,MAAM,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,GAAG;IAC1E,MAAM,EAAE,WAAW,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,GAAG;IAC3E,MAAM,EAAE,QAAQ,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACvC,sBAAsB,EACtB,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,UAAU,CAC1C,GAAG;IACF,MAAM,EAAE,QAAQ,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,gBAAgB,GACxB,kBAAkB,GAClB,uBAAuB,GACvB,sBAAsB,GACtB,mBAAmB,GACnB,mBAAmB,GACnB,sBAAsB,CAAA;AAE1B,eAAO,MAAM,OAAO,YACT,gBAAgB,iBACV,oBAAoB,KAClC,QAAQ,QAAQ,4BAA4B,CAAC,CA6L/C,CAAA"}

package/lib/generate/sql2sdl.js

@@ -55,60 +55,73 @@ export const sql2sdl = async (options, configuration) => {
             { property: 'WAREHOUSE', value: options.warehouse },
         ];
     }
-    if (options.dbType === 'db2') {
-        driverProperties = [{ property: 'SSL', value: `${options.sslConnection}` }];
-    }
     // To prevent issues with configuration names in config.yaml and SDL,
     // consider the following: if you import two PostgreSQL databases under a single StepZen API,
     // each database will require a different configuration name in the config.yaml file.
     // This configuration name will be used in index.graphql, based on the folder name.
     const effectiveName = findNextAvailableSubfolder(options.source, options.name || options.dbType);
-    const hostDetails = options.dbType === 'snowflake'
+    const hostDetails = options.dbType === 'snowflake' ||
+        options.dbType === 'db2' ||
+        options.dbType === 'oracle'
         ? { host: '', port: undefined }
         : parseHost(options.host);
     return queryIntrospectionService(getDBIntrospectionUrl(configuration), {
-        operation: 'generateSDL',
+        operation: options.dbType === 'db2' || options.dbType === 'oracle'
+            ? 'getSDLFromDBJdbcUrl'
+            : 'generateSDL',
         variables: {
             driver: {
                 type: 'DBDriver!',
                 value: driver,
             },
-            host: {
-                type: 'String!',
-                value: hostDetails.host,
-            },
-            port: {
-                type: 'Int',
-                value: hostDetails.port === undefined
-                    ? null
-                    : Number.parseInt(hostDetails.port, 10),
-            },
-            ...(getFeatureFlag(ENABLE_PRESTO_IMPORT)
+            ...(options.dbType === 'db2' || options.dbType === 'oracle'
                 ? {
-                    database: {
-                        type: 'String',
-                        value: options.dbType === 'presto' ? null : options.database,
-                    },
-                    catalog: {
-                        type: 'String',
-                        value: options.dbType === 'presto' ? options.catalog : null,
+                    jdbcURL: {
+                        type: 'String!',
+                        value: options.jdbcUrl,
                     },
                 }
                 : {
-                    database: {
+                    host: {
+                        type: 'String!',
+                        value: hostDetails.host,
+                    },
+                    port: {
+                        type: 'Int',
+                        value: hostDetails.port === undefined
+                            ? null
+                            : Number.parseInt(hostDetails.port, 10),
+                    },
+                    ...(getFeatureFlag(ENABLE_PRESTO_IMPORT)
+                        ? {
+                            database: {
+                                type: 'String',
+                                value: options.dbType === 'presto' ? null : options.database,
+                            },
+                            catalog: {
+                                type: 'String',
+                                value: options.dbType === 'presto' ? options.catalog : null,
+                            },
+                        }
+                        : {
+                            database: {
+                                type: 'String!',
+                                value: options.database,
+                            },
+                        }),
+                    user: {
                         type: 'String!',
-                        value: options
-                            .database,
+                        value: options.user,
+                    },
+                    password: {
+                        type: 'String!',
+                        value: options.password,
+                    },
+                    driverProperties: {
+                        type: '[DriverPropertyInput!]',
+                        value: driverProperties,
                     },
                 }),
-            user: {
-                type: 'String!',
-                value: options.user,
-            },
-            password: {
-                type: 'String!',
-                value: options.password,
-            },
             onlyTypes: {
                 type: 'Boolean',
                 value: !options.linkTypes,
@@ -123,10 +136,6 @@ export const sql2sdl = async (options, configuration) => {
                     naming,
                 },
             },
-            driverProperties: {
-                type: '[DriverPropertyInput!]',
-                value: driverProperties,
-            },
             schema: {
                 type: 'String',
                 // The introspection service treats the schema value '' (empty string)
@@ -134,9 +143,15 @@ export const sql2sdl = async (options, configuration) => {
                 // the default, it needs to get a `null` schema value.
                 // However, when the user skips over the "schema" interactive question
                 // (by pressing <Enter>) the value of schema would be ''.
-                value: options.dbType === 'mysql' || options.schema === ''
-                    ? null
-                    : options.schema,
+                value: (() => {
+                    if (options.dbType === 'mysql' || options.schema === '') {
+                        return null;
+                    }
+                    if (options.dbType === 'oracle' || options.dbType === 'db2') {
+                        return options.schema === undefined ? '' : options.schema;
+                    }
+                    return options.schema;
+                })(),
             },
             configName: {
                 type: 'String!',

package/lib/generate/sql2sdl.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql2sdl.js","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sql2sdl.js","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"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"}