Merge pull request #23 from MattGson/fix/empty-constraints-crash

fix(introspect): fixes crash on empty contraints list
MattGson · Sep 27, 2021 · 51557d0 · 51557d0
2 parents cd75965 + 8c23049
commit 51557d0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/cli/entry.ts b/src/cli/entry.ts
@@ -35,6 +35,7 @@ yargs(hideBin(process.argv))
                     user: { type: 'string', default: 'root' },
                     password: { type: 'string', default: '' },
                     database: { type: 'string', default: 'public' },
+                    schema: { type: 'string', default: 'public' },
                     outdir: { type: 'string', default: './gen' },
                     format: { choices: formats, default: Format.json },
                     prettierConfig: { type: 'string', description: 'Path to a prettierrc file' },
@@ -104,6 +105,7 @@ async function introspect(args: any) {
                 user: args.user,
                 password: args.password,
                 database: args.database,
+                schema: args.schema,
             },
         };
 
@@ -122,6 +124,7 @@ async function introspect(args: any) {
         await generate({ conn, outdir: GENERATED_DIR, format, prettierConfig, logLevel: logs, options });
     } catch (e) {
         logger.error(e);
+        logger.debug(e.stack);
         logger.info('Use: "relation -h" to see help');
         process.exit(1);
     }

diff --git a/src/introspection/introspect.ts b/src/introspection/introspect.ts
@@ -4,6 +4,7 @@ import { Introspection } from './introspection';
 import { PostgresIntrospection } from './postgres-introspection';
 import { MySQLIntrospection } from './mysql-introspection';
 import { TableSchemaBuilder } from './table-schema-builder';
+import { logger } from '../lib/logger';
 
 /**
  * Build schema from database connection
@@ -41,14 +42,25 @@ export const introspectSchema = async (params: {
         tables: {},
     };
 
+    logger.debug(`Introspecting ${JSON.stringify(relationalSchema)}`);
+
     try {
         const tables = await DB.getSchemaTables();
+        logger.debug(`Found ${tables.length} tables`);
         const enums = await DB.getEnumTypesForTables(tables);
+        logger.debug(`Introspected ${Object.entries(enums).length} enums`);
         const definitions = await DB.getTableTypes(tables, enums);
+        logger.debug(`Introspected ${Object.entries(definitions).length} tables`);
         const constraints = await DB.getTableConstraints(tables);
+        logger.debug(`Introspected ${Object.entries(constraints).length} constraints`);
+
         const forward = await DB.getForwardRelations(tables);
         const backwards = await DB.getBackwardRelations(tables);
 
+        logger.debug(
+            `Introspected ${Object.entries(forward).length + Object.entries(backwards).length} foreign key relations`,
+        );
+
         tables.forEach((table) => {
             relationalSchema.tables[table] = new TableSchemaBuilder(
                 table,
@@ -60,6 +72,8 @@ export const introspectSchema = async (params: {
             ).buildTableDefinition(options);
         });
 
+        logger.debug(`Built ${Object.entries(relationalSchema.tables).length} table schemas`);
+
         await knex.destroy();
     } catch (e) {
         await knex.destroy();

diff --git a/src/introspection/introspection.ts b/src/introspection/introspection.ts
@@ -36,7 +36,7 @@ export abstract class Introspection {
      */
     protected async query<T>(query: Knex.QueryBuilder<T>): Promise<T> {
         if (this.logLevel === LogLevel.debug) {
-            logger.debug('Executing query: ', query.toSQL());
+            logger.debug('Executing query: ', query.toSQL().sql);
         }
         return await query;
     }

diff --git a/src/introspection/table-schema-builder.ts b/src/introspection/table-schema-builder.ts
@@ -136,13 +136,13 @@ export class TableSchemaBuilder {
         });
 
         tableBackwardRelations.forEach((backwardRelation) => {
-            // get the other (forward) side of the relation to check cardinalityu
+            // get the other (forward) side of the relation to check cardinality
             const keys = this.constraints[backwardRelation.toTable];
-            const [forwardRelation] = this.forwardRelations[backwardRelation.toTable].filter(
+            const forwardRelation = this.forwardRelations[backwardRelation.toTable]?.find(
                 (r) => r.toTable === this.tableName,
             );
 
-            if (CardinalityResolver.isOneToOneRelation({ forwardRelation, keys })) {
+            if (forwardRelation && CardinalityResolver.isOneToOneRelation({ forwardRelation, keys })) {
                 uniqueRelations.push(backwardRelation);
             }
         });
@@ -204,7 +204,7 @@ export class TableSchemaBuilder {
      * Get the schema definition for a table
      */
     public buildTableDefinition(options?: { transitiveRelations: boolean }): TableSchemaDefinition {
-        const tableConstraints = this.constraints[this.tableName];
+        const tableConstraints = this.constraints[this.tableName] ?? [];
         const tableEnums = this.enums[this.tableName];
 
         const tableColumns = this.tableDefinitions[this.tableName];