Updated column introspection query to work with CockroachDB v22.2

The is_generated column in the information_schema changed from YES/NO to
ALWAYS/NEVER.

Author: rafiss

CHANGES.md

@@ -3,6 +3,7 @@ Unreleased
 
 - Added `include_hidden` option to `get_columns()` to enable reflection of columns like "rowid". (#173)
 - Added support for `.with_hint()` (patch courtesy of Jonathan Dieter)
+- Updated column introspection query to work with CockroachDB v22.2.
 
 # Version 1.4.3
 Released December 10, 2021

circle.yml

@@ -1,19 +1,19 @@
 version: 2
 
-.x-cockroach-19.2: &cockroach-19-2
-  image: cockroachdb/cockroach:v19.2.12
+.x-cockroach-21.1: &cockroach-21-1
+  image: cockroachdb/cockroach:v21.1.19
   command: start-single-node --insecure
 
-.x-cockroach-20.1: &cockroach-20-1
-  image: cockroachdb/cockroach:v20.1.17
+.x-cockroach-21.2: &cockroach-21-2
+  image: cockroachdb/cockroach:v21.2.15
   command: start-single-node --insecure
 
-.x-cockroach-20.2: &cockroach-20-2
-  image: cockroachdb/cockroach:v20.2.11
+.x-cockroach-22.1: &cockroach-22-1
+  image: cockroachdb/cockroach:v22.1.6
   command: start-single-node --insecure
 
-.x-cockroach-21.1: &cockroach-21-1
-  image: cockroachdb/cockroach:v21.1.2
+.x-cockroach-22.2: &cockroach-22-2
+  image: cockroachdb/cockroach-unstable:v22.2.0-alpha.2
   command: start-single-node --insecure
 
 .x-tox-version: &tox-version
@@ -38,31 +38,33 @@ version: 2
         command: ${HOME}/.local/bin/tox
 
 jobs:
-  test-py39-19.2:
+  test-py39-21.1:
     docker:
       - image: circleci/python:3.9
-      - *cockroach-19-2
+      - *cockroach-21-1
     <<: *test-steps
     <<: *py39
 
-  test-py39-20.1:
+  test-py39-21.2:
     docker:
       - image: circleci/python:3.9
-      - *cockroach-20-1
+      - *cockroach-21-2
     <<: *test-steps
     <<: *py39
 
-  test-py39-20.2:
+
+  test-py39-22.1:
     docker:
       - image: circleci/python:3.9
-      - *cockroach-20-2
+      - *cockroach-22-1
     <<: *test-steps
     <<: *py39
 
-  test-py39-21.1:
+
+  test-py39-22.2:
     docker:
       - image: circleci/python:3.9
-      - *cockroach-21-1
+      - *cockroach-22-2
     <<: *test-steps
     <<: *py39
 
@@ -84,8 +86,8 @@ workflows:
   version: 2
   test-and-lint:
     jobs:
-      - test-py39-19.2
-      - test-py39-20.1
-      - test-py39-20.2
       - test-py39-21.1
+      - test-py39-21.2
+      - test-py39-22.1
+      - test-py39-22.2
       - lint

sqlalchemy_cockroachdb/base.py

@@ -209,7 +209,9 @@ def get_columns(self, conn, table_name, schema=None, **kw):
             sql = (
                 "SELECT column_name, data_type, is_nullable::bool, column_default, "
                 "numeric_precision, numeric_scale, character_maximum_length, "
-                "is_generated::bool, generation_expression, is_hidden::bool "
+                "CASE is_generated WHEN 'ALWAYS' THEN true WHEN 'NEVER' THEN false "
+                "ELSE is_generated::bool END AS is_generated, "
+                "generation_expression, is_hidden::bool "
                 "FROM information_schema.columns "
                 "WHERE table_schema = :table_schema AND table_name = :table_name "
             )