diff --git a/packages/pg/lib/utils.js b/packages/pg/lib/utils.js
index 1d3f5aa85..e23a55e9a 100644
--- a/packages/pg/lib/utils.js
+++ b/packages/pg/lib/utils.js
@@ -176,6 +176,14 @@ const escapeLiteral = function (str) {
 let hasBackslash = false
 let escaped = "'"
 
+ if (str == null) {
+ return "''"
+ }
+
+ if (typeof str !== 'string') {
+ return "''"
+ }
+
 for (let i = 0; i < str.length; i++) {
 const c = str[i]
 if (c === "'") {
diff --git a/packages/pg/test/unit/utils-tests.js b/packages/pg/test/unit/utils-tests.js
index 0e79e6265..5f75f6c2d 100644
--- a/packages/pg/test/unit/utils-tests.js
+++ b/packages/pg/test/unit/utils-tests.js
@@ -232,35 +232,46 @@ test('prepareValue: can safely be used to map an array of values including those
 })
 
 const testEscapeLiteral = function (testName, input, expected) {
- test(testName, function () {
+ test(`escapeLiteral: ${testName}`, function () {
 const actual = utils.escapeLiteral(input)
 assert.equal(expected, actual)
 })
 }
-testEscapeLiteral('escapeLiteral: no special characters', 'hello world', "'hello world'")
 
-testEscapeLiteral('escapeLiteral: contains double quotes only', 'hello " world', "'hello \" world'")
+testEscapeLiteral('no special characters', 'hello world', "'hello world'")
 
-testEscapeLiteral('escapeLiteral: contains single quotes only', "hello ' world", "'hello '' world'")
+testEscapeLiteral('contains double quotes only', 'hello " world', "'hello \" world'")
 
-testEscapeLiteral('escapeLiteral: contains backslashes only', 'hello \\ world', " E'hello \\\\ world'")
+testEscapeLiteral('contains single quotes only', "hello ' world", "'hello '' world'")
 
-testEscapeLiteral('escapeLiteral: contains single quotes and double quotes', 'hello \' " world', "'hello '' \" world'")
+testEscapeLiteral('contains backslashes only', 'hello \\ world', " E'hello \\\\ world'")
 
-testEscapeLiteral(
- 'escapeLiteral: contains double quotes and backslashes',
- 'hello \\ " world',
- " E'hello \\\\ \" world'"
-)
+testEscapeLiteral('contains single quotes and double quotes', 'hello \' " world', "'hello '' \" world'")
 
-testEscapeLiteral(
- 'escapeLiteral: contains single quotes and backslashes',
- "hello \\ ' world",
- " E'hello \\\\ '' world'"
-)
+testEscapeLiteral('date', new Date(), "''")
+
+testEscapeLiteral('null', null, "''")
+
+testEscapeLiteral('undefined', undefined, "''")
+
+testEscapeLiteral('boolean', false, "''")
+
+testEscapeLiteral('number', 1, "''")
+
+testEscapeLiteral('number', 1, "''")
+
+testEscapeLiteral('boolean', true, "''")
+
+testEscapeLiteral('array', [1, 2, 3], "''")
+
+testEscapeLiteral('object', { x: 42 }, "''")
+
+testEscapeLiteral('contains double quotes and backslashes', 'hello \\ " world', " E'hello \\\\ \" world'")
+
+testEscapeLiteral('contains single quotes and backslashes', "hello \\ ' world", " E'hello \\\\ '' world'")
 
 testEscapeLiteral(
- 'escapeLiteral: contains single quotes, double quotes, and backslashes',
+ 'contains single quotes, double quotes, and backslashes',
 'hello \\ \' " world',
 " E'hello \\\\ '' \" world'"
 )
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/brianc/node-postgres/pull/3489.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/brianc/node-postgres/pull/3489.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>