return number | string from mysql execlastid

yshrsmz · yshrsmz · commit 402b9f3f0945 · 2024-03-04T18:23:18.000+09:00
diff --git a/examples/node-mysql2/src/db/query_sql.ts b/examples/node-mysql2/src/db/query_sql.ts
@@ -91,7 +91,7 @@ export interface CreateAuthorReturnIdArgs{
 bio: string | null;
 }
 
-export async function createAuthorReturnId(client: Client, args: CreateAuthorReturnIdArgs): Promise<number>{
+export async function createAuthorReturnId(client: Client, args: CreateAuthorReturnIdArgs): Promise<number | string>{
 const [result] = await client.query<ResultSetHeader>({
 sql: createAuthorReturnIdQuery,
 values: [args.name, args.bio]
diff --git a/src/drivers/mysql2.ts b/src/drivers/mysql2.ts
@@ -45,10 +45,10 @@ function funcParamsDecl(iface: string | undefined, params: Parameter[]){
 }
 
 export class Driver{
- private readonly options: Mysql2Options
+ private readonly options: Mysql2Options;
 
 constructor(options?: Mysql2Options){
- this.options = options ??{}
+ this.options = options ??{};
 }
 
 columnType(column?: Column): TypeNode{
@@ -63,12 +63,12 @@ export class Driver{
 
 if (this.options.support_big_numbers){
 if (this.options.big_number_strings){
- typ = factory.createKeywordTypeNode(SyntaxKind.StringKeyword)
+ typ = factory.createKeywordTypeNode(SyntaxKind.StringKeyword);
 } else{
 typ = factory.createUnionTypeNode([
 factory.createKeywordTypeNode(SyntaxKind.NumberKeyword),
- factory.createKeywordTypeNode(SyntaxKind.StringKeyword)
- ])
+ factory.createKeywordTypeNode(SyntaxKind.StringKeyword),
+ ]);
 }
 }
 
@@ -655,6 +655,14 @@ export class Driver{
 ){
 const funcParams = funcParamsDecl(argIface, params);
 
+ let returnType: TypeNode = factory.createTypeReferenceNode("number", undefined);
+ if (this.options.support_big_numbers){
+ returnType = factory.createUnionTypeNode([
+ factory.createTypeReferenceNode("number", undefined),
+ factory.createTypeReferenceNode("string", undefined),
+ ]);
+ }
+
 return factory.createFunctionDeclaration(
 [
 factory.createToken(SyntaxKind.ExportKeyword),
@@ -665,7 +673,7 @@ export class Driver{
 undefined,
 funcParams,
 factory.createTypeReferenceNode(factory.createIdentifier("Promise"), [
- factory.createTypeReferenceNode("number", undefined),
+ returnType,
 ]),
 factory.createBlock(
 [

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ export interface CreateAuthorReturnIdArgs{`
`91`	`91`	`bio: string\|null;`
`92`	`92`	`}`
`93`	`93`
`94`		`-exportasyncfunctioncreateAuthorReturnId(client: Client,args: CreateAuthorReturnIdArgs): Promise<number>{`
	`94`	`+exportasyncfunctioncreateAuthorReturnId(client: Client,args: CreateAuthorReturnIdArgs): Promise<number\|string>{`
`95`	`95`	`const[result]=awaitclient.query<ResultSetHeader>({`
`96`	`96`	`sql: createAuthorReturnIdQuery,`
`97`	`97`	`values: [args.name,args.bio]`
-Original file line number
+Diff line change
+}
 exportclassDriver{
 -privatereadonlyoptions: Mysql2Options
 +privatereadonlyoptions: Mysql2Options;
 constructor(options?: Mysql2Options){
 -this.options=options??{}
 +this.options=options??{};
+}
 columnType(column?: Column): TypeNode{
 if(this.options.support_big_numbers){
 if(this.options.big_number_strings){
 -typ=factory.createKeywordTypeNode(SyntaxKind.StringKeyword)
 +typ=factory.createKeywordTypeNode(SyntaxKind.StringKeyword);
 }else{
 typ=factory.createUnionTypeNode([
 factory.createKeywordTypeNode(SyntaxKind.NumberKeyword),
 -factory.createKeywordTypeNode(SyntaxKind.StringKeyword)
 -])
 +factory.createKeywordTypeNode(SyntaxKind.StringKeyword),
 +]);
+}
+}
 ){
 constfuncParams=funcParamsDecl(argIface,params);
 +letreturnType: TypeNode=factory.createTypeReferenceNode("number",undefined);
 +if(this.options.support_big_numbers){
 +returnType=factory.createUnionTypeNode([
 +factory.createTypeReferenceNode("number",undefined),
 +factory.createTypeReferenceNode("string",undefined),
 +]);
 +}
++
 returnfactory.createFunctionDeclaration(
+[
 factory.createToken(SyntaxKind.ExportKeyword),
 undefined,
 funcParams,
 factory.createTypeReferenceNode(factory.createIdentifier("Promise"),[
 -factory.createTypeReferenceNode("number",undefined),
 +returnType,
 ]),
 factory.createBlock(
+[