Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/drivers/pg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@ export function columnType(column?: Column): TypeNode {
if (column === undefined || column.type === undefined) {
return factory.createKeywordTypeNode(SyntaxKind.AnyKeyword);
}
// Some of the type names have the `pgcatalog.` prefix. Remove this.
let typeName = column.type.name;
const pgCatalog = "pg_catalog.";
if (typeName.startsWith(pgCatalog)) {
typeName = typeName.slice(pgCatalog.length);
}
let typ: TypeNode = factory.createKeywordTypeNode(SyntaxKind.StringKeyword);
switch (column.type.name) {
switch (typeName) {
case "aclitem": {
// string
break;
Expand Down
13 changes: 12 additions & 1 deletion src/drivers/postgres.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@ import { SyntaxKind, NodeFlags, TypeNode, factory } from "typescript";

import { Parameter, Column } from "../gen/plugin/codegen_pb";
import { argName } from "./utlis";
import { log } from "../logger";

export function columnType(column?: Column): TypeNode {
if (column === undefined || column.type === undefined) {
return factory.createKeywordTypeNode(SyntaxKind.AnyKeyword);
}
// Some of the type names have the `pgcatalog.` prefix. Remove this.
let typeName = column.type.name;
const pgCatalog = "pg_catalog.";
if (typeName.startsWith(pgCatalog)) {
typeName = typeName.slice(pgCatalog.length);
}
let typ: TypeNode = factory.createKeywordTypeNode(SyntaxKind.StringKeyword);
switch (column.type.name) {
switch (typeName) {
case "aclitem": {
// string
break;
Expand Down Expand Up @@ -230,6 +237,10 @@ export function columnType(column?: Column): TypeNode {
// string
break;
}
default: {
log(`unknown type ${column.type?.name}`);
break;
}
}
if (column.isArray || column.arrayDims > 0) {
let dims = Math.max(column.arrayDims || 1);
Expand Down
10 changes: 10 additions & 0 deletions src/logger.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// I cant' get this import to work locally. The import in node_modules is
// javy/dist but esbuild requires the import to be javy/fs
//
// @ts-expect-error
import { readFileSync, writeFileSync, STDIO } from "javy/fs";

export function log(msg: string) {
const encoder = new TextEncoder();
writeFileSync(STDIO.Stderr, encoder.encode(msg));
}