Commit26af4db

authored

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

1 parent9867e64 commit26af4dbCopy full SHA for 26af4db

File tree

+29

-2

lines changed

+29

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,14 @@ export function columnType(column?: Column): TypeNode {`
`7`	`7`	`if(column===undefined\|\|column.type===undefined){`
`8`	`8`	`returnfactory.createKeywordTypeNode(SyntaxKind.AnyKeyword);`
`9`	`9`	`}`
	`10`	+// Some of the type names have the `pgcatalog.` prefix. Remove this.
	`11`	`+lettypeName=column.type.name;`
	`12`	`+constpgCatalog="pg_catalog.";`
	`13`	`+if(typeName.startsWith(pgCatalog)){`
	`14`	`+typeName=typeName.slice(pgCatalog.length);`
	`15`	`+}`
`10`	`16`	`lettyp:TypeNode=factory.createKeywordTypeNode(SyntaxKind.StringKeyword);`
`11`		`-switch(column.type.name){`
	`17`	`+switch(typeName){`
`12`	`18`	`case"aclitem":{`
`13`	`19`	`// string`
`14`	`20`	`break;`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,20 @@ import { SyntaxKind, NodeFlags, TypeNode, factory } from "typescript";`
`2`	`2`
`3`	`3`	`import{Parameter,Column}from"../gen/plugin/codegen_pb";`
`4`	`4`	`import{argName}from"./utlis";`
	`5`	`+import{log}from"../logger";`
`5`	`6`
`6`	`7`	`exportfunctioncolumnType(column?:Column):TypeNode{`
`7`	`8`	`if(column===undefined\|\|column.type===undefined){`
`8`	`9`	`returnfactory.createKeywordTypeNode(SyntaxKind.AnyKeyword);`
`9`	`10`	`}`
	`11`	+// Some of the type names have the `pgcatalog.` prefix. Remove this.
	`12`	`+lettypeName=column.type.name;`
	`13`	`+constpgCatalog="pg_catalog.";`
	`14`	`+if(typeName.startsWith(pgCatalog)){`
	`15`	`+typeName=typeName.slice(pgCatalog.length);`
	`16`	`+}`
`10`	`17`	`lettyp:TypeNode=factory.createKeywordTypeNode(SyntaxKind.StringKeyword);`
`11`		`-switch(column.type.name){`
	`18`	`+switch(typeName){`
`12`	`19`	`case"aclitem":{`
`13`	`20`	`// string`
`14`	`21`	`break;`
`@@ -230,6 +237,10 @@ export function columnType(column?: Column): TypeNode {`
`230`	`237`	`// string`
`231`	`238`	`break;`
`232`	`239`	`}`
	`240`	`+default:{`
	`241`	+log(`unknown type${column.type?.name}`);
	`242`	`+break;`
	`243`	`+}`
`233`	`244`	`}`
`234`	`245`	`if(column.isArray\|\|column.arrayDims>0){`
`235`	`246`	`letdims=Math.max(column.arrayDims\|\|1);`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,10 @@`
	`1`	`+// I cant' get this import to work locally. The import in node_modules is`
	`2`	`+// javy/dist but esbuild requires the import to be javy/fs`
	`3`	`+//`
	`4`	`+//@ts-expect-error`
	`5`	`+import{readFileSync,writeFileSync,STDIO}from"javy/fs";`
	`6`	`+`
	`7`	`+exportfunctionlog(msg:string){`
	`8`	`+constencoder=newTextEncoder();`
	`9`	`+writeFileSync(STDIO.Stderr,encoder.encode(msg));`
	`10`	`+}`

Comments

(0)