envio 2.32.2 → 3.0.0-alpha-main-clickhouse-sink

package/src/db/InternalTable.res.js

@@ -8,7 +8,6 @@ var Address = require("../Address.res.js");
 var Js_dict = require("rescript/lib/js/js_dict.js");
 var Js_null = require("rescript/lib/js/js_null.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
-var EntityHistory = require("./EntityHistory.res.js");
 var S$RescriptSchema = require("rescript-schema/src/S.res.js");
 
 var name = "dynamic_contract_registry";
@@ -35,27 +34,24 @@ var schema = S$RescriptSchema.schema(function (s) {
 var rowsSchema = S$RescriptSchema.array(schema);
 
 var table = Table.mkTable(name, undefined, [
-      Table.mkField("id", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, true, undefined, undefined),
-      Table.mkField("chain_id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_block_number", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_log_index", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_block_timestamp", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_contract_name", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_name", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_src_address", "TEXT", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("contract_address", "TEXT", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("contract_name", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
+      Table.mkField("id", "String", S$RescriptSchema.string, undefined, undefined, undefined, true, undefined, undefined),
+      Table.mkField("chain_id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("registering_event_block_number", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("registering_event_log_index", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("registering_event_block_timestamp", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("registering_event_contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("registering_event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("registering_event_src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("contract_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
     ]);
 
-var entityHistory = EntityHistory.fromTable(table, schema, -1);
-
 var config = {
   name: name,
   index: -1,
   schema: schema,
   rowsSchema: rowsSchema,
-  table: table,
-  entityHistory: entityHistory
+  table: table
 };
 
 var DynamicContractRegistry = {
@@ -65,7 +61,6 @@ var DynamicContractRegistry = {
   schema: schema,
   rowsSchema: rowsSchema,
   table: table,
-  entityHistory: entityHistory,
   config: config
 };
 
@@ -85,18 +80,18 @@ var fields = [
 ];
 
 var table$1 = Table.mkTable("envio_chains", undefined, [
-      Table.mkField("id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
-      Table.mkField("start_block", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("end_block", "INTEGER", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
-      Table.mkField("max_reorg_depth", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("buffer_block", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("source_block", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("first_event_block", "INTEGER", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
-      Table.mkField("ready_at", "TIMESTAMP WITH TIME ZONE NULL", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined),
-      Table.mkField("events_processed", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("_is_hyper_sync", "BOOLEAN", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("progress_block", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("_num_batches_fetched", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined)
+      Table.mkField("id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
+      Table.mkField("start_block", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("end_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
+      Table.mkField("max_reorg_depth", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("buffer_block", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("source_block", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("first_event_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
+      Table.mkField("ready_at", "Date", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined),
+      Table.mkField("events_processed", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("_is_hyper_sync", "Boolean", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("progress_block", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("_num_batches_fetched", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined)
     ]);
 
 function initialFromConfig(chainConfig) {
@@ -231,12 +226,12 @@ var Chains = {
 };
 
 var table$2 = Table.mkTable("persisted_state", undefined, [
-      Table.mkField("id", "SERIAL", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
-      Table.mkField("envio_version", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("config_hash", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("schema_hash", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("handler_files_hash", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("abi_files_hash", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
+      Table.mkField("id", "Serial", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
+      Table.mkField("envio_version", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("config_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("schema_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("handler_files_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("abi_files_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
     ]);
 
 var PersistedState = {
@@ -244,11 +239,11 @@ var PersistedState = {
 };
 
 var table$3 = Table.mkTable("envio_checkpoints", undefined, [
-      Table.mkField("id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
-      Table.mkField("chain_id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("block_number", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("block_hash", "TEXT", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined),
-      Table.mkField("events_processed", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined)
+      Table.mkField("id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
+      Table.mkField("chain_id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("block_number", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("block_hash", "String", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined),
+      Table.mkField("events_processed", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined)
     ]);
 
 function makeGetReorgCheckpointsQuery(pgSchema) {
@@ -339,19 +334,21 @@ var schema$1 = S$RescriptSchema.schema(function (s) {
     });
 
 var table$4 = Table.mkTable("raw_events", undefined, [
-      Table.mkField("chain_id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("event_id", "NUMERIC", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("event_name", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("contract_name", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("block_number", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("log_index", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("src_address", "TEXT", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("block_hash", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("block_timestamp", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("block_fields", "JSONB", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("transaction_fields", "JSONB", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("params", "JSONB", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("serial", "SERIAL", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, true, undefined, undefined)
+      Table.mkField("chain_id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("event_id", {
+            type: "BigInt"
+          }, S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("block_number", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("log_index", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("block_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("block_timestamp", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("block_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("transaction_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("params", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("serial", "Serial", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, true, undefined, undefined)
     ]);
 
 var RawEvents = {

package/src/db/Table.res

@@ -2,20 +2,35 @@ open Belt
 
 type primitive
 type derived
-@unboxed
+
+type enum
+type enumConfig<'enum> = {
+  name: string,
+  variants: array<'enum>,
+  schema: S.t<'enum>,
+}
+external fromGenericEnumConfig: enumConfig<'enum> => enumConfig<enum> = "%identity"
+
+let makeEnumConfig = (~name, ~variants) => {
+  name,
+  variants,
+  schema: S.enum(variants),
+}
+
+@tag("type")
 type fieldType =
-  | @as("INTEGER") Integer
-  | @as("BIGINT") BigInt
-  | @as("BOOLEAN") Boolean
-  | @as("NUMERIC") Numeric
-  | @as("DOUBLE PRECISION") DoublePrecision
-  | @as("TEXT") Text
-  | @as("SERIAL") Serial
-  | @as("JSONB") JsonB
-  | @as("TIMESTAMP WITH TIME ZONE") Timestamp
-  | @as("TIMESTAMP") TimestampWithoutTimezone
-  | @as("TIMESTAMP WITH TIME ZONE NULL") TimestampWithNullTimezone
-  | Custom(string)
+  | String
+  | Boolean
+  | Uint32
+  | Int32
+  | Number
+  | BigInt({precision?: int})
+  | BigDecimal({config?: (int, int)}) // (precision, scale)
+  | Serial
+  | Json
+  | Date
+  | Enum({config: enumConfig<enum>})
+  | Entity({name: string})
 
 type field = {
   fieldName: string,
@@ -84,8 +99,52 @@ let getFieldName = fieldOrDerived =>
   | DerivedFrom({fieldName}) => fieldName
   }
 
-let getFieldType = (field: field) => {
-  (field.fieldType :> string) ++ (field.isArray ? "[]" : "")
+let idFieldName = "id"
+
+let getPgFieldType = (
+  ~fieldType: fieldType,
+  ~pgSchema,
+  ~isArray,
+  ~isNumericArrayAsText,
+  ~isNullable,
+) => {
+  let columnType = switch fieldType {
+  | String => (Postgres.Text :> string)
+  | Boolean => (Postgres.Boolean :> string)
+  | Int32 => (Postgres.Integer :> string)
+  | Uint32 => (Postgres.BigInt :> string)
+  | Number => (Postgres.DoublePrecision :> string)
+  | BigInt({?precision}) =>
+    (Postgres.Numeric :> string) ++
+    switch precision {
+    | Some(precision) => `(${precision->Int.toString}, 0)` // scale is always 0 for BigInt
+    | None => ""
+    }
+
+  | BigDecimal({?config}) =>
+    (Postgres.Numeric :> string) ++
+    switch config {
+    | Some((precision, scale)) => `(${precision->Int.toString}, ${scale->Int.toString})`
+    | None => ""
+    }
+
+  | Serial => (Postgres.Serial :> string)
+  | Json => (Postgres.JsonB :> string)
+  | Date =>
+    (isNullable ? Postgres.TimestampWithTimezoneNull : Postgres.TimestampWithTimezone :> string)
+  | Enum({config}) => `"${pgSchema}".${config.name}`
+  | Entity(_) => (Postgres.Text :> string) // FIXME: Will it work correctly if id is not a text column?
+  }
+
+  // Workaround for Hasura bug https://github.com/enviodev/hyperindex/issues/788
+  let isNumericAsText = isArray && isNumericArrayAsText
+  let columnType = if columnType == (Postgres.Numeric :> string) && isNumericAsText {
+    (Postgres.Text :> string)
+  } else {
+    columnType
+  }
+
+  columnType ++ (isArray ? "[]" : "")
 }
 
 type table = {
@@ -240,15 +299,20 @@ let toSqlParams = (table: table, ~schema, ~pgSchema) => {
         ->Js.Array2.push(
           switch field {
           | Field(f) =>
+            let pgFieldType = getPgFieldType(
+              ~fieldType=f.fieldType,
+              ~pgSchema,
+              ~isArray=true,
+              ~isNullable=f.isNullable,
+              ~isNumericArrayAsText=false, // TODO: Test whether it should be passed via args and match the column type
+            )
             switch f.fieldType {
-            // The case for `BigDecimal! @config(precision: 10, scale: 8)`
-            | Custom(fieldType) if fieldType->Js.String2.startsWith("NUMERIC(") => fieldType
-            | Custom(fieldType) => `${(Text :> string)}[]::"${pgSchema}".${(fieldType :> string)}`
-            | Boolean => `${(Integer :> string)}[]::${(f.fieldType :> string)}`
-            | fieldType => (fieldType :> string)
+            | Enum(_) => `${(Text: Postgres.columnType :> string)}[]::${pgFieldType}`
+            | Boolean => `${(Integer: Postgres.columnType :> string)}[]::${pgFieldType}`
+            | _ => pgFieldType
             }
-          | DerivedFrom(_) => (Text :> string)
-          } ++ "[]",
+          | DerivedFrom(_) => (Text: Postgres.columnType :> string) ++ "[]"
+          },
         )
         ->ignore
         dict->Js.Dict.set(location, s.matches(schema->coerceSchema))

package/src/db/Table.res.js

@@ -10,6 +10,14 @@ var Belt_SetString = require("rescript/lib/js/belt_SetString.js");
 var Caml_exceptions = require("rescript/lib/js/caml_exceptions.js");
 var S$RescriptSchema = require("rescript-schema/src/S.res.js");
 
+function makeEnumConfig(name, variants) {
+  return {
+          name: name,
+          variants: variants,
+          schema: S$RescriptSchema.$$enum(variants)
+        };
+}
+
 function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNullableOpt, isPrimaryKeyOpt, isIndexOpt, linkedEntity) {
   var isArray = isArrayOpt !== undefined ? isArrayOpt : false;
   var isNullable = isNullableOpt !== undefined ? isNullableOpt : false;
@@ -66,9 +74,63 @@ function getFieldName(fieldOrDerived) {
   }
 }
 
-function getFieldType(field) {
-  return field.fieldType + (
-          field.isArray ? "[]" : ""
+function getPgFieldType(fieldType, pgSchema, isArray, isNumericArrayAsText, isNullable) {
+  var columnType;
+  if (typeof fieldType !== "object") {
+    switch (fieldType) {
+      case "String" :
+          columnType = "TEXT";
+          break;
+      case "Boolean" :
+          columnType = "BOOLEAN";
+          break;
+      case "Uint32" :
+          columnType = "BIGINT";
+          break;
+      case "Int32" :
+          columnType = "INTEGER";
+          break;
+      case "Number" :
+          columnType = "DOUBLE PRECISION";
+          break;
+      case "Serial" :
+          columnType = "SERIAL";
+          break;
+      case "Json" :
+          columnType = "JSONB";
+          break;
+      case "Date" :
+          columnType = isNullable ? "TIMESTAMP WITH TIME ZONE NULL" : "TIMESTAMP WITH TIME ZONE";
+          break;
+      
+    }
+  } else {
+    switch (fieldType.type) {
+      case "BigInt" :
+          var precision = fieldType.precision;
+          columnType = "NUMERIC" + (
+            precision !== undefined ? "(" + String(precision) + ", 0)" : ""
+          );
+          break;
+      case "BigDecimal" :
+          var config = fieldType.config;
+          columnType = "NUMERIC" + (
+            config !== undefined ? "(" + String(config[0]) + ", " + String(config[1]) + ")" : ""
+          );
+          break;
+      case "Enum" :
+          columnType = "\"" + pgSchema + "\"." + fieldType.config.name;
+          break;
+      case "Entity" :
+          columnType = "TEXT";
+          break;
+      
+    }
+  }
+  var isNumericAsText = isArray && isNumericArrayAsText;
+  var columnType$1 = columnType === "NUMERIC" && isNumericAsText ? "TEXT" : columnType;
+  return columnType$1 + (
+          isArray ? "[]" : ""
         );
 }
 
@@ -258,16 +320,17 @@ function toSqlParams(table, schema, pgSchema) {
                 var tmp;
                 if (field$1.TAG === "Field") {
                   var f = field$1._0;
-                  var fieldType = f.fieldType;
-                  tmp = fieldType === "TIMESTAMP" || fieldType === "TIMESTAMP WITH TIME ZONE" || fieldType === "JSONB" || fieldType === "SERIAL" || fieldType === "TEXT" || fieldType === "DOUBLE PRECISION" || fieldType === "NUMERIC" || fieldType === "BOOLEAN" || fieldType === "BIGINT" || fieldType === "INTEGER" || fieldType === "TIMESTAMP WITH TIME ZONE NULL" ? (
-                      fieldType === "BOOLEAN" ? "INTEGER[]::" + f.fieldType : fieldType
+                  var pgFieldType = getPgFieldType(f.fieldType, pgSchema, true, false, f.isNullable);
+                  var match = f.fieldType;
+                  tmp = typeof match !== "object" ? (
+                      match === "Boolean" ? "INTEGER[]::" + pgFieldType : pgFieldType
                     ) : (
-                      fieldType.startsWith("NUMERIC(") ? fieldType : "TEXT[]::\"" + pgSchema + "\"." + fieldType
+                      match.type === "Enum" ? "TEXT[]::" + pgFieldType : pgFieldType
                     );
                 } else {
-                  tmp = "TEXT";
+                  tmp = "TEXT[]";
                 }
-                arrayFieldTypes.push(tmp + "[]");
+                arrayFieldTypes.push(tmp);
                 dict[$$location] = s.m(coerceSchema(param.schema));
               }));
         return dict;
@@ -303,13 +366,17 @@ function getCompositeIndices(table) {
               }));
 }
 
+var idFieldName = "id";
+
+exports.makeEnumConfig = makeEnumConfig;
 exports.mkField = mkField;
 exports.mkDerivedFromField = mkDerivedFromField;
 exports.getUserDefinedFieldName = getUserDefinedFieldName;
 exports.isLinkedEntityField = isLinkedEntityField;
 exports.getDbFieldName = getDbFieldName;
 exports.getFieldName = getFieldName;
-exports.getFieldType = getFieldType;
+exports.idFieldName = idFieldName;
+exports.getPgFieldType = getPgFieldType;
 exports.mkTable = mkTable;
 exports.getPrimaryKeyFieldNames = getPrimaryKeyFieldNames;
 exports.getFields = getFields;