[DONOT MERGE]fix: handle Enums correctly on Typescript data schema generation

packages/amplify-graphql-schema-generator/src/__tests__/__snapshots__/generate-ts-data-schema.test.ts.snap

@@ -85,12 +85,120 @@ export const schema = a.schema({
     \\"User\\": a.model({
         id: a.string().required(),
         name: a.string(),
-        status: a.enum([
-            \\"ACTIVE\\",
-            \\"INACTIVE\\"
-        ])
+        status: a.ref(\\"UserStatus\\")
     }).identifier([
         \\"id\\"
+    ]),
+    UserStatus: a.enum([
+        \\"ACTIVE\\",
+        \\"INACTIVE\\"
+    ])
+});
+"
+`;
+
+exports[`Type name conversions generates enums for models in mysql 1`] = `
+"/* eslint-disable */
+/* THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. */
+import { a } from \\"@aws-amplify/data-schema\\";
+
+export const schema = a.schema({
+    \\"User\\": a.model({
+        id: a.string().required(),
+        name: a.string(),
+        status: a.ref(\\"UserStatus\\").required()
+    }).identifier([
+        \\"id\\"
+    ]),
+    \\"Test\\": a.model({
+        id: a.string().required(),
+        name: a.string(),
+        age: a.ref(\\"TestAge\\").required()
+    }).identifier([
+        \\"id\\"
+    ]),
+    UserStatus: a.enum([
+        \\"ACTIVE\\",
+        \\"INACTIVE\\"
+    ]),
+    TestAge: a.enum([
+        \\"Above18\\",
+        \\"Below18\\"
+    ])
+});
+"
+`;
+
+exports[`Type name conversions generates required  and null enums correctly in the same model 1`] = `
+"/* eslint-disable */
+/* THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. */
+import { a } from \\"@aws-amplify/data-schema\\";
+
+export const schema = a.schema({
+    \\"User\\": a.model({
+        id: a.string().required(),
+        name: a.string(),
+        statsu1: a.ref(\\"UserStatus1\\"),
+        status: a.ref(\\"UserStatus\\").required()
+    }).identifier([
+        \\"id\\"
+    ]),
+    UserStatus1: a.enum([
+        \\"ACTIVE\\",
+        \\"INACTIVE\\"
+    ]),
+    UserStatus: a.enum([
+        \\"ACTIVE\\",
+        \\"INACTIVE\\"
+    ])
+});
+"
+`;
+
+exports[`Type name conversions generates required enums correctly 1`] = `
+"/* eslint-disable */
+/* THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. */
+import { a } from \\"@aws-amplify/data-schema\\";
+
+export const schema = a.schema({
+    \\"User\\": a.model({
+        id: a.string().required(),
+        name: a.string(),
+        status: a.ref(\\"UserStatus\\").required()
+    }).identifier([
+        \\"id\\"
+    ]),
+    UserStatus: a.enum([
+        \\"ACTIVE\\",
+        \\"INACTIVE\\"
+    ])
+});
+"
+`;
+
+exports[`Type name conversions generates single enum referenced for two different models 1`] = `
+"/* eslint-disable */
+/* THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. */
+import { a } from \\"@aws-amplify/data-schema\\";
+
+export const schema = a.schema({
+    \\"User\\": a.model({
+        id: a.string().required(),
+        name: a.string(),
+        status: a.ref(\\"UserStatus\\").required()
+    }).identifier([
+        \\"id\\"
+    ]),
+    \\"Test\\": a.model({
+        id: a.string().required(),
+        name: a.string(),
+        status: a.ref(\\"UserStatus\\").required()
+    }).identifier([
+        \\"id\\"
+    ]),
+    UserStatus: a.enum([
+        \\"ACTIVE\\",
+        \\"INACTIVE\\"
     ])
 });
 "

packages/amplify-graphql-schema-generator/src/__tests__/generate-ts-data-schema.test.ts

@@ -177,6 +177,77 @@ describe('Type name conversions', () => {
     expect(graphqlSchema).toMatchSnapshot();
   });
 
+  it('generates required enums correctly', () => {
+    const dbschema = new Schema(new Engine('Postgres'));
+    const model = new Model('User');
+    model.addField(new Field('id', { kind: 'NonNull', type: { kind: 'Scalar', name: 'String' } }));
+    model.addField(new Field('name', { kind: 'Scalar', name: 'String' }));
+    model.addField(new Field('status', { kind: 'NonNull', type: { kind: 'Enum', name: 'UserStatus', values: ['ACTIVE', 'INACTIVE'] } }));
+    model.setPrimaryKey(['id']);
+    dbschema.addModel(model);
+
+    const graphqlSchema = generateTypescriptDataSchema(dbschema);
+    expect(graphqlSchema).toMatchSnapshot();
+  });
+
+  it('generates required  and null enums correctly in the same model', () => {
+    const dbschema = new Schema(new Engine('Postgres'));
+    const model = new Model('User');
+    model.addField(new Field('id', { kind: 'NonNull', type: { kind: 'Scalar', name: 'String' } }));
+    model.addField(new Field('name', { kind: 'Scalar', name: 'String' }));
+    model.addField(new Field('statsu1', { kind: 'Enum', name: 'UserStatus1', values: ['ACTIVE', 'INACTIVE'] }));
+    model.addField(new Field('status', { kind: 'NonNull', type: { kind: 'Enum', name: 'UserStatus', values: ['ACTIVE', 'INACTIVE'] } }));
+    model.setPrimaryKey(['id']);
+    dbschema.addModel(model);
+
+    const graphqlSchema = generateTypescriptDataSchema(dbschema);
+    expect(graphqlSchema).toMatchSnapshot();
+  });
+
+  it('generates single enum referenced for two different models', () => {
+    const dbschema = new Schema(new Engine('Postgres'));
+    const modelUser = new Model('User');
+    const modelTest = new Model('Test');
+    modelUser.addField(new Field('id', { kind: 'NonNull', type: { kind: 'Scalar', name: 'String' } }));
+    modelUser.addField(new Field('name', { kind: 'Scalar', name: 'String' }));
+    modelUser.addField(
+      new Field('status', { kind: 'NonNull', type: { kind: 'Enum', name: 'UserStatus', values: ['ACTIVE', 'INACTIVE'] } }),
+    );
+    modelUser.setPrimaryKey(['id']);
+    dbschema.addModel(modelUser);
+    modelTest.addField(new Field('id', { kind: 'NonNull', type: { kind: 'Scalar', name: 'String' } }));
+    modelTest.addField(new Field('name', { kind: 'Scalar', name: 'String' }));
+    modelTest.addField(
+      new Field('status', { kind: 'NonNull', type: { kind: 'Enum', name: 'UserStatus', values: ['ACTIVE', 'INACTIVE'] } }),
+    );
+    modelTest.setPrimaryKey(['id']);
+    dbschema.addModel(modelTest);
+
+    const graphqlSchema = generateTypescriptDataSchema(dbschema);
+    expect(graphqlSchema).toMatchSnapshot();
+  });
+
+  it('generates enums for models in mysql', () => {
+    const dbschema = new Schema(new Engine('MySQL'));
+    const modelUser = new Model('User');
+    const modelTest = new Model('Test');
+    modelUser.addField(new Field('id', { kind: 'NonNull', type: { kind: 'Scalar', name: 'String' } }));
+    modelUser.addField(new Field('name', { kind: 'Scalar', name: 'String' }));
+    modelUser.addField(
+      new Field('status', { kind: 'NonNull', type: { kind: 'Enum', name: 'userStatus', values: ['ACTIVE', 'INACTIVE'] } }),
+    );
+    modelUser.setPrimaryKey(['id']);
+    dbschema.addModel(modelUser);
+    modelTest.addField(new Field('id', { kind: 'NonNull', type: { kind: 'Scalar', name: 'String' } }));
+    modelTest.addField(new Field('name', { kind: 'Scalar', name: 'String' }));
+    modelTest.addField(new Field('age', { kind: 'NonNull', type: { kind: 'Enum', name: 'TestAge', values: ['Above18', 'Below18'] } }));
+    modelTest.setPrimaryKey(['id']);
+    dbschema.addModel(modelTest);
+
+    const graphqlSchema = generateTypescriptDataSchema(dbschema);
+    expect(graphqlSchema).toMatchSnapshot();
+  });
+
   it('schema with database config secret and vpc should generate typescript data schema with configure', () => {
     const dbschema = new Schema(new Engine('MySQL'));
     let model = new Model('User');

packages/amplify-graphql-schema-generator/src/__tests__/mysql-string-datasource-adapter.test.ts

@@ -67,7 +67,7 @@ describe('testStringDataSourceAdapter', () => {
     });
     expect(adapter.mapDataType('enum', true, 'table', 'field', 'enum("OPEN","CLOSED")')).toEqual({
       kind: 'Enum',
-      name: 'table_field',
+      name: 'TableField',
       values: ['OPEN', 'CLOSED'],
     });
     expect(adapter.mapDataType('bool', true, 'table', 'field', 'varchar(50)')).toEqual({

packages/amplify-graphql-schema-generator/src/datasource-adapter/mysql-string-datasource-adapter.ts

@@ -1,3 +1,4 @@
+import { toPascalCase } from 'graphql-transformer-common';
 import { EnumType, Field, FieldDataType, FieldType, Index } from '../schema-representation';
 import { StringDataSourceAdapter, EmptySchemaError, InvalidSchemaError } from './string-datasource-adapter';
 
@@ -279,12 +280,12 @@ export class MySQLStringDataSourceAdapter extends StringDataSourceAdapter {
     return value.match(regex).map((a) => a.slice(1, -1));
   }
 
-  private generateEnumName(tableName: string, fieldName: string) {
-    const enumNamePrefix = [tableName, fieldName].join('_');
+  private generateEnumName(tableName: string, fieldName: string): string {
+    const enumNamePrefix = toPascalCase([tableName, fieldName]);
     let enumName = enumNamePrefix;
     let counter = 0;
     while (this.enums.has(enumName)) {
-      enumName = [enumNamePrefix, counter.toString()].join('_');
+      enumName = toPascalCase([enumNamePrefix, counter.toString()]);
       counter++;
     }
     return enumName;

packages/amplify-graphql-schema-generator/src/datasource-adapter/pg-string-datasource-adapter.ts

@@ -1,5 +1,6 @@
 import { EnumType, Field, FieldDataType, FieldType, Index } from '../schema-representation';
 import { StringDataSourceAdapter, EmptySchemaError, InvalidSchemaError } from './string-datasource-adapter';
+import { toPascalCase } from 'graphql-transformer-common';
 
 export interface PostgresIndex {
   tableName: string;
@@ -147,12 +148,18 @@ export class PostgresStringDataSourceAdapter extends StringDataSourceAdapter {
     return tableIndexes;
   }
 
+  private generateEnumName(tableName: string, fieldName: string): string {
+    return toPascalCase([tableName, fieldName]);
+  }
+
   protected setEnums(parsedSchema: PostgresSchema): void {
     this.enums = new Map<string, EnumType>();
     parsedSchema
       .filter(({ enum_name }) => !!enum_name)
       .forEach((row) => {
-        const enumName = row.enum_name;
+        const tableName = row.table_name;
+        const columnName = row.column_name;
+        const enumName = this.generateEnumName(tableName, columnName);
         const enumValues = row.enum_values.substring(1, row.enum_values.length - 1).split(',');
         const enumType: EnumType = {
           kind: 'Enum',
@@ -262,20 +269,19 @@ export class PostgresStringDataSourceAdapter extends StringDataSourceAdapter {
         fieldDatatype = 'AWSIPAddress';
         break;
       default:
-        if (this.enums.has(columntype)) {
+        if (this.enums.has(this.generateEnumName(tableName, fieldName))) {
           fieldDatatype = 'ENUM';
         }
         break;
     }
 
     let result: FieldType;
     if (fieldDatatype === 'ENUM') {
-      const enumName = this.getEnumName(columntype);
-      const enumRef = this.enums.get(columntype);
+      const enumRef = this.enums.get(this.generateEnumName(tableName, fieldName));
       result = {
         kind: 'Enum',
         values: enumRef.values,
-        name: enumName,
+        name: enumRef.name,
       };
     } else {
       result = {