data-api-client 2.0.0-beta.0 → 2.1.0

package/README.md

@@ -1,25 +1,68 @@
 ![Aurora Serverless Data API Client](https://user-images.githubusercontent.com/2053544/79285017-44053500-7e8a-11ea-8515-998ccf9c2d2e.png)
 
-[![Build Status](https://travis-ci.org/jeremydaly/data-api-client.svg?branch=master)](https://travis-ci.org/jeremydaly/data-api-client)
 [![npm](https://img.shields.io/npm/v/data-api-client.svg)](https://www.npmjs.com/package/data-api-client)
 [![npm](https://img.shields.io/npm/l/data-api-client.svg)](https://www.npmjs.com/package/data-api-client)
 
-## v2.0 BETA with support for AWS SDK v3
+> **Note:** Version 2.1.0 introduces mysql2 and pg compatibility layers with full ORM support! We welcome your feedback and bug reports. Please [open an issue](https://github.com/jeremydaly/data-api-client/issues) if you encounter any problems or have suggestions for improvement.
+>
+> **Using v1.x?** See [README_v1.md](README_v1.md) for v1.x documentation.
 
-The **Data API Client** is a lightweight wrapper that simplifies working with the Amazon Aurora Serverless Data API by abstracting away the notion of field values. This abstraction annotates native JavaScript types supplied as input parameters, as well as converts annotated response data to native JavaScript types. It's basically a [DocumentClient](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html) for the Data API. It also exposes simplified versions of the native AWS SDK v3 `RDSDataClient` methods to make working with `async/await` or Promise chains easier AND dramatically simplifies **transactions**.
+The **Data API Client** is a lightweight wrapper that simplifies working with the Amazon Aurora Serverless Data API by abstracting away the notion of field values. This abstraction annotates native JavaScript types supplied as input parameters, as well as converts annotated response data to native JavaScript types. It's basically a [DocumentClient](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html) for the Data API. It also dramatically simplifies **transactions**, provides **automatic retry logic** for scale-to-zero clusters, and includes **compatibility layers** for mysql2 and pg with full **ORM support**.
+
+**Version 2.1** adds mysql2 and pg compatibility layers, automatic retry logic for cluster wake-ups, and verified support for Drizzle ORM and Kysely query builder.
+
+**Version 2.0** introduced support for the new [RDS Data API for Aurora Serverless v2 and Aurora provisioned database instances](https://aws.amazon.com/about-aws/whats-new/2024/09/amazon-aurora-mysql-rds-data-api/), enhanced [Amazon Aurora PostgreSQL-Compatible Edition](https://aws.amazon.com/about-aws/whats-new/2023/12/amazon-aurora-postgresql-rds-data-api/) support, migration to AWS SDK v3, full TypeScript implementation, and comprehensive PostgreSQL data type coverage including **automatic array handling**.
 
 For more information about the Aurora Serverless Data API, you can review the [official documentation](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html) or read [Aurora Serverless Data API: An (updated) First Look](https://www.jeremydaly.com/aurora-serverless-data-api-a-first-look/) for some more insights on performance.
 
+## What's New in v2.1
+
+- **Automatic Retry Logic**: Built-in retry handling for Aurora Serverless scale-to-zero wake-ups
+  - Smart detection of `DatabaseResumingException` with optimized retry delays
+  - Automatic handling of connection errors with exponential backoff
+  - Configurable and enabled by default
+- **mysql2 Compatibility Layer**: Drop-in replacement for the `mysql2/promise` library
+  - Full support for connection pools and transactions
+  - Works seamlessly with ORMs like Drizzle and Kysely
+- **pg Compatibility Layer**: Drop-in replacement for the `pg` (node-postgres) library
+  - Promise-based and callback-based APIs
+  - Compatible with ORMs and query builders
+- **ORM Support**: Tested and verified with popular ORMs:
+  - **Drizzle ORM**: Full support for both MySQL and PostgreSQL
+  - **Kysely**: Query builder support for both engines
+
+## What's New in v2.0
+
+- **AWS SDK v3**: Migrated from AWS SDK v2 to v3 for smaller bundle sizes and better tree-shaking
+- **TypeScript**: Full TypeScript implementation with comprehensive type definitions
+- **PostgreSQL Array Support**: Automatic conversion of PostgreSQL arrays to native JavaScript arrays in query results
+- **Comprehensive Data Type Coverage**: Extensive support for PostgreSQL data types including:
+  - All numeric types (SMALLINT, INT, BIGINT, DECIMAL, NUMERIC, REAL, DOUBLE PRECISION)
+  - String types (CHAR, VARCHAR, TEXT)
+  - Boolean, Date/Time types (DATE, TIME, TIMESTAMP, TIMESTAMPTZ)
+  - Binary data (BYTEA)
+  - JSON and JSONB with nested structures
+  - UUID with type casting support
+  - Network types (INET, CIDR)
+  - Range types (INT4RANGE, NUMRANGE, TSTZRANGE)
+  - Arrays of all supported types
+- **Modern Build System**: TypeScript compilation with ES6+ output
+- **Enhanced Type Casting**: Improved support for PostgreSQL type casting with inline (`::type`) and parameter-based casting
+- **Better Error Handling**: More informative error messages and validation
+
 ## Simple Examples
 
-The **Data API Client** makes working with the Aurora Serverless Data API super simple. Require and instantiate the library with basic configuration information, then use the `query()` method to manage your workflows. Below are some examples.
+The **Data API Client** makes working with the Aurora Serverless Data API super simple. Import and instantiate the library with basic configuration information, then use the `query()` method to manage your workflows. Below are some examples.
 
 ```javascript
-// Require and instantiate data-api-client with secret and cluster
-const data = require('data-api-client')({
+// Import and instantiate data-api-client with secret and cluster
+import dataApiClient from 'data-api-client'
+
+const data = dataApiClient({
   secretArn: 'arn:aws:secretsmanager:us-east-1:XXXXXXXXXXXX:secret:mySecret',
   resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster-name',
-  database: 'myDatabase' // default database
+  database: 'myDatabase', // default database
+  engine: 'pg' // or 'mysql'
 })
 
 /*** Assuming we're in an async function ***/
@@ -35,31 +78,27 @@ let result = await data.query(`SELECT * FROM myTable`)
 // }
 
 // SELECT with named parameters
-let resultParams = await data.query(`SELECT * FROM myTable WHERE id = :id`, {
-  id: 2
-})
+let resultParams = await data.query(`SELECT * FROM myTable WHERE id = :id`, { id: 2 })
 // { records: [ { id: 2, name: 'Mike', age: 52 } ] }
 
-// INSERT with named parameters
-let insert = await data.query(`INSERT INTO myTable (name,age,has_curls) VALUES(:name,:age,:curls)`, {
+// INSERT with named parameters (PostgreSQL with RETURNING)
+let insert = await data.query(`INSERT INTO myTable (name, age, has_curls) VALUES(:name, :age, :curls) RETURNING id`, {
   name: 'Greg',
   age: 18,
   curls: false
 })
 
 // BATCH INSERT with named parameters
-let batchInsert = await data.query(`INSERT INTO myTable (name,age,has_curls) VALUES(:name,:age,:curls)`, [
+let batchInsert = await data.query(`INSERT INTO myTable (name, age, has_curls) VALUES(:name, :age, :curls)`, [
   [{ name: 'Marcia', age: 17, curls: false }],
   [{ name: 'Peter', age: 15, curls: false }],
   [{ name: 'Jan', age: 15, curls: false }],
   [{ name: 'Cindy', age: 12, curls: true }],
   [{ name: 'Bobby', age: 12, curls: false }]
 ])
+
 // Update with named parameters
-let update = await data.query(`UPDATE myTable SET age = :age WHERE id = :id`, {
-  age: 13,
-  id: 5
-})
+let update = await data.query(`UPDATE myTable SET age = :age WHERE id = :id`, { age: 13, id: 5 })
 
 // Delete with named parameters
 let remove = await data.query(
@@ -67,64 +106,77 @@ let remove = await data.query(
   { name: 'Jan' } // Sorry Jan :(
 )
 
-// A slightly more advanced example
-let custom = data.query({
-  sql: `SELECT * FROM myOtherTable WHERE id = :id AND active = :isActive`,
-  continueAfterTimeout: true,
-  database: 'myOtherDatabase',
-  parameters: [{ id: 123 }, { name: 'isActive', value: { booleanValue: true } }]
-})
+// PostgreSQL with type casting and JSONB
+let pgExample = await data.query(`INSERT INTO users (id, email, metadata) VALUES(:id, :email, :metadata)`, [
+  { name: 'id', value: '550e8400-e29b-41d4-a716-446655440000', cast: 'uuid' },
+  { name: 'email', value: 'user@example.com' },
+  { name: 'metadata', value: JSON.stringify({ role: 'admin' }), cast: 'jsonb' }
+])
+
+// PostgreSQL array result (automatically converted to native JavaScript array)
+let arrayResult = await data.query(`SELECT tags FROM products WHERE id = :id`, { id: 123 })
+// { records: [ { tags: ['new', 'featured', 'sale'] } ] }
 ```
 
 ## Why do I need this?
 
-The [Data API](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html) requires you to specify data types when passing in parameters. The basic `INSERT` example above would look like this using the native `RDSDataClient` class:
+The [Data API](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html) requires you to specify data types when passing in parameters. The basic `INSERT` example above would look like this using the native AWS SDK v3:
 
 ```javascript
-const { RDSDataClient, ExecuteStatementCommand } = require('@aws-sdk/client-rds-data')
-const client = new RDSDataClient({ region: 'us-east-1' })
+import { RDSDataClient, ExecuteStatementCommand } from '@aws-sdk/client-rds-data'
+const client = new RDSDataClient()
 
-const params = {
-  secretArn: 'arn:aws:secretsmanager:us-east-1:XXXXXXXXXXXX:secret:mySecret',
-  resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster-name',
-  database: 'myDatabase',
-  sql: 'INSERT INTO myTable (name,age,has_curls) VALUES(:name,:age,:curls)',
-  parameters: [
-    { name: 'name', value: { stringValue: 'Cousin Oliver' } },
-    { name: 'age', value: { longValue: 10 } },
-    { name: 'curls', value: { booleanValue: false } }
-  ]
-}
-
-const command = new ExecuteStatementCommand(params)
+/*** Assuming we're in an async function ***/
 
-// async/await.
-try {
-  const data = await client.send(command)
-  // process data.
-} catch (error) {
-  // error handling.
-}
+// INSERT with named parameters
+let insert = await client.send(
+  new ExecuteStatementCommand({
+    secretArn: 'arn:aws:secretsmanager:us-east-1:XXXXXXXXXXXX:secret:mySecret',
+    resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster-name',
+    database: 'myDatabase',
+    sql: 'INSERT INTO myTable (name, age, has_curls) VALUES(:name, :age, :curls)',
+    parameters: [
+      { name: 'name', value: { stringValue: 'Cousin Oliver' } },
+      { name: 'age', value: { longValue: 10 } },
+      { name: 'curls', value: { booleanValue: false } }
+    ]
+  })
+)
 ```
 
-Specifying all of those data types in the parameters and writing all that SDK code is a bit clunky. In addition to requiring types for parameters, it also returns each field as an object with its value assigned to a key that represents its data type, like this:
+Specifying all of those data types in the parameters is a bit clunky. In addition to requiring types for parameters, it also returns each field as an object with its value assigned to a key that represents its data type, like this:
 
 ```javascript
-{ // id field
-  "longValue": 9
+{
+  // id field
+  longValue: 9
 },
-{ // name field
-  "stringValue": "Cousin Oliver"
+{
+  // name field
+  stringValue: 'Cousin Oliver'
 },
-{ // age field
-  "longValue": 10
+{
+  // age field
+  longValue: 10
 },
-{ // has_curls field
-  "booleanValue": false
+{
+  // has_curls field
+  booleanValue: false
 }
 ```
 
-Not only are there no column names, but you have to pull the value from the data type field. Lots of extra work that the **Data API Client** handles automatically for you. 😀
+Not only are there no column names, but you have to pull the value from the data type field. And if you're using PostgreSQL arrays, you get a complex nested structure:
+
+```javascript
+{
+  // tags field (PostgreSQL array)
+  arrayValue: {
+    stringValues: ['admin', 'editor', 'viewer']
+  }
+}
+```
+
+Lots of extra work that the **Data API Client** handles automatically for you, converting arrays to native JavaScript arrays and providing clean, usable data. 😀
 
 ## Installation and Setup
 
@@ -132,40 +184,88 @@ Not only are there no column names, but you have to pull the value from the data
 npm i data-api-client
 ```
 
+The library has AWS SDK v3's `@aws-sdk/client-rds-data` as an optional peer dependency. In AWS Lambda, the SDK is provided by the runtime. For local development or other environments, install it separately:
+
+```
+npm i @aws-sdk/client-rds-data
+```
+
 For more information on enabling Data API, see [Enabling Data API](#enabling-data-api).
 
 ## Configuration Options
 
 Below is a table containing all of the possible configuration options for the `data-api-client`. Additional details are provided throughout the documentation.
 
-| Property           | Type            | Description                                                                                                                                                                                                                                                                                   | Default      |
-| ------------------ | --------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ |
-| resourceArn        | `string`        | The ARN of your Aurora Serverless Cluster. This value is _required_, but can be overridden when querying.                                                                                                                                                                                     |              |
-| secretArn          | `string`        | The ARN of the secret associated with your database credentials. This is _required_, but can be overridden when querying.                                                                                                                                                                     |              |
-| database           | `string`        | _Optional_ default database to use with queries. Can be overridden when querying.                                                                                                                                                                                                             |              |
-| engine             | `mysql` or `pg` | The type of database engine you're connecting to (MySQL or Postgres).                                                                                                                                                                                                                         | `mysql`      |
-| hydrateColumnNames | `boolean`       | When `true`, results will be returned as objects with column names as keys. If `false`, results will be returned as an array of values.                                                                                                                                                       | `true`       |
-| options            | `object`        | An _optional_ configuration object that is passed directly into the v3 RDSDataClient constructor. Use this to set `region`, `tls`, etc. See [here](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-rds-data/interfaces/rdsdataclientconfig.html) for available options. | `{}`         |
-| formatOptions      | `object`        | Formatting options to auto parse dates and coerce native JavaScript date objects to MySQL supported date formats. Valid keys are `deserializeDate` and `treatAsLocalDate`. Both accept boolean values.                                                                                        | Both `false` |
-| wrapper            | `function`      | A custom wrapper around `@aws-sdk/client-rds-data` used to enable AWS X-Ray.                                                                                                                                                                                                                  |              |
+| Property           | Type            | Description                                                                                                                                                                                                                                         | Default                                          |
+| ------------------ | --------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------ |
+| client             | `RDSDataClient` | A custom `@aws-sdk/client-rds-data` instance (for X-Ray tracing, custom config, etc.)                                                                                                                                                               |                                                  |
+| resourceArn        | `string`        | The ARN of your Aurora Serverless Cluster. This value is _required_, but can be overridden when querying.                                                                                                                                           |                                                  |
+| secretArn          | `string`        | The ARN of the secret associated with your database credentials. This is _required_, but can be overridden when querying.                                                                                                                           |                                                  |
+| database           | `string`        | _Optional_ default database to use with queries. Can be overridden when querying.                                                                                                                                                                   |                                                  |
+| engine             | `mysql` or `pg` | The type of database engine you're connecting to (MySQL or Postgres).                                                                                                                                                                               | `pg`                                             |
+| hydrateColumnNames | `boolean`       | When `true`, results will be returned as objects with column names as keys. If `false`, results will be returned as an array of values.                                                                                                             | `true`                                           |
+| options            | `object`        | An _optional_ configuration object that is passed directly into the RDSDataClient constructor. See [AWS SDK docs](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-rds-data/classes/rdsdataclient.html) for available options. | `{}`                                             |
+| formatOptions      | `object`        | Formatting options to auto parse dates and coerce native JavaScript date objects to supported date formats. Valid keys are `deserializeDate` and `treatAsLocalDate`. Both accept boolean values.                                                    | `deserializeDate: true, treatAsLocalDate: false` |
+| retryOptions       | `object`        | Configuration for automatic retry logic. Valid keys are `enabled` (boolean), `maxRetries` (number), and `retryableErrors` (string array).                                                                                                            | `enabled: true, maxRetries: 9`                   |
+
+### Automatic Retry Logic
+
+Version 2.1 includes built-in retry logic to handle Aurora Serverless scale-to-zero cluster wake-ups automatically. When your cluster is paused and needs to resume, the client will automatically retry your queries with optimized delays.
+
+**Features:**
+- **Smart Error Detection**: Automatically detects `DatabaseResumingException` and connection errors
+- **Strategy-Based Retries**: Different retry strategies based on error type:
+  - DatabaseResumingException: Up to 10 attempts with progressive delays (0s, 2s, 5s, 10s, 15s, 20s, 25s, 30s, 35s, 40s)
+  - Connection errors: 3 quick retries with exponential backoff (0s, 2s, 4s)
+- **Enabled by Default**: Works automatically without any configuration
+- **Configurable**: Customize retry behavior per your needs
+
+**Configuration:**
+
+```javascript
+const data = dataApiClient({
+  secretArn: 'arn:...',
+  resourceArn: 'arn:...',
+  database: 'myDatabase',
+  retryOptions: {
+    enabled: true, // Enable/disable retries (default: true)
+    maxRetries: 9, // Maximum retry attempts (default: 9 for up to 40s total)
+    retryableErrors: [] // Additional error patterns to retry (optional)
+  }
+})
+```
+
+**Disable retries** (not recommended for scale-to-zero clusters):
+
+```javascript
+const data = dataApiClient({
+  secretArn: 'arn:...',
+  resourceArn: 'arn:...',
+  retryOptions: { enabled: false }
+})
+```
+
+The retry logic works seamlessly across all operations: queries, transactions, batch operations, and compatibility layer methods.
 
 ### Connection Reuse
 
-It is recommended to enable connection reuse as this dramatically decreases the latency of subsequent calls to the AWS API. This can be done by setting an environment variable
-`AWS_NODEJS_CONNECTION_REUSE_ENABLED=1`. For more information see the [AWS SDK documentation](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html).
+It is recommended to enable connection reuse as this dramatically decreases the latency of subsequent calls to the AWS API. This can be done by setting an environment variable `AWS_NODEJS_CONNECTION_REUSE_ENABLED=1`. For more information see the [AWS SDK documentation](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/node-reusing-connections.html).
 
 ## How to use this module
 
-The **Data API Client** wraps the AWS SDK v3 [RDSDataClient Class](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-rds-data/index.html), providing you with a number of convenience features to make your workflow easier. The module also exposes simplified versions of all the native `RDSDataClient` methods, with your default configuration information already merged in. 😉
+The **Data API Client** wraps the [RDSDataClient Class](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-rds-data/classes/rdsdataclient.html), providing you with a number of convenience features to make your workflow easier. The module also exposes all the standard `RDSDataClient` methods with your default configuration information already merged in. 😉
 
-To use the Data API Client, require the module and instantiate it with your [Configuration options](#configuration-options). If you are using it with AWS Lambda, require it **OUTSIDE** your main handler function. This will allow you to reuse the initialized module on subsequent invocations.
+To use the Data API Client, import the module and instantiate it with your [Configuration options](#configuration-options). If you are using it with AWS Lambda, require it **OUTSIDE** your main handler function. This will allow you to reuse the initialized module on subsequent invocations.
 
 ```javascript
-// Require and instantiate data-api-client with secret and cluster arns
-const data = require('data-api-client')({
+// Import and instantiate data-api-client with secret and cluster arns
+import dataApiClient from 'data-api-client'
+
+const data = dataApiClient({
   secretArn: 'arn:aws:secretsmanager:us-east-1:XXXXXXXXXXXX:secret:mySecret',
   resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster-name',
-  database: 'myDatabase' // set a default database
+  database: 'myDatabase', // set a default database
+  engine: 'pg' // specify 'pg' for PostgreSQL or 'mysql' for MySQL
 })
 ```
 
@@ -187,7 +287,7 @@ By default, this will return your rows as an array of objects with column names
 ]
 ```
 
-To query with parameters, you can use named parameters in your SQL, and then provider an object containing your parameters as the second argument to the `query()` method:
+To query with parameters, you can use named parameters in your SQL, and then provide an object containing your parameters as the second argument to the `query()` method:
 
 ```javascript
 let result = await data.query(
@@ -197,14 +297,14 @@ let result = await data.query(
 )
 ```
 
-The Data API Client will automatically convert your parameters into the correct Data API parameter format using native JavaScript types. If you prefer to use the clunky format, or you need more control over the data type, you can just pass in the `RDSDataClient` format:
+The Data API Client will automatically convert your parameters into the correct Data API parameter format using native JavaScript types. If you prefer more control over the data type, you can use the extended parameter format:
 
 ```javascript
 let result = await data.query(`SELECT * FROM myTable WHERE id = :id AND created > :createDate`, [
   // An array of objects is totally cool, too. We'll merge them for you.
   { id: 2 },
-  // Data API Client just passes this straight on through
-  { name: 'createDate', value: { blobValue: new Buffer('2019-06-01') } }
+  // Extended format for more control
+  { name: 'createDate', value: '2019-06-01' }
 ])
 ```
 
@@ -213,17 +313,16 @@ If you want even more control, you can pass in an `object` as the first paramete
 ```javascript
 let result = await data.query({
   sql: `SELECT * FROM myTable WHERE id = :id`,
-  parameters: [ { id: 2 } ], // or just { id: 2 }
+  parameters: [{ id: 2 }], // or just { id: 2 }
   database: 'someOtherDatabase', // override default database
-  schema: 'mySchema', // RDSDataClient config option
-  continueAfterTimeout: true, // RDSDataClient config option (non-batch only)
-  includeResultMetadata: true, // RDSDataClient config option (non-batch only)
+  continueAfterTimeout: true, // RDSDataService config option (non-batch only)
+  includeResultMetadata: true, // RDSDataService config option (non-batch only)
   hydrateColumnNames: false, // Returns each record as an arrays of values
-  transactionId: 'AQC5SRDIm...ZHXP/WORU=' // RDSDataClient config option
-}
+  transactionId: 'AQC5SRDIm...ZHXP/WORU=' // RDSDataService config option
+})
 ```
 
-Sometimes you might want to have _dynamic identifiers_ in your SQL statements. Unfortunately, the `RDSDataClient` doesn't do this, but the **Data API Client** does! We're using the [sqlstring](https://github.com/mysqljs/sqlstring) module under the hood, so as long as [NO_BACKSLASH_ESCAPES](https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_no_backslash_escapes) SQL mode is disabled (which is the default state for Aurora Serverless), you're good to go. Use a double colon (`::`) prefix to create _named identifiers_ and you can do cool things like this:
+Sometimes you might want to have _dynamic identifiers_ in your SQL statements. Unfortunately, the native Data API doesn't support this, but the **Data API Client** does! Use a double colon (`::`) prefix to create _named identifiers_ and you can do cool things like this:
 
 ```javascript
 let result = await data.query(`SELECT ::fields FROM ::table WHERE id > :id`, {
@@ -233,17 +332,35 @@ let result = await data.query(`SELECT ::fields FROM ::table WHERE id > :id`, {
 })
 ```
 
-Which will produce a query like this:
+Which will produce a query like this for PostgreSQL:
+
+```sql
+SELECT "id", "name", "created" FROM "table_123abc" WHERE id > :id
+```
+
+Or for MySQL:
 
 ```sql
-SELECT `id`, `name`, `created` FROM `table_123abc` WHERE id > :id LIMIT 10
+SELECT `id`, `name`, `created` FROM `table_123abc` WHERE id > :id
 ```
 
-You'll notice that we leave the _named parameters_ alone. Anything that Data API and the `RDSDataClient` Class currently handles, we defer to them.
+You'll notice that we leave the _named parameters_ alone. Anything that Data API and the native SDK currently handles, we defer to them.
 
 ### Type-Casting
 
-The Aurora Data API can sometimes give you trouble with certain data types, such as uuid, unless you explicitly cast them. While you can certainly do this manually in your SQL string, the Data API Client offers a really easy way to handle this for you.
+The Aurora Data API can sometimes give you trouble with certain data types, such as uuid or jsonb in PostgreSQL, unless you explicitly cast them. While you can certainly do this manually in your SQL string using PostgreSQL's `::` cast syntax, the Data API Client offers an easy way to handle this for you using the parameter `cast` property.
+
+**PostgreSQL inline casting** (recommended):
+
+```javascript
+const result = await data.query('INSERT INTO users(id, email, metadata) VALUES(:id, :email, :metadata::jsonb)', {
+  id: newUserId, // will be cast as string by default
+  email: email,
+  metadata: JSON.stringify(userMetadata) // cast to jsonb via ::jsonb in SQL
+})
+```
+
+**Parameter-based casting** (alternative approach):
 
 ```javascript
 const result = await data.query(
@@ -271,9 +388,11 @@ const result = await data.query(
 )
 ```
 
+Both approaches produce the same result, but inline casting is generally cleaner for simple cases.
+
 ### Batch Queries
 
-The `RDSDataClient` Class provides a `batchExecuteStatement` method that allows you to execute a prepared statement multiple times using different parameter sets. This is only allowed for `INSERT`, `UPDATE` and `DELETE` queries, but is much more efficient than issuing multiple `executeStatement` calls. The Data API Client handles the switching for you based on _how_ you send in your parameters.
+The Data API provides a `batchExecuteStatement` method that allows you to execute a prepared statement multiple times using different parameter sets. This is only allowed for `INSERT`, `UPDATE` and `DELETE` queries, but is much more efficient than issuing multiple `executeStatement` calls. The Data API Client handles the switching for you based on _how_ you send in your parameters.
 
 To issue a batch query, use the `query()` method (either by passing an object or using the two arity form), and provide multiple parameter sets as nested arrays. For example, if you wanted to update multiple records at once, your query might look like this:
 
@@ -292,6 +411,16 @@ Whenever a batch query is executed, it returns an `updateResults` field. Other t
 
 The Data API returns a `generatedFields` array that contains the value of auto-incrementing primary keys. If this value is returned, the Data API Client will parse this and return it as the `insertId`. This also works for batch queries as well.
 
+For PostgreSQL, use the `RETURNING` clause to get generated values:
+
+```javascript
+let result = await data.query(`INSERT INTO users (name, email) VALUES (:name, :email) RETURNING id`, {
+  name: 'Alice',
+  email: 'alice@example.com'
+})
+// result.records[0].id contains the generated ID
+```
+
 ## Transaction Support
 
 Transaction support in the Data API Client has been dramatically simplified. Start a new transaction using the `transaction()` method, and then chain queries using the `query()` method. The `query()` method supports all standard query options. Alternatively, you can specify a function as the only argument in a `query()` method call and return the arguments as an array of values. The function receives two arguments, the result of the last query executed, and an array containing all the previous query results. This is useful if you need values from a previous query as part of your transaction.
@@ -299,20 +428,23 @@ Transaction support in the Data API Client has been dramatically simplified. Sta
 You can specify an optional `rollback()` method in the chain. This will receive the `error` object and the `transactionStatus` object, allowing you to add additional logging or perform some other action. Call the `commit()` method when you are ready to execute the queries.
 
 ```javascript
-let results = await mysql.transaction()
+let results = await data
+  .transaction()
   .query('INSERT INTO myTable (name) VALUES(:name)', { name: 'Tiger' })
-  .query('UPDATE myTable SET age = :age WHERE name = :name' { age: 4, name: 'Tiger' })
-  .rollback((e,status) => { /* do something with the error */ }) // optional
+  .query('UPDATE myTable SET age = :age WHERE name = :name', { age: 4, name: 'Tiger' })
+  .rollback((e, status) => {
+    /* do something with the error */
+  }) // optional
   .commit() // execute the queries
 ```
 
 With a function to get the `insertId` from the previous query:
 
 ```javascript
-let results = await mysql
+let results = await data
   .transaction()
-  .query('INSERT INTO myTable (name) VALUES(:name)', { name: 'Tiger' })
-  .query((r) => ['UPDATE myTable SET age = :age WHERE id = :id', { age: 4, id: r.insertId }])
+  .query('INSERT INTO myTable (name) VALUES(:name) RETURNING id', { name: 'Tiger' })
+  .query((r) => ['UPDATE myTable SET age = :age WHERE id = :id', { age: 4, id: r.records[0].id }])
   .rollback((e, status) => {
     /* do something with the error */
   }) // optional
@@ -325,7 +457,7 @@ By default, the `transaction()` method will use the `resourceArn`, `secretArn` a
 
 ### Using native methods directly
 
-The Data API Client exposes simplified versions of the five `RDSDataClient` methods. These are:
+The Data API Client exposes the five RDSDataClient command methods. These are:
 
 - `batchExecuteStatement`
 - `beginTransaction`
@@ -338,87 +470,448 @@ The default configuration information (`resourceArn`, `secretArn`, and `database
 ```javascript
 let result = await data.executeStatement({
   sql: `SELECT * FROM myTable WHERE id = :id`,
-  parameters: [
-    { name: 'id', value: { longValue: 1 } }
-  ],
+  parameters: [{ name: 'id', value: { longValue: 1 } }],
   transactionId: 'AQC5SRDIm...ZHXP/WORU='
-)
+})
 ```
 
-## Custom SDK Wrapper
+## Custom AWS SDK Client
 
-`data-api-client` allows you to wrap the instance of `RDSDataClient` to enable additional features like AWS X-Ray. You can specify a function using the optional `wrapper` paramenter. The function will receive one parameter which contains an instantiated `RDSDataClient` instance.
+`data-api-client` allows for introducing a custom RDSDataClient instance as a parameter. This parameter is optional. If not present, `data-api-client` will create a default instance.
 
 ```javascript
-// Import X-Ray
-const AWSXRay = require('aws-xray-sdk');
+import { RDSDataClient } from '@aws-sdk/client-rds-data'
+import dataApiClient from 'data-api-client'
+
+// Create a custom client instance
+const rdsClient = new RDSDataClient({
+  region: 'us-east-1'
+  // other configuration options
+})
 
-// Instantiate data-api-client with the AWSXRay.captureAWSv3Client wrapper
-const data = require('data-api-client')({
-  wrapper: AWSXRay.captureAWSv3Client,
-  ...
+// Instantiate data-api-client with the custom client
+const data = dataApiClient({
+  client: rdsClient,
+  secretArn: 'arn:aws:secretsmanager:us-east-1:XXXXXXXXXXXX:secret:mySecret',
+  resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster-name'
 })
 ```
 
-## Data API Limitations / Wonkiness
+Custom client parameter allows you to introduce X-Ray tracing:
 
-The first GA release of the Data API has _a lot_ of promise, unfortunately, there are still quite a few things that make it a bit wonky and may require you to implement some workarounds. I've outlined some of my findings below.
+```javascript
+import { RDSDataClient } from '@aws-sdk/client-rds-data'
+import { captureAWSv3Client } from 'aws-xray-sdk-core'
+import dataApiClient from 'data-api-client'
 
-### You can't send in an array of values
+const rdsClient = captureAWSv3Client(new RDSDataClient({ region: 'us-east-1' }))
 
-The GitHub repo for RDSDataClient mentions something about `arrayValues`, but I've been unable to get arrays (including TypedArrays and Buffers) to be used for parameters with `IN` clauses. For example, the following query will **NOT** work:
+const data = dataApiClient({
+  client: rdsClient,
+  secretArn: 'arn:aws:secretsmanager:us-east-1:XXXXXXXXXXXX:secret:mySecret',
+  resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster-name'
+})
+```
+
+## mysql2 and pg Compatibility Layers
+
+Version 2.1 introduces compatibility layers that allow you to use the Data API Client as a drop-in replacement for popular database libraries. This makes it easy to migrate existing applications or use ORMs without modification.
+
+### mysql2 Compatibility
+
+Use the Data API Client as a replacement for `mysql2/promise`:
 
 ```javascript
-let result = await data.executeStatement({
+import { createMySQLConnection, createMySQLPool } from 'data-api-client/compat/mysql2'
+
+// Create a connection
+const connection = createMySQLConnection({
+  resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster',
   secretArn: 'arn:aws:secretsmanager:us-east-1:XXXXXXXXXXXX:secret:mySecret',
-  resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster-name',
-  database: 'myDatabase',
-  sql: 'SELECT * FROM myTable WHERE id IN (:ids)',
-  parameters: [
-    { name: 'id', value: { blobValue: [1,2,3,4,5] } }
-  ]
-).promise()
-```
+  database: 'myDatabase'
+})
 
-I'm using `blobValue` because it's the only generic value field. You could send it in as a string, but then it only uses the first value. Hopefully they will add an `arrayValues` or something similar to support this in the future.
+// Use like mysql2/promise
+const [rows, fields] = await connection.query('SELECT * FROM users WHERE id = ?', [123])
+await connection.execute('INSERT INTO users (name, email) VALUES (?, ?)', ['Alice', 'alice@example.com'])
 
-### ~~Named parameters MUST be sent in order~~
+// Note: connection.end() is optional - it's a no-op for Data API (no connection to close)
 
-~~Read that again if you need to. So parameters have to be **BOTH** named and _in order_, otherwise the query **may** fail. I stress **may**, because if you send in two fields of compatible type in the wrong order, the query will work, just with your values flipped. 🤦🏻‍♂️ Watch out for this one.~~ 👈This was fixed!
+// Create a pool for connection pooling
+const pool = createMySQLPool({
+  resourceArn: 'arn:...',
+  secretArn: 'arn:...',
+  database: 'myDatabase'
+})
 
-### You can't parameterize identifiers
+// Get connection from pool
+pool.getConnection((err, connection) => {
+  if (err) throw err
+  connection.query('SELECT * FROM users', (err, results) => {
+    connection.release() // Optional - no-op for Data API
+    // Handle results
+  })
+})
+
+// Or use promises
+const connection = await pool.getConnection()
+const [rows] = await connection.query('SELECT * FROM users')
+connection.release() // Optional - no-op for Data API
+```
+
+### pg Compatibility
 
-If you want to use dynamic column or field names, there is no way to do it automatically with the Data API. The `mysql` package, for example, lets you use `??` to dynamically insert escaped identifiers. Something like the example below is currently not possible.
+Use the Data API Client as a replacement for `pg` (node-postgres):
 
 ```javascript
-let result = await data.executeStatement({
+import { createPgClient, createPgPool } from 'data-api-client/compat/pg'
+
+// Create a client
+const client = createPgClient({
+  resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster',
   secretArn: 'arn:aws:secretsmanager:us-east-1:XXXXXXXXXXXX:secret:mySecret',
-  resourceArn: 'arn:aws:rds:us-east-1:XXXXXXXXXXXX:cluster:my-cluster-name',
-  database: 'myDatabase',
-  sql: 'SELECT ::fields FROM myTable WHERE id = :id',
-  parameters: [
-    // Note: 'arrayValues' is not a real thing
-    { name: 'fields', value: { arrayValues: ['id','name','created'] } },
-    { name: 'id', value: { longValue: 1 } }
-  ]
-).promise()
+  database: 'myDatabase'
+})
+
+// Note: client.connect() is optional - it's a no-op for Data API (no connection needed)
+await client.connect() // Optional
+
+// Use like pg
+const result = await client.query('SELECT * FROM users WHERE id = $1', [123])
+console.log(result.rows)
+
+// With callback style
+client.query('SELECT * FROM users', (err, result) => {
+  console.log(result.rows)
+})
+
+// Note: client.end() is optional - it's a no-op for Data API (no connection to close)
+await client.end() // Optional
+
+// Create a pool
+const pool = createPgPool({
+  resourceArn: 'arn:...',
+  secretArn: 'arn:...',
+  database: 'myDatabase'
+})
+
+const result = await pool.query('SELECT * FROM users WHERE id = $1', [123])
 ```
 
-No worries! The Data API Client gives you the ability to parameterize identifiers and auto escape them. Just use a double colon (`::`) to prefix your named identifiers.
+### Using with ORMs
+
+The compatibility layers work seamlessly with popular ORMs:
+
+#### Drizzle ORM
+
+**MySQL with Drizzle:**
+
+```typescript
+import { drizzle } from 'drizzle-orm/mysql2'
+import { createMySQLPool } from 'data-api-client/compat/mysql2'
+
+const pool = createMySQLPool({
+  resourceArn: 'arn:...',
+  secretArn: 'arn:...',
+  database: 'myDatabase'
+})
+
+const db = drizzle(pool as any)
+
+// Use Drizzle normally
+const users = await db.select().from(usersTable).where(eq(usersTable.id, 123))
+```
+
+**PostgreSQL with Drizzle:**
+
+```typescript
+import { drizzle } from 'drizzle-orm/node-postgres'
+import { createPgClient } from 'data-api-client/compat/pg'
+
+const client = createPgClient({
+  resourceArn: 'arn:...',
+  secretArn: 'arn:...',
+  database: 'myDatabase'
+})
+
+// Note: client.connect() is optional (no-op for Data API)
+await client.connect() // Optional - can be omitted
+const db = drizzle(client as any)
+
+// Use Drizzle normally
+const users = await db.select().from(usersTable).where(eq(usersTable.id, 123))
+```
+
+#### Kysely Query Builder
+
+**MySQL with Kysely:**
+
+```typescript
+import { Kysely, MysqlDialect } from 'kysely'
+import { createMySQLPool } from 'data-api-client/compat/mysql2'
+
+const pool = createMySQLPool({
+  resourceArn: 'arn:...',
+  secretArn: 'arn:...',
+  database: 'myDatabase'
+})
+
+const db = new Kysely<Database>({
+  dialect: new MysqlDialect({ pool: pool as any })
+})
+
+// Use Kysely normally
+const users = await db.selectFrom('users').selectAll().where('id', '=', 123).execute()
+```
+
+**PostgreSQL with Kysely:**
+
+```typescript
+import { Kysely, PostgresDialect } from 'kysely'
+import { createPgPool } from 'data-api-client/compat/pg'
+
+const pool = createPgPool({
+  resourceArn: 'arn:...',
+  secretArn: 'arn:...',
+  database: 'myDatabase'
+})
+
+const db = new Kysely<Database>({
+  dialect: new PostgresDialect({ pool: pool as any })
+})
+
+// Use Kysely normally
+const users = await db.selectFrom('users').selectAll().where('id', '=', 123).execute()
+```
+
+**Benefits of Compatibility Layers:**
+- **Zero code changes** when migrating from mysql2 or pg
+- **Full ORM support** (Drizzle, Kysely)
+- **Automatic retry logic** for cluster wake-ups
+- **Connection pooling simulation** (getConnection, release)
+- **Both Promise and callback APIs** supported
+- **No-op connection management**: `connect()`, `end()`, and `release()` are optional since the Data API is connectionless - they're included only for backward compatibility with existing code
+
+## PostgreSQL Array Support
+
+One of the most powerful features in v2.0 is automatic PostgreSQL array handling. While the Data API has limitations with array _parameters_, array _results_ are fully supported and automatically converted to native JavaScript arrays.
+
+### Array Results (Automatic Conversion)
+
+When you query PostgreSQL arrays, the Data API Client automatically converts them to native JavaScript arrays:
+
+```javascript
+// Query returns PostgreSQL array
+let result = await data.query(`SELECT tags FROM products WHERE id = :id`, { id: 123 })
+
+// Automatic conversion to JavaScript array
+// result.records[0].tags = ['new', 'featured', 'sale']
+```
+
+**Supported Array Types:**
+
+- Integer arrays: `INT[]`, `SMALLINT[]`, `BIGINT[]`
+- Float arrays: `REAL[]`, `DOUBLE PRECISION[]`, `NUMERIC[]`
+- String arrays: `TEXT[]`, `VARCHAR[]`
+- Boolean arrays: `BOOL[]`
+- Date/Time arrays: `DATE[]`, `TIMESTAMP[]`
+- Other types: `UUID[]`, `JSON[]`, `JSONB[]`
+
+### Array Parameters (Workarounds Required)
+
+The RDS Data API does **not support binding array parameters** directly. You'll need to use one of these workarounds:
+
+**1. CSV string with `string_to_array()` (for integer arrays):**
+
+```javascript
+await data.query("INSERT INTO products (tags) VALUES (string_to_array(:csv, ',')::int[])", {
+  csv: '1,2,3'
+})
+```
+
+**2. PostgreSQL array literal syntax:**
+
+```javascript
+await data.query('INSERT INTO products (tags) VALUES (:literal::text[])', {
+  literal: '{"admin","editor","viewer"}'
+})
+```
+
+**3. ARRAY[] constructor with individual parameters:**
+
+```javascript
+await data.query('INSERT INTO products (tags) VALUES (ARRAY[:tag1, :tag2, :tag3])', {
+  tag1: 'blue',
+  tag2: 'sale',
+  tag3: 'featured'
+})
+```
+
+Despite these input limitations, **all array results are automatically converted to native JavaScript arrays**, making it easy to work with PostgreSQL array data in your application.
+
+## PostgreSQL Data Type Support
+
+Version 2.0 provides comprehensive support for PostgreSQL data types:
+
+### Numeric Types
+
+- `SMALLINT`, `INT`, `BIGINT` - Integer types of various sizes
+- `DECIMAL`, `NUMERIC` - Exact numeric types with precision
+- `REAL`, `DOUBLE PRECISION` - Floating-point types
+
+```javascript
+await data.query('INSERT INTO products (price, quantity) VALUES (:price, :quantity)', {
+  price: 19.99,
+  quantity: 100
+})
+```
+
+### String Types
+
+- `CHAR`, `VARCHAR`, `TEXT` - Character types
+- Full Unicode support
+
+```javascript
+await data.query('INSERT INTO posts (title, content) VALUES (:title, :content)', {
+  title: 'Hello 世界 🌍',
+  content: 'A very long text...'
+})
+```
+
+### Boolean Type
+
+```javascript
+await data.query('INSERT INTO users (active) VALUES (:active)', { active: true })
+```
+
+### Date and Time Types
+
+- `DATE` - Calendar date
+- `TIME`, `TIME WITH TIME ZONE` - Time of day
+- `TIMESTAMP`, `TIMESTAMP WITH TIME ZONE` - Date and time
+
+```javascript
+await data.query('INSERT INTO events (event_date, event_time) VALUES (:date, :time)', {
+  date: '2024-12-25',
+  time: new Date()
+})
+```
+
+### Binary Data (BYTEA)
+
+```javascript
+const binaryData = Buffer.from('Binary content', 'utf-8')
+await data.query('INSERT INTO files (content) VALUES (:content)', { content: binaryData })
+```
+
+### JSON and JSONB
+
+```javascript
+const metadata = { role: 'admin', permissions: ['read', 'write'] }
+await data.query('INSERT INTO users (metadata) VALUES (:metadata::jsonb)', {
+  metadata: JSON.stringify(metadata)
+})
+
+// Query result
+let result = await data.query('SELECT metadata FROM users WHERE id = :id', { id: 1 })
+const parsed = JSON.parse(result.records[0].metadata)
+```
+
+### UUID
+
+```javascript
+await data.query('INSERT INTO sessions (session_id) VALUES (:id::uuid)', {
+  id: '550e8400-e29b-41d4-a716-446655440000'
+})
+
+// Or with explicit cast parameter
+await data.query('INSERT INTO sessions (session_id) VALUES (:id)', [
+  { name: 'id', value: '550e8400-e29b-41d4-a716-446655440000', cast: 'uuid' }
+])
+```
+
+### Network Types
+
+- `INET` - IPv4 or IPv6 host address
+- `CIDR` - IPv4 or IPv6 network
+
+```javascript
+await data.query('INSERT INTO servers (ip_address, network) VALUES (:ip::inet, :net::cidr)', {
+  ip: '192.168.1.1',
+  net: '10.0.0.0/8'
+})
+```
+
+### Range Types
+
+- `INT4RANGE`, `NUMRANGE` - Numeric ranges
+- `TSTZRANGE` - Timestamp ranges
+
+```javascript
+await data.query('INSERT INTO bookings (date_range) VALUES (:range::INT4RANGE)', {
+  range: '[1,10)'
+})
+```
+
+## TypeScript Support
+
+Version 2.0 is written in TypeScript and provides comprehensive type definitions:
+
+```typescript
+import dataApiClient from 'data-api-client'
+import type { DataAPIClientConfig, QueryResult } from 'data-api-client/types'
+
+const config: DataAPIClientConfig = {
+  secretArn: 'arn:...',
+  resourceArn: 'arn:...',
+  database: 'mydb',
+  engine: 'pg'
+}
+
+const client = dataApiClient(config)
+
+interface User {
+  id: number
+  name: string
+  email: string
+  tags: string[]
+}
+
+const result: QueryResult<User> = await client.query<User>('SELECT * FROM users WHERE id = :id', { id: 123 })
+```
+
+## Data API Limitations / Wonkiness
+
+While the Data API is powerful, there are some limitations to be aware of:
+
+### Array Parameters Not Supported
+
+The RDS Data API does **not support binding array parameters** directly. Attempts to use `arrayValue` parameters result in `ValidationException: Array parameters are not supported`. See [PostgreSQL Array Support](#postgresql-array-support) for workarounds.
+
+### Array Results ARE Supported
+
+Despite parameter limitations, array **results** work great! The Data API Client automatically converts PostgreSQL arrays in query results to native JavaScript arrays.
+
+### Some Advanced Types Have Limitations
+
+- **MACADDR**: Not supported by the Data API
+- **Multidimensional Arrays**: Limited support for arrays with more than one dimension
+- **NULL values in arrays**: May not work correctly in all cases
+- **Some Range Types**: INT8RANGE, DATERANGE, TSRANGE have casting issues
 
-### Batch statements do not give you updated record counts
+### Batch operations have limited feedback
 
-This one is a bit frustrating. If you execute a standard `executeStatement`, then it will return a `numberOfRecordsUpdated` field for `UPDATE` and `DELETE` queries. This is handy for knowing if your query succeeded. Unfortunately, a `batchExecuteStatement` does not return this field for you.
+Batch operations don't return `numberOfRecordsUpdated` for UPDATE/DELETE statements.
 
 ## Enabling Data API
 
-In order to use the Data API, you must enable it on your Aurora Serverless Cluster and create a Secret. You also must grant your execution environment a number of permission as outlined in the following sections.
+In order to use the Data API, you must enable it on your Aurora Serverless Cluster and create a Secret. You also must grant your execution environment a number of permissions as outlined in the following sections.
 
-### Enable Data API on your Aurora Serverless Cluster
+### Enable Data API on your Aurora Cluster
 
 ![Enable Data API in Network & Security settings of your cluster](https://user-images.githubusercontent.com/2053544/58768968-79ee4300-8570-11e9-9266-1433182e0db2.png)
 
-You need to modify your Aurora Serverless cluster by clicking “ACTIONS” and then “Modify Cluster”. Just check the Data API box in the _Network & Security_ section and you’re good to go. Remember that your Aurora Serverless cluster still runs in a VPC, even though you don’t need to run your Lambdas in a VPC to access it via the Data API.
+You need to modify your Aurora cluster by clicking "ACTIONS" and then "Modify Cluster". Check the Data API box in the _Network & Security_ section and you're good to go. This works for Aurora Serverless v1, Aurora Serverless v2, and Aurora provisioned clusters.
 
 ### Set up a secret in the Secrets Manager
 
@@ -426,11 +919,11 @@ Next you need to set up a secret in the Secrets Manager. This is actually quite
 
 ![Enter database credentials and select database to access](https://user-images.githubusercontent.com/2053544/58768974-912d3080-8570-11e9-8878-636dfb742b00.png)
 
-Next we give it a name, this is important, because this will be part of the arn when we set up permissions later. You can give it a description as well so you don’t forget what this secret is about when you look at it in a few weeks.
+Next we give it a name, this is important, because this will be part of the arn when we set up permissions later. You can give it a description as well so you don't forget what this secret is about when you look at it in a few weeks.
 
 ![Give your secret a name and add a description](https://user-images.githubusercontent.com/2053544/58768984-a7d38780-8570-11e9-8b21-199db5548c73.png)
 
-You can then configure your rotation settings, if you want, and then you review and create your secret. Then you can click on your newly created secret and grab the arn, we’re gonna need that next.
+You can then configure your rotation settings, if you want, and then you review and create your secret. Then you can click on your newly created secret and grab the arn, we're gonna need that next.
 
 ![Click on your secret to get the arn.](https://user-images.githubusercontent.com/2053544/58768989-bae65780-8570-11e9-94fb-51f6fa7d34bf.png)
 
@@ -483,4 +976,4 @@ Statement:
 
 ## Contributions
 
-Contributions, ideas and bug reports are welcome and greatly appreciated. Please add [issues](https://github.com/jeremydaly/data-api-client/issues) for suggestions and bug reports or create a pull request. You can also contact me on Twitter: [@jeremy_daly](https://twitter.com/jeremy_daly).
+Contributions, ideas and bug reports are welcome and greatly appreciated. Please add [issues](https://github.com/jeremydaly/data-api-client/issues) for suggestions and bug reports or create a pull request. You can also contact me on X: [@jeremy_daly](https://x.com/jeremy_daly) or LinkedIn: [https://www.linkedin.com/in/jeremydaly/](https://www.linkedin.com/in/jeremydaly/).