8000 fix(postgres): Emit correct types for pg_catalog types by kyleconroy · Pull Request #4 · sqlc-dev/sqlc-gen-typescript · GitHub
[go: up one dir, main page]
Skip to content

fix(postgres): Emit correct types for pg_catalog types #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2023
Merged

fix(postgres): Emit correct types for pg_catalog types #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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));
}
0