Merge pull request #15 from klarna-incubator/ft/specify-fixed-length-character-type-length

Specify fixed length character type length

Author: 4tyTwo

Diff for: src/format.ts

@@ -137,7 +137,7 @@ const generateCompositeTypeMarkdown = (
 
 const maybeCreateTypeLink = (type: string, customTypeNames: Set<string>) => {
   if (customTypeNames.has(type)) return `[${type}](#${type})`
-  const docsUrl = TYPES[type]
+  const docsUrl = type.match(/character \(\d+\)/) ? TYPES['character'] : TYPES[type]
   if (docsUrl) return `<a href="${docsUrl}">${type}</a>`
   return type
 }

Diff for: src/postgre-data-types.json

@@ -10,7 +10,7 @@
   "serial": "https://www.postgresql.org/docs/9.5/datatype-numeric.html",
   "bigserial": "https://www.postgresql.org/docs/9.5/datatype-numeric.html",
   "money": "https://www.postgresql.org/docs/9.5/datatype-money.html",
-  "charachter": "https://www.postgresql.org/docs/9.5/datatype-character.html",
+  "character": "https://www.postgresql.org/docs/9.5/datatype-character.html",
   "char": "https://www.postgresql.org/docs/9.5/datatype-character.html",
   "varchar": "https://www.postgresql.org/docs/9.5/datatype-character.html",
   "varyingchar": "https://www.postgresql.org/docs/9.5/datatype-character.html",

Diff for: src/repository.ts

@@ -28,16 +28,29 @@ const columnResultDecoder: Decoder<Column[]> = Decoder.array(
     column_default: Decoder.optional(Decoder.string),
     is_nullable: Decoder.string.map((s) => s === 'YES'),
     data_type: Decoder.string,
-    udt_name: Decoder.string
-  }).map((res) => ({
-    table: res.table_name,
-    name: res.column_name,
-    default: res.column_default,
-    isNullable: res.is_nullable,
-    dataType: res.data_type == 'USER-DEFINED' ? res.udt_name : res.data_type,
-  }))
+    udt_name: Decoder.string,
+    character_maximum_length: Decoder.optional(Decoder.number)
+  }).map((res) => {
+    return {
+      table: res.table_name,
+      name: res.column_name,
+      default: res.column_default,
+      isNullable: res.is_nullable,
+      dataType: get_datatype(res)
+    }
+  })
 )
 
+const get_datatype = (res: {udt_name: string, data_type: string, character_maximum_length: number | undefined}) => {
+  if (res.data_type == 'USER-DEFINED') {
+    return res.udt_name
+  }
+  if (res.data_type == 'character' && res.character_maximum_length) {
+    return `character (${res.character_maximum_length})`
+  }
+  return res.data_type
+}
+
 export type View = {
   name: string
 }