sql-typechecker 0.0.1 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sql-typechecker",
-  "version": "0.0.1",
+  "version": "0.0.5",
   "main": "out/cli.js",
   "bin": "out/cli.js",
   "dependencies": {
@@ -12,8 +12,8 @@
     "build": "node esbuild.js",
     "install": "npm run build",
     "test": "alsatian ./test/**/*.ts",
-    "start": "npm run build && node --enable-source-maps ./out/cli.js ./sample -o ./sample/out.ts",
-    "start_school": "npm run build && node --enable-source-maps ./out/cli.js ./school -o ./school/out.ts",
+    "start": "npm run build && node --enable-source-maps ./out/cli.js -d ./sample -o ./sample/out.ts",
+    "start_school": "npm run build && node --enable-source-maps ./out/cli.js -d ./school -o ./school/out.ts",
     "debug": "npm run build && node --inspect-brk --enable-source-maps ./out/cli.js ",
     "test_debug": "node --inspect-brk ./node_modules/alsatian/dist/cli/alsatian-cli.js ./test/**/*.ts -t 20000000"
   },

package/school/out.ts

@@ -4,7 +4,7 @@ export function getemailstosend(
   args: {}
 ): Promise<
   {
-    uw_id: bigint;
+    uw_id: number;
     uw_from: string;
     uw_replyto: string | null;
     uw_address: string;
@@ -17,8 +17,8 @@ export function getemailstosend(
     uw_content: Buffer | null;
   }[]
 > {
-  return pg`select getemailstosend()`;
-  /*
+  return pg`select getemailstosend() AS getemailstosend(uw_id bigint, uw_from text, uw_replyto text, uw_address text, uw_addressee text, uw_subject text, uw_text text, uw_html text, uw_externalid text, uw_filename text, uw_content bytea)`;
+  /* -- ORIGINAL --
 CREATE FUNCTION getemailstosend() RETURNS SETOF __todo__ AS
 $$
   SELECT 
@@ -44,10 +44,10 @@ $$ LANGUAGE sql;
 export function insertnewemailstatus(
   pg: postgres.Sql<any>,
   args: { uw_emailid: number; version: number; uw_status: string }
-): Promise<{ uw_emailid: bigint }[]> {
-  return pg`select insertnewemailstatus(${args.uw_emailid}, ${args.version}, ${args.uw_status})`;
-  /*
-CREATE FUNCTION insertnewemailstatus(uw_emailidinteger, versioninteger, uw_statustext) RETURNS SETOF __todo__ AS
+): Promise<{ uw_emailid: number } | undefined> {
+  return pg`select insertnewemailstatus(${args.uw_emailid}, ${args.version}, ${args.uw_status}) AS insertnewemailstatus(uw_emailid bigint)`[0];
+  /* -- ORIGINAL --
+CREATE FUNCTION insertnewemailstatus(uw_emailidinteger, versioninteger, uw_statustext) RETURNS __todo__ AS
 $$
   INSERT INTO uw_email_statusses 
     (uw_emailid, uw_version, uw_status, uw_stamp, uw_islastversion) 

package/school/sql.sql

@@ -956,7 +956,7 @@ CREATE TABLE uw_Payenrollment_onlinepayments(
     CONSTRAINT uw_Payenrollment_onlinepayments_EnrollmentOrRequest
     CHECK (((uw_enrollmentId IS NULL) AND (NOT (uw_enrollmentrequestId IS NULL))) OR ((uw_enrollmentrequestId IS NULL) AND (NOT (uw_enrollmentId IS NULL)))));
 
-CREATE OR REPLACE FUNCTION getEmailsToSend() RETURNS SETOF AS $$
+CREATE OR REPLACE FUNCTION getEmailsToSend() RETURNS SETOF RECORD AS $$
   SELECT 
   e.uw_id, 
   e.uw_from, 

package/src/cli.ts

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import * as fs from "fs/promises";
 import * as path from "path";
 import { CreateFunctionStatement, parse, Statement } from "pgsql-ast-parser";
@@ -9,12 +10,13 @@ import {
   showSqlType,
   showType,
   Type,
+  SimpleT,
 } from "./typecheck";
 import * as prettier from "prettier";
 
 go();
 
-async function findSqlFiles(dir: string): Promise<string[]> {
+async function findSqlFilesInDir(dir: string): Promise<string[]> {
   const inThisDir = await fs.readdir(dir);
   const res: string[] = [];
   for (let p of inThisDir) {
@@ -24,7 +26,7 @@ async function findSqlFiles(dir: string): Promise<string[]> {
     } else {
       const stat = await fs.stat(fullP);
       if (stat.isDirectory()) {
-        const inSubFolder = await findSqlFiles(fullP);
+        const inSubFolder = await findSqlFilesInDir(fullP);
         res.push(...inSubFolder);
       } else {
         // not a sql file, not a directory
@@ -88,7 +90,8 @@ function functionToTypescript(f: functionType): string {
   const returnTypeAsString =
     f.returns.kind === "void"
       ? "void"
-      : showTypeAsTypescriptType(f.returns) + "[]";
+      : showTypeAsTypescriptType(f.returns) +
+        (f.multipleRows ? "[]" : " | undefined");
 
   const argsType =
     "{" +
@@ -110,12 +113,37 @@ function functionToTypescript(f: functionType): string {
     .map((k) => k.name.name + showSqlType(k.type))
     .join(", ");
 
+  function showTypeDroppingNullable(t: SimpleT): string {
+    if (t.kind === "nullable") {
+      return showTypeDroppingNullable(t.typevar);
+    } else if (t.kind === "array") {
+      return showTypeDroppingNullable(t.typevar) + "[]";
+    } else if (t.kind === "anyscalar") {
+      return "anyscalar";
+    } else if (t.kind === "scalar") {
+      return t.name.name;
+    } else {
+      return "";
+    }
+  }
+
+  const asExpression =
+    f.returns.kind === "set"
+      ? ` AS ${f.name.name}(${f.returns.fields
+          .map(
+            (f) => (f.name?.name || "") + " " + showTypeDroppingNullable(f.type)
+          )
+          .join(", ")})`
+      : "";
+
   return `
 export function ${
     f.name.name
   }(pg: postgres.Sql<any>, args: ${argsType}): Promise<${returnTypeAsString}>{
-return pg\`select ${f.name.name}(${argsAsList})\`;
-/*
+return pg\`select ${f.name.name}(${argsAsList})${asExpression}\`${
+    f.multipleRows ? "" : "[0]"
+  };
+/* -- ORIGINAL --
 CREATE FUNCTION ${f.name.name}(${argsForCreateFunction}) RETURNS ${
     f.multipleRows ? "SETOF " : ""
   }__todo__ AS
@@ -126,18 +154,28 @@ $$${f.code}$$ LANGUAGE ${f.language};
 }
 
 async function go() {
-  const dir = process.argv[2];
-  if (!dir) {
-    throw new Error("Please provide directory with SQL files");
-  }
-
-  const outArg = findOutArg(process.argv);
+  const outArgs = findInArgs({ argv: process.argv, flags: ["-o", "--out"] });
+  const outArg = outArgs[0];
   if (!outArg) {
     throw new Error("Please provide -o/--out parameter");
   }
-  const allSqlFiles = await findSqlFiles(path.resolve(process.cwd(), dir));
 
-  // console.log(`Processing files: ${allSqlFiles.join(", ")}`);
+  const dirs = findInArgs({ argv: process.argv, flags: ["-d", "--dir"] });
+  const files = findInArgs({ argv: process.argv, flags: ["-f", "--file"] });
+
+  const allSqlFiles = (
+    await Promise.all(
+      dirs.map((dir) => findSqlFilesInDir(path.resolve(process.cwd(), dir)))
+    )
+  )
+    .flat()
+    .concat(files);
+
+  if (allSqlFiles.length === 0) {
+    throw new Error(
+      "Please provide at least one SQL file with flags -f/--file or -d/--dir"
+    );
+  }
 
   const allStatements: Statement[] = [];
   for (let sqlFile of allSqlFiles) {
@@ -177,11 +215,14 @@ async function prepOutFile(path: string): Promise<string> {
   return path;
 }
 
-function findOutArg(args: string[]): string | null {
-  const flagIndex = args.findIndex((arg) => arg === "-o" || arg === "--out");
-  if (!flagIndex) {
-    return null;
-  } else {
-    return args[flagIndex + 1] || null;
+function findInArgs(opts: { argv: string[]; flags: string[] }): string[] {
+  let i = 0;
+  let res = [];
+  for (let arg of opts.argv) {
+    if (opts.flags.includes(arg) && opts.argv[i + 1]) {
+      res.push(opts.argv[i + 1]);
+    }
+    i = i + 1;
   }
+  return res;
 }

package/src/typecheck.ts

@@ -24,6 +24,7 @@ import {
   SelectStatement,
   Statement,
   toSql,
+  UpdateStatement,
 } from "pgsql-ast-parser";
 import { builtincasts } from "./builtincasts";
 import { builtinoperators } from "./builtinoperators";
@@ -740,21 +741,26 @@ function elabInsert(g: Global, c: Context, s: InsertStatement): VoidT | SetT {
   // TODO: typecheck s.onConflict
 }
 
-function elabDelete(g: Global, c: Context, s: DeleteStatement): VoidT | SetT {
-  const deletingFrom: null | {
+function elabDeleteOrUpdate(
+  g: Global,
+  c: Context,
+  s: DeleteStatement | UpdateStatement
+): VoidT | SetT {
+  const tableName = s.type === "delete" ? s.from : s.table;
+  const tableDef: null | {
     readonly name: QName;
     readonly rel: SetT;
-  } = g.tables.find((t) => eqQNames(t.name, s.from)) || null;
+  } = g.tables.find((t) => eqQNames(t.name, tableName)) || null;
 
-  if (!deletingFrom) {
-    throw new UnknownIdentifier(s, s.from);
+  if (!tableDef) {
+    throw new UnknownIdentifier(s, tableName);
   }
-  const nameToAddInContext = s.from.alias || s.from.name;
+  const nameToAddInContext = tableName.alias || tableName.name;
   const newContext = {
     ...c,
     froms: c.froms.concat({
       name: { name: nameToAddInContext },
-      type: deletingFrom.rel,
+      type: tableDef.rel,
     }),
   };
 
@@ -850,6 +856,7 @@ export function doCreateFunction(
     const body = parse(s.code);
 
     if (body.length === 0) {
+      // empty function body
       return {
         name,
         inputs,
@@ -867,7 +874,7 @@ export function doCreateFunction(
         name,
         inputs,
         returns: returnType,
-        multipleRows: true, // todo
+        multipleRows: (s.returns && s.returns.setof) || false,
         code: s.code,
         language: s.language.name,
       };
@@ -1770,8 +1777,8 @@ function elabStatement(g: Global, c: Context, s: Statement): VoidT | Type {
     return elabExpr(g, c, s);
   } else if (s.type === "insert") {
     return elabInsert(g, c, s);
-  } else if (s.type === "delete") {
-    return elabDelete(g, c, s);
+  } else if (s.type === "delete" || s.type === "update") {
+    return elabDeleteOrUpdate(g, c, s);
   } else {
     return notImplementedYet(s);
   }