Merge pull request #169 from ProjectXero/fix/gh-168

fix: order columns alphabetically
ProjectXero · Mar 17, 2021 · a522cbd · a522cbd
2 parents 6cffc8f + 6ce8880
commit a522cbd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/generator/__tests__/__snapshots__/integration.test.ts.snap b/src/generator/__tests__/__snapshots__/integration.test.ts.snap
@@ -25,43 +25,43 @@ export const TestTableOrder$Types: Record<keyof TestTableOrder, string> = {
     subsequent_table_type: \\"test_table_standard\\"
 };
 export interface TestTableStandard<TJsonbTest = SerializableValueType> {
-    id: number;
     arr_test: string[] | null;
     domain_test: string | null;
-    enum_test: TestTypeEnum;
     enum_arr_test: TestTypeEnum[] | null;
+    enum_test: TestTypeEnum;
+    id: number;
     jsonb_test: MapToSerializable<TJsonbTest> | null;
 }
 export interface TestTableStandard$Insert<TJsonbTest = SerializableValueType> {
-    id?: number;
     arr_test?: string[] | null;
     domain_test?: string | null;
-    enum_test: TestTypeEnum;
     enum_arr_test?: TestTypeEnum[] | null;
+    enum_test: TestTypeEnum;
+    id?: number;
     jsonb_test?: MapToSerializable<TJsonbTest> | null;
 }
 export const TestTableStandard$Types: Record<keyof TestTableStandard, string> = {
-    id: \\"int4\\",
     arr_test: \\"text\\",
     domain_test: \\"text\\",
-    enum_test: \\"test_type_enum\\",
     enum_arr_test: \\"test_type_enum\\",
+    enum_test: \\"test_type_enum\\",
+    id: \\"int4\\",
     jsonb_test: \\"jsonb\\"
 };
 export interface TestTableTypes {
     id: string;
-    table_test: TestTableStandard | null;
     table_arr_test: TestTableStandard[];
+    table_test: TestTableStandard | null;
 }
 export interface TestTableTypes$Insert {
     id: string;
-    table_test?: TestTableStandard | null;
     table_arr_test?: TestTableStandard[];
+    table_test?: TestTableStandard | null;
 }
 export const TestTableTypes$Types: Record<keyof TestTableTypes, string> = {
     id: \\"uuid\\",
-    table_test: \\"test_table_standard\\",
-    table_arr_test: \\"test_table_standard\\"
+    table_arr_test: \\"test_table_standard\\",
+    table_test: \\"test_table_standard\\"
 };
 "
 `;
diff --git a/src/generator/database/SchemaInfo.ts b/src/generator/database/SchemaInfo.ts
@@ -88,7 +88,7 @@ export default class SchemaInfo {
         c.table_schema = ${this.name} AND
         c.table_name = ${table}
       )
-      ORDER BY c.ordinal_position
+      ORDER BY c.column_name
     `
   }