diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index 0ffafc9ee8..d0af842404 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -8,6 +8,8 @@
 use Drupal\Core\Database\DatabaseNotFoundException;
 use Drupal\Core\Database\StatementInterface;
 
+// cSpell:ignore ilike nextval
+
 /**
  * @addtogroup database
  * @{
@@ -258,7 +260,7 @@ public function mapConditionOperator($operator) {
   public function nextId($existing = 0) {
 
     // Retrieve the name of the sequence. This information cannot be cached
-    // because the prefix may change, for example, like it does in simpletests.
+    // because the prefix may change, for example, like it does in tests.
     $sequence_name = $this->makeSequenceName('sequences', 'value');
 
     // When PostgreSQL gets a value too small then it will lock the table,
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
index 2a7ef3686b..5fc6a214c6 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
@@ -5,6 +5,8 @@
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\Query\Insert as QueryInsert;
 
+// cSpell:ignore nextval setval
+
 /**
  * @ingroup database
  * @{
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 6cf476414d..1e7c4b6dca 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -6,6 +6,12 @@
 use Drupal\Core\Database\SchemaObjectDoesNotExistException;
 use Drupal\Core\Database\Schema as DatabaseSchema;
 
+// cSpell:ignore adbin adnum adrelid adsrc attisdropped attname attnum attrdef
+// cSpell:ignore attrelid atttypid atttypmod bigserial conkey conname conrelid
+// cSpell:ignore contype fillfactor indexname indexrelid indisprimary indkey
+// cSpell:ignore indrelid nextval nspname regclass relkind relname relnamespace
+// cSpell:ignore schemaname setval
+
 /**
  * @addtogroup schemaapi
  * @{
@@ -566,6 +572,7 @@ public function renameTable($table, $new_name) {
 
       // If the index is already rewritten by ensureIdentifiersLength() to not
       // exceed the 63 chars limit of PostgreSQL, we need to take care of that.
+      // cSpell:disable-next-line
       // Example (drupal_Gk7Su_T1jcBHVuvSPeP22_I3Ni4GrVEgTYlIYnBJkro_idx).
       if (strpos($index->indexname, 'drupal_') !== FALSE) {
         preg_match('/^drupal_(.*)_' . preg_quote($index_type) . '/', $index->indexname, $matches);
@@ -945,12 +952,12 @@ public function changeField($table, $field, $field_new, $spec, $new_keys = []) {
 
     if (isset($spec['not null'])) {
       if ($spec['not null']) {
-        $nullaction = 'SET NOT NULL';
+        $null_action = 'SET NOT NULL';
       }
       else {
-        $nullaction = 'DROP NOT NULL';
+        $null_action = 'DROP NOT NULL';
       }
-      $this->connection->query('ALTER TABLE {' . $table . '} ALTER "' . $field . '" ' . $nullaction);
+      $this->connection->query('ALTER TABLE {' . $table . '} ALTER "' . $field . '" ' . $null_action);
     }
 
     if (in_array($spec['pgsql_type'], ['serial', 'bigserial'])) {
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
index a4c168005f..df63e13784 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
@@ -4,6 +4,8 @@
 
 use Drupal\Core\Database\Query\Upsert as QueryUpsert;
 
+// cSpell:ignore nextval setval
+
 /**
  * PostgreSQL implementation of \Drupal\Core\Database\Query\Upsert.
  */
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 3c75df511c..c56cd6f27a 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -10,15 +10,11 @@ accesslog
 accum
 actionid
 adamson
-adbin
 addedline
 addtogroup
 admin's
 adminforms
 adminlabel
-adnum
-adrelid
-adsrc
 aewesome
 aflopend
 afterbegin
@@ -86,17 +82,10 @@ atomentry
 atomfeed
 atomrendererfeed
 atsign
-attisdropped
-attname
-attnum
-attrdef
-attrelid
 attributename
 attrlist
 attrval
 attrvals
-atttypid
-atttypmod
 auditable
 auth's
 authless
@@ -175,7 +164,6 @@ bgcolor
 bgred
 bgsound
 bigpipe
-bigserial
 bikeshed
 bikesheds
 bing
@@ -327,10 +315,7 @@ configurability
 configurator
 confirm's
 conformant
-conkey
-conname
 conneg
-conrelid
 contant
 contaynz
 contentblock
@@ -342,7 +327,6 @@ contextuals
 contrained
 contribs
 controlgroup
-contype
 coord
 copmplete
 corefake
@@ -633,7 +617,6 @@ filestorage
 filesystems
 filetransfer
 filevalidationerror
-fillfactor
 filterprovider
 filtertypes
 findwith
@@ -799,7 +782,6 @@ iframes
 iframeupload
 ignoretag
 iids
-ilike
 imageapi
 imagecache
 imagecreatefrom
@@ -810,10 +792,6 @@ imagemagick
 imagetest
 inator
 indexname
-indexrelid
-indisprimary
-indkey
-indrelid
 ingoa
 inited
 inno
@@ -857,7 +835,6 @@ janvier
 javascripts
 jcbfyr
 jessebeach
-jkro
 jnoub
 johansson
 johndoe
@@ -1136,7 +1113,6 @@ newname
 newnode
 newstr
 newterm
-nextval
 nfocus
 nids
 nightlies
@@ -1199,13 +1175,11 @@ nplurals
 npoll
 nprofile
 nresponse
-nspname
 nstrings
 nsync
 ntaxonomy
 ntfs
 nturn
-nullaction
 nyan
 nyancat
 nyans
@@ -1447,7 +1421,6 @@ referencer
 referencers
 referer
 refinable
-regclass
 regexes
 rehydrated
 reimplement
@@ -1458,9 +1431,6 @@ reinitializes
 reinject
 reinstantiated
 reiss
-relkind
-relname
-relnamespace
 removeformat
 renderable
 renderables
@@ -1533,7 +1503,6 @@ scaffol
 scarlett
 schemaapi
 schemaless
-schemaname
 schemeless
 schipul
 schipulcon
@@ -1563,7 +1532,6 @@ sess
 sessionpath
 settingstray
 setttings
-setval
 sharedspace
 shatner
 shorterthan
@@ -1577,7 +1545,6 @@ silverlight
 silvie
 simpletest
 simpletest's
-simpletests
 singlebyte
 sioc
 sioct
@@ -1989,7 +1956,6 @@ uploadsize
 uppercased
 upscaling
 upsert
-upserting
 upto
 urandom
 uri's
diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php
index a9a4aeb7af..48c835da08 100644
--- a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php
@@ -5,6 +5,8 @@
 use Drupal\Core\Database\Driver\pgsql\Schema;
 use Drupal\Tests\UnitTestCase;
 
+// cSpell:ignore conname
+
 /**
  * @coversDefaultClass \Drupal\Core\Database\Driver\pgsql\Schema
  * @group Database