add execlastid implementation for mysql

Author: yshrsmz

examples/authors/mysql/query.sql

@@ -10,7 +10,14 @@ ORDER BY name;
 INSERT INTO authors (
  name, bio
 ) VALUES (
- ?, ? 
+ ?, ?
+);
+
+/* name: CreateAuthorReturnId :execlastid */
+INSERT INTO authors (
+ name, bio
+) VALUES (
+ ?, ?
 );
 
 /* name: DeleteAuthor :exec */
@@ -19,4 +26,4 @@ WHERE id = ?;
 
 /* name: Test :one */
 SELECT*FROM node_mysql_types
-LIMIT1;
+LIMIT1;

examples/bun-mysql2/src/db/query_sql.ts

@@ -1,4 +1,4 @@
-importmysql,{RowDataPacket}from"mysql2/promise";
+importmysql,{RowDataPacket,ResultSetHeader}from"mysql2/promise";
 
 typeClient=mysql.Connection|mysql.Pool;
 
@@ -62,7 +62,7 @@ export const createAuthorQuery = `-- name: CreateAuthor :exec
 INSERT INTO authors (
  name, bio
 ) VALUES (
- ?, ?
+ ?, ?
 )`;
 
 exportinterfaceCreateAuthorArgs{
@@ -77,6 +77,26 @@ export async function createAuthor(client: Client, args: CreateAuthorArgs): Prom
 });
 }
 
+exportconstcreateAuthorReturnIdQuery=`-- name: CreateAuthorReturnId :execlastid
+INSERT INTO authors (
+ name, bio
+) VALUES (
+ ?, ?
+)`;
+
+exportinterfaceCreateAuthorReturnIdArgs{
+name: string;
+bio: string|null;
+}
+
+exportasyncfunctioncreateAuthorReturnId(client: Client,args: CreateAuthorReturnIdArgs): Promise<number|null>{
+const[result]=awaitclient.query<ResultSetHeader>({
+sql: createAuthorReturnIdQuery,
+values: [args.name,args.bio]
+});
+returnresult?.insertId??null;
+}
+
 exportconstdeleteAuthorQuery=`-- name: DeleteAuthor :exec
 DELETE FROM authors
 WHERE id = ?`;

examples/node-mysql2/src/db/query_sql.ts

@@ -1,4 +1,4 @@
-importmysql,{RowDataPacket}from"mysql2/promise";
+importmysql,{RowDataPacket,ResultSetHeader}from"mysql2/promise";
 
 typeClient=mysql.Connection|mysql.Pool;
 
@@ -62,7 +62,7 @@ export const createAuthorQuery = `-- name: CreateAuthor :exec
 INSERT INTO authors (
  name, bio
 ) VALUES (
- ?, ?
+ ?, ?
 )`;
 
 exportinterfaceCreateAuthorArgs{
@@ -77,6 +77,26 @@ export async function createAuthor(client: Client, args: CreateAuthorArgs): Prom
 });
 }
 
+exportconstcreateAuthorReturnIdQuery=`-- name: CreateAuthorReturnId :execlastid
+INSERT INTO authors (
+ name, bio
+) VALUES (
+ ?, ?
+)`;
+
+exportinterfaceCreateAuthorReturnIdArgs{
+name: string;
+bio: string|null;
+}
+
+exportasyncfunctioncreateAuthorReturnId(client: Client,args: CreateAuthorReturnIdArgs): Promise<number|null>{
+const[result]=awaitclient.query<ResultSetHeader>({
+sql: createAuthorReturnIdQuery,
+values: [args.name,args.bio]
+});
+returnresult?.insertId??null;
+}
+
 exportconstdeleteAuthorQuery=`-- name: DeleteAuthor :exec
 DELETE FROM authors
 WHERE id = ?`;

src/app.ts

@@ -53,6 +53,12 @@ interface Driver{
 iface: string|undefined,
 params: Parameter[]
 )=>Node;
+execlastidDecl: (
+name: string,
+text: string,
+iface: string|undefined,
+params: Parameter[]
+)=>Node;
 manyDecl: (
 name: string,
 text: string,
@@ -77,10 +83,10 @@ function createNodeGenerator(driver?: string): Driver{
 returnmysql2;
 }
 case"pg": {
-returnpg;
+returnpgasany;
 }
 case"postgres": {
-returnpostgres;
+returnpostgresasany;
 }
 }
 thrownewError(`unknown driver: ${driver}`);
@@ -156,6 +162,12 @@ ${query.text}`
 );
 break;
 }
+case":execlastid": {
+nodes.push(
+driver.execlastidDecl(lowerName,textName,argIface,query.params)
+)
+break;
+}
 case":one": {
 nodes.push(
 driver.oneDecl(

src/drivers/mysql2.ts

@@ -178,6 +178,11 @@ export function preamble(queries: unknown){
 undefined,
 factory.createIdentifier("RowDataPacket")
 ),
+factory.createImportSpecifier(
+false,
+undefined,
+factory.createIdentifier("ResultSetHeader")
+),
 ])
 ),
 factory.createStringLiteral("mysql2/promise"),
@@ -611,10 +616,117 @@ export function oneDecl(
 );
 }
 
+exportfunctionexeclastidDecl(
+funcName: string,
+queryName: string,
+argIface: string|undefined,
+params: Parameter[]
+){
+constfuncParams=funcParamsDecl(argIface,params);
+
+returnfactory.createFunctionDeclaration(
+[
+factory.createToken(SyntaxKind.ExportKeyword),
+factory.createToken(SyntaxKind.AsyncKeyword),
+],
+undefined,
+factory.createIdentifier(funcName),
+undefined,
+funcParams,
+factory.createTypeReferenceNode(factory.createIdentifier("Promise"),[
+factory.createUnionTypeNode([
+factory.createTypeReferenceNode('number',undefined),
+factory.createLiteralTypeNode(factory.createNull()),
+])
+]),
+factory.createBlock(
+[
+factory.createVariableStatement(
+undefined,
+factory.createVariableDeclarationList(
+[
+factory.createVariableDeclaration(
+factory.createArrayBindingPattern([
+factory.createBindingElement(
+undefined,
+undefined,
+factory.createIdentifier("result"),
+undefined
+),
+]),
+undefined,
+undefined,
+factory.createAwaitExpression(
+factory.createCallExpression(
+factory.createPropertyAccessExpression(
+factory.createIdentifier("client"),
+factory.createIdentifier("query")
+),
+[
+factory.createTypeReferenceNode(
+factory.createIdentifier("ResultSetHeader"),
+undefined
+)
+],
+[
+factory.createObjectLiteralExpression(
+[
+factory.createPropertyAssignment(
+factory.createIdentifier("sql"),
+factory.createIdentifier(queryName)
+),
+factory.createPropertyAssignment(
+factory.createIdentifier("values"),
+factory.createArrayLiteralExpression(
+params.map((param,i)=>
+factory.createPropertyAccessExpression(
+factory.createIdentifier("args"),
+factory.createIdentifier(
+argName(i,param.column)
+)
+)
+),
+false
+)
+),
+],
+true
+),
+]
+)
+)
+)
+],
+NodeFlags.Const|
+// NodeFlags.Constant |
+NodeFlags.AwaitContext|
+// NodeFlags.Constant |
+NodeFlags.ContextFlags|
+NodeFlags.TypeExcludesFlags
+)
+),
+factory.createReturnStatement(
+factory.createBinaryExpression(
+factory.createPropertyAccessChain(
+factory.createIdentifier("result"),
+factory.createToken(SyntaxKind.QuestionDotToken),
+factory.createIdentifier("insertId")
+),
+factory.createToken(SyntaxKind.QuestionQuestionToken),
+factory.createNull()
+)
+),
+],
+true
+)
+)
+}
+
 exportdefault{
  columnType,
  preamble,
  execDecl,
  manyDecl,
  oneDecl,
+ execlastidDecl,
 };