@aws-amplify/graphql-model-transformer 0.17.0-rds-support.0 → 0.17.0-rdsv2preview.0

package/rds-lambda/clients/mysql/MySQLClient.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { DBClient } from '../DBClient';
 import { BaseRequest, Request } from '../../interfaces/BaseRequest';
-import { ListRequest } from '../../interfaces/ListRequest';
+import { IndexRequest, ListRequest } from '../../interfaces/ListRequest';
 
 export abstract class MySQLClient extends DBClient {
   client: Knex;
@@ -20,6 +20,8 @@ export abstract class MySQLClient extends DBClient {
           return this.executeList(request as ListRequest);
         case 'DELETE':
           return this.executeDelete(request as Request);
+        case 'INDEX':
+          return this.executeIndex(request as IndexRequest);
         default:
           throw Error('Invalid operation');
       }
@@ -29,8 +31,14 @@ export abstract class MySQLClient extends DBClient {
   }
 
   private executeCreate = async (request: Request): Promise<any> => {
+    // Insert the record
     await (await this.getClient())(request.table).insert(request.args.input);
-    return request.args.input;
+
+    // Select the record
+    const resultQuery = (await this.getClient())(request.table);
+    this.addKeyConditions(resultQuery, request);
+    const result = await resultQuery.select();
+    return result ? result[0] : {};
   }
 
   private executeGet = async (request: Request): Promise<any> => {
@@ -41,32 +49,63 @@ export abstract class MySQLClient extends DBClient {
   }
 
   private executeUpdate = async (request: Request): Promise<any> => {
+    // Update the record
     const query = (await this.getClient())(request.table);
     this.addKeyConditions(query, request);
-    return request.args.input;
+    await query.update(request.args.input);
+
+    // Select the record
+    const resultQuery = (await this.getClient())(request.table);
+    this.addKeyConditions(resultQuery, request);
+    const result = await resultQuery.select();
+    return result ? result[0] : {};
   }
 
   private executeList = async (request: ListRequest): Promise<any> => {
     const nextOffset = request.args?.nextToken
-      ? Number.parseInt(Buffer.from(request.args.nextToken, 'base64').toString('base64'), 10)
+      ? Number.parseInt(Buffer.from(request.args.nextToken, 'base64').toString('utf-8'), 10)
       : 0;
-    const query = (await this.getClient())(request.table).select().offset(nextOffset).limit(request.args?.limit ?? 100);
-    if (request.args?.filter) {
-      Object.keys(request.args.filter).filter((key) => request.args.hasOwnProperty(key)).forEach((key) => {
-        query.whereLike(key, request.args.filter[key]);
-      });
-      this.addSortConditions(query, request);
-    }
-    const nextToken = Buffer.from((nextOffset + request.args.limit).toString());
-    return { items: (await query.returning('*')), nextToken };
+    const limit = request.args?.limit ?? 100;
+    const query = (await this.getClient())(request.table).select().offset(nextOffset).limit(limit);
+
+    this.addSortConditions(query, request);
+    const result = await query.returning('*');
+    const endOfResults = result?.length && result?.length < limit;
+    const nextToken = endOfResults ? null : Buffer.from((nextOffset + request.args.limit).toString()).toString('base64');
+    return { items: result, nextToken };
   }
 
   private executeDelete = async (request: Request): Promise<any> => {
+    // Select the record
+    const resultQuery = (await this.getClient())(request.table);
+    this.addKeyConditions(resultQuery, request);
+    const result = await resultQuery.select();
+
+    // Delete the record
     const query = (await this.getClient())(request.table);
     Object.keys(request.args.input).filter((key) => request.args.input.hasOwnProperty(key)).forEach((key) => {
-      query.whereLike(key, request.args.input[key]);
+      query.where(key, request.args.input[key]);
     });
     await query.delete();
-    return request.args.input;
+
+    return result ? result[0] : {};
+  }
+
+  private executeIndex = async (request: IndexRequest): Promise<any> => {
+    const searchFilter = JSON.parse(JSON.stringify(request.args.input));
+    ['filter', 'limit', 'nextToken', 'sortDirection'].forEach(key => {
+      delete searchFilter[key];
+    });
+    const nextOffset = request.args?.nextToken
+      ? Number.parseInt(Buffer.from(request.args.nextToken, 'base64').toString('utf-8'), 10)
+      : 0;
+    const limit = request.args?.limit ?? 100;
+    const query = (await this.getClient())(request.table).where(searchFilter).select().offset(nextOffset).limit(limit);
+
+    this.addSortConditions(query, request);
+    const result = await query.returning('*');
+    const endOfResults = result?.length && result?.length < limit;
+    const nextToken = endOfResults ? null : Buffer.from((nextOffset + request.args.limit).toString()).toString('base64');
+    return { items: result, nextToken };
   }
 }

package/rds-lambda/clients/mysql/MySQLPasswordClient.ts

@@ -1,6 +1,7 @@
-import Knex from 'knex';
+import knex, { Knex } from 'knex';
 import { SSMClient, GetParameterCommand } from '@aws-sdk/client-ssm';
 import { MySQLClient } from './MySQLClient';
+import * as mysql2 from 'mysql2/promise';
 
 /**
  * Postgres client with password connection implementation
@@ -22,8 +23,8 @@ export class MySQLPasswordClient extends MySQLClient {
       return this.client;
     }
     const passwordClient = this.getSSMClient();
-    return Knex({
-      client: 'mysql',
+    return knex({
+      client: 'mysql2',
       connection: {
         host: process.env.host,
         port: Number.parseInt(process.env.port ?? '3306', 10),

package/rds-lambda/interfaces/BaseRequest.ts

@@ -9,14 +9,14 @@ export interface RequestArgs extends BaseRequestArgs {
 
 export interface BaseRequest {
   table: string;
-  operation: 'GET' | 'LIST' | 'CREATE' | 'UPDATE' | 'DELETE';
+  operation: 'GET' | 'LIST' | 'CREATE' | 'UPDATE' | 'DELETE' | 'INDEX';
   operationName: string;
   args: BaseRequestArgs;
 }
 
 export interface Request extends BaseRequest {
   table: string;
-  operation: 'GET' | 'LIST' | 'CREATE' | 'UPDATE' | 'DELETE';
+  operation: 'GET' | 'LIST' | 'CREATE' | 'UPDATE' | 'DELETE' | 'INDEX';
   operationName: string;
   args: RequestArgs;
 }

package/rds-lambda/interfaces/ListRequest.ts

@@ -18,3 +18,14 @@ export interface ListRequest extends BaseRequest {
   operationName: string;
   args: ListRequestArgs;
 }
+
+export interface IndexRequestArgs extends ListRequestArgs {
+  [key: string]: any;
+}
+
+export interface IndexRequest extends BaseRequest {
+  table: string;
+  operation: 'INDEX';
+  operationName: string;
+  args: IndexRequestArgs;
+}