Implement information_schema views and tables, add as schema

go.mod

@@ -8,11 +8,11 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a
 	github.com/cockroachdb/errors v1.7.5
-	github.com/dolthub/dolt/go v0.40.5-0.20240925205751-f7384c0fe704
+	github.com/dolthub/dolt/go v0.40.5-0.20240926175902-e175b89e4600
 	github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
 	github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662
-	github.com/dolthub/go-mysql-server v0.18.2-0.20240923181307-5aacdb13e45a
+	github.com/dolthub/go-mysql-server v0.18.2-0.20240926171723-77ed13c03196
 	github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
 	github.com/dolthub/vitess v0.0.0-20240919225659-2ad81685e772
 	github.com/fatih/color v1.13.0

go.sum

@@ -214,8 +214,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dolthub/dolt/go v0.40.5-0.20240925205751-f7384c0fe704 h1:w1T25FRf0SxBuha5R3RJChY/p4wT3/J0htpBsaJFW6c=
-github.com/dolthub/dolt/go v0.40.5-0.20240925205751-f7384c0fe704/go.mod h1:1HBB+xUaDISZ6GrUmiiD//Ij5wExAAV1nPDpU4xPrmg=
+github.com/dolthub/dolt/go v0.40.5-0.20240926175902-e175b89e4600 h1:dcaJH/tRwnfLia76SvQQcYCbG4m0oLHzBNA2sgIV79I=
+github.com/dolthub/dolt/go v0.40.5-0.20240926175902-e175b89e4600/go.mod h1:kVrjmh+pen/366qrGbY8mdW1WVCsAGjAmwZApoyf2fo=
 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d h1:RZkQeYOrDrOWzCxaP2ttkvg4E2TM9n8lnEsIBLKjqkM=
 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d/go.mod h1:L5RDYZbC9BBWmoU2+TjTekeqqhFXX5EqH9ln00O0stY=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
@@ -224,8 +224,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
 github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240923181307-5aacdb13e45a h1:rpCmZj332eiBbzsHsq3Sj5AWzl3Q7szDObwI49UqA8Y=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240923181307-5aacdb13e45a/go.mod h1:lGbU2bK+QNnlETdUjOOaE+UnlEUu31VaQOFKAFGyZN4=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240926171723-77ed13c03196 h1:H4bKFiOdjmhBrdjrNvYAuhfplpHM3aVFcbLXlGoD/Fc=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240926171723-77ed13c03196/go.mod h1:lGbU2bK+QNnlETdUjOOaE+UnlEUu31VaQOFKAFGyZN4=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=

server/connection_handler.go

@@ -914,21 +914,21 @@ func (h *ConnectionHandler) handledPSQLCommands(statement string) (bool, error)
 	// Command: \dt
 	if statement == "select n.nspname as \"schema\",\n  c.relname as \"name\",\n  case c.relkind when 'r' then 'table' when 'v' then 'view' when 'm' then 'materialized view' when 'i' then 'index' when 's' then 'sequence' when 't' then 'toast table' when 'f' then 'foreign table' when 'p' then 'partitioned table' when 'i' then 'partitioned index' end as \"type\",\n  pg_catalog.pg_get_userbyid(c.relowner) as \"owner\"\nfrom pg_catalog.pg_class c\n     left join pg_catalog.pg_namespace n on n.oid = c.relnamespace\n     left join pg_catalog.pg_am am on am.oid = c.relam\nwhere c.relkind in ('r','p','')\n      and n.nspname <> 'pg_catalog'\n      and n.nspname !~ '^pg_toast'\n      and n.nspname <> 'information_schema'\n  and pg_catalog.pg_table_is_visible(c.oid)\norder by 1,2;" {
 		return true, h.query(ConvertedQuery{
-			String:       `SELECT table_schema AS 'Schema', TABLE_NAME AS 'Name', 'table' AS 'Type', 'postgres' AS 'Owner' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'pg_catalog' AND CONVERT(TABLE_TYPE, CHAR) = 'BASE TABLE' ORDER BY 2;`,
+			String:       `SELECT table_schema AS 'Schema', TABLE_NAME AS 'Name', 'table' AS 'Type', 'postgres' AS 'Owner' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'pg_catalog' AND TABLE_SCHEMA <> 'information_schema' AND CONVERT(TABLE_TYPE, CHAR) = 'BASE TABLE' ORDER BY 2;`,
 			StatementTag: "SELECT",
 		})
 	}
 	// Command: \d
 	if statement == "select n.nspname as \"schema\",\n  c.relname as \"name\",\n  case c.relkind when 'r' then 'table' when 'v' then 'view' when 'm' then 'materialized view' when 'i' then 'index' when 's' then 'sequence' when 't' then 'toast table' when 'f' then 'foreign table' when 'p' then 'partitioned table' when 'i' then 'partitioned index' end as \"type\",\n  pg_catalog.pg_get_userbyid(c.relowner) as \"owner\"\nfrom pg_catalog.pg_class c\n     left join pg_catalog.pg_namespace n on n.oid = c.relnamespace\n     left join pg_catalog.pg_am am on am.oid = c.relam\nwhere c.relkind in ('r','p','v','m','s','f','')\n      and n.nspname <> 'pg_catalog'\n      and n.nspname !~ '^pg_toast'\n      and n.nspname <> 'information_schema'\n  and pg_catalog.pg_table_is_visible(c.oid)\norder by 1,2;" {
 		return true, h.query(ConvertedQuery{
-			String:       `SELECT table_schema AS 'Schema', TABLE_NAME AS 'Name', IF(TABLE_TYPE = 'VIEW', 'view', 'table') AS 'Type', 'postgres' AS 'Owner' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'pg_catalog' AND CONVERT(TABLE_TYPE, CHAR) = 'BASE TABLE' OR CONVERT(TABLE_TYPE, CHAR) = 'VIEW' ORDER BY 2;`,
+			String:       `SELECT table_schema AS 'Schema', TABLE_NAME AS 'Name', IF(TABLE_TYPE = 'VIEW', 'view', 'table') AS 'Type', 'postgres' AS 'Owner' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'pg_catalog' AND TABLE_SCHEMA <> 'information_schema' AND CONVERT(TABLE_TYPE, CHAR) = 'BASE TABLE' OR CONVERT(TABLE_TYPE, CHAR) = 'VIEW' ORDER BY 2;`,
 			StatementTag: "SELECT",
 		})
 	}
 	// Alternate \d for psql 14
 	if statement == "select n.nspname as \"schema\",\n  c.relname as \"name\",\n  case c.relkind when 'r' then 'table' when 'v' then 'view' when 'm' then 'materialized view' when 'i' then 'index' when 's' then 'sequence' when 's' then 'special' when 't' then 'toast table' when 'f' then 'foreign table' when 'p' then 'partitioned table' when 'i' then 'partitioned index' end as \"type\",\n  pg_catalog.pg_get_userbyid(c.relowner) as \"owner\"\nfrom pg_catalog.pg_class c\n     left join pg_catalog.pg_namespace n on n.oid = c.relnamespace\n     left join pg_catalog.pg_am am on am.oid = c.relam\nwhere c.relkind in ('r','p','v','m','s','f','')\n      and n.nspname <> 'pg_catalog'\n      and n.nspname !~ '^pg_toast'\n      and n.nspname <> 'information_schema'\n  and pg_catalog.pg_table_is_visible(c.oid)\norder by 1,2;" {
 		return true, h.query(ConvertedQuery{
-			String:       `SELECT table_schema AS 'Schema', TABLE_NAME AS 'Name', IF(TABLE_TYPE = 'VIEW', 'view', 'table') AS 'Type', 'postgres' AS 'Owner' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'pg_catalog' AND CONVERT(TABLE_TYPE, CHAR) = 'BASE TABLE' OR CONVERT(TABLE_TYPE, CHAR) = 'VIEW' ORDER BY 2;`,
+			String:       `SELECT table_schema AS 'Schema', TABLE_NAME AS 'Name', IF(TABLE_TYPE = 'VIEW', 'view', 'table') AS 'Type', 'postgres' AS 'Owner' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'pg_catalog' AND TABLE_SCHEMA <> 'information_schema' AND CONVERT(TABLE_TYPE, CHAR) = 'BASE TABLE' OR CONVERT(TABLE_TYPE, CHAR) = 'VIEW' ORDER BY 2;`,
 			StatementTag: "SELECT",
 		})
 	}
@@ -955,7 +955,7 @@ func (h *ConnectionHandler) handledPSQLCommands(statement string) (bool, error)
 	// Command: \dv
 	if statement == "select n.nspname as \"schema\",\n  c.relname as \"name\",\n  case c.relkind when 'r' then 'table' when 'v' then 'view' when 'm' then 'materialized view' when 'i' then 'index' when 's' then 'sequence' when 't' then 'toast table' when 'f' then 'foreign table' when 'p' then 'partitioned table' when 'i' then 'partitioned index' end as \"type\",\n  pg_catalog.pg_get_userbyid(c.relowner) as \"owner\"\nfrom pg_catalog.pg_class c\n     left join pg_catalog.pg_namespace n on n.oid = c.relnamespace\nwhere c.relkind in ('v','')\n      and n.nspname <> 'pg_catalog'\n      and n.nspname !~ '^pg_toast'\n      and n.nspname <> 'information_schema'\n  and pg_catalog.pg_table_is_visible(c.oid)\norder by 1,2;" {
 		return true, h.query(ConvertedQuery{
-			String:       `SELECT table_schema AS 'Schema', TABLE_NAME AS 'Name', 'view' AS 'Type', 'postgres' AS 'Owner' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'pg_catalog' AND TABLE_TYPE = 'VIEW' ORDER BY 2;`,
+			String:       `SELECT table_schema AS 'Schema', TABLE_NAME AS 'Name', 'view' AS 'Type', 'postgres' AS 'Owner' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'pg_catalog' AND TABLE_SCHEMA <> 'information_schema' AND TABLE_TYPE = 'VIEW' ORDER BY 2;`,
 			StatementTag: "SELECT",
 		})
 	}

server/tables/information_schema/databases.go

@@ -56,21 +56,7 @@ func allDatabasesWithNames(ctx *sql.Context, cat sql.Catalog, privCheck bool) ([
 					})
 				}
 			}
-
-			if len(dbsForSchema) > 0 {
-				// TODO: information_schema should be included in the schema list
-				infoSchemaDB, err := cat.Database(ctx, sql.InformationSchemaDatabaseName)
-				if err != nil {
-					return nil, err
-				}
-				dbsForSchema = append(dbsForSchema, information_schema.DbWithNames{
-					Database:    infoSchemaDB,
-					CatalogName: sdb.Name(),
-					SchemaName:  sql.InformationSchemaDatabaseName,
-				})
-
-				dbs = append(dbs, dbsForSchema...)
-			}
+			dbs = append(dbs, dbsForSchema...)
 		}
 	}
 

server/tables/information_schema/init.go

@@ -20,7 +20,9 @@ import (
 
 // Init handles initialization of all Postgres-specific and Doltgres-specific information_schema tables.
 func Init() {
+	information_schema.AllDatabasesWithNames = allDatabasesWithNames
 	information_schema.NewColumnsTable = newColumnsTable
 	information_schema.NewSchemataTable = newSchemataTable
-	information_schema.AllDatabasesWithNames = allDatabasesWithNames
+	information_schema.NewTablesTable = newTablesTable
+	information_schema.NewViewsTable = newViewsTable
 }

server/tables/information_schema/schemata_table.go

@@ -41,7 +41,7 @@ var schemataSchema = sql.Schema{
 
 // schemataRowIter implements the sql.RowIter for the information_schema.SCHEMATA table.
 func schemataRowIter(ctx *sql.Context, c sql.Catalog) (sql.RowIter, error) {
-	dbs, err := information_schema.AllDatabasesWithNames(ctx, c, false)
+	dbs, err := allDatabasesWithNames(ctx, c, false)
 	if err != nil {
 		return nil, err
 	}

server/tables/information_schema/tables_table.go

@@ -0,0 +1,96 @@
+// Copyright 2022 Dolthub, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package information_schema
+
+import (
+	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/information_schema"
+
+	"github.com/dolthub/doltgresql/server/types/oid"
+)
+
+// newTablesTable returns a InformationSchemaTable for MySQL.
+func newTablesTable() *information_schema.InformationSchemaTable {
+	return &information_schema.InformationSchemaTable{
+		TableName:   information_schema.TablesTableName,
+		TableSchema: tablesSchema,
+		Reader:      tablesRowIter,
+	}
+}
+
+// tablesSchema is the schema for the information_schema.TABLES table.
+var tablesSchema = sql.Schema{
+	{Name: "table_catalog", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "table_schema", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "table_name", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "table_type", Type: character_data, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "self_referencing_column_name", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "reference_generation", Type: character_data, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "user_defined_type_catalog", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "user_defined_type_schema", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "user_defined_type_name", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "is_insertable_into", Type: yes_or_no, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "is_typed", Type: yes_or_no, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+	{Name: "commit_action", Type: yes_or_no, Default: nil, Nullable: true, Source: information_schema.TablesTableName},
+}
+
+// tablesRowIter implements the sql.RowIter for the information_schema.TABLES table.
+func tablesRowIter(ctx *sql.Context, cat sql.Catalog) (sql.RowIter, error) {
+	var rows []sql.Row
+
+	err := oid.IterateCurrentDatabase(ctx, oid.Callbacks{
+		Table: func(ctx *sql.Context, schema oid.ItemSchema, table oid.ItemTable) (cont bool, err error) {
+			// TODO: Foreign and temporary tables.
+			rows = append(rows, sql.Row{
+				schema.Item.Name(),       // table_catalog
+				schema.Item.SchemaName(), // table_schema
+				table.Item.Name(),        // table_name
+				"BASE TABLE",             // table_type
+				nil,                      // self_referencing_column_name
+				nil,                      // reference_generation
+				nil,                      // user_defined_type_catalog
+				nil,                      // user_defined_type_schema
+				nil,                      // user_defined_type_name
+				"YES",                    // is_insertable_into
+				"NO",                     // is_typed
+				nil,                      // commit_action
+			})
+			return true, nil
+		},
+		View: func(ctx *sql.Context, schema oid.ItemSchema, view oid.ItemView) (cont bool, err error) {
+			// TODO: Fill out the rest of the columns.
+			rows = append(rows, sql.Row{
+				schema.Item.Name(),       // table_catalog
+				schema.Item.SchemaName(), // table_schema
+				view.Item.Name,           // table_name
+				"VIEW",                   // table_type
+				nil,                      // self_referencing_column_name
+				nil,                      // reference_generation
+				nil,                      // user_defined_type_catalog
+				nil,                      // user_defined_type_schema
+				nil,                      // user_defined_type_name
+				nil,                      // is_insertable_into
+				"NO",                     // is_typed
+				nil,                      // commit_action
+			})
+			return true, nil
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return sql.RowsToRowIter(rows...), nil
+}

server/tables/information_schema/views_table.go

@@ -0,0 +1,98 @@
+// Copyright 2022 Dolthub, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package information_schema
+
+import (
+	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/information_schema"
+
+	"github.com/dolthub/doltgresql/postgres/parser/parser"
+	"github.com/dolthub/doltgresql/postgres/parser/sem/tree"
+	"github.com/dolthub/doltgresql/server/types/oid"
+)
+
+// newViewsTable creates a new information_schema.VIEWS table.
+func newViewsTable() *information_schema.InformationSchemaTable {
+	return &information_schema.InformationSchemaTable{
+		TableName:   information_schema.ViewsTableName,
+		TableSchema: viewsSchema,
+		Reader:      viewsRowIter,
+	}
+}
+
+// viewsSchema is the schema for the information_schema.VIEWS table.
+var viewsSchema = sql.Schema{
+	{Name: "table_catalog", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.ViewsTableName},
+	{Name: "table_schema", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.ViewsTableName},
+	{Name: "table_name", Type: sql_identifier, Default: nil, Nullable: true, Source: information_schema.ViewsTableName},
+	{Name: "view_definition", Type: character_data, Default: nil, Nullable: true, Source: information_schema.ViewsTableName},
+	{Name: "check_option", Type: character_data, Default: nil, Nullable: true, Source: information_schema.ViewsTableName},
+	{Name: "is_updatable", Type: yes_or_no, Default: nil, Nullable: true, Source: information_schema.ViewsTableName},
+	{Name: "is_insertable_into", Type: yes_or_no, Default: nil, Nullable: true, Source: information_schema.ViewsTableName},
+	{Name: "is_trigger_updatable", Type: yes_or_no, Default: nil, Nullable: true, Source: information_schema.ViewsTableName},
+	{Name: "is_trigger_deletable", Type: yes_or_no, Default: nil, Nullable: false, Source: information_schema.ViewsTableName},
+	{Name: "is_trigger_insertable_into", Type: yes_or_no, Default: nil, Nullable: false, Source: information_schema.ViewsTableName},
+}
+
+// viewsRowIter implements the sql.RowIter for the information_schema.VIEWS table.
+func viewsRowIter(ctx *sql.Context, catalog sql.Catalog) (sql.RowIter, error) {
+	var rows []sql.Row
+
+	err := oid.IterateCurrentDatabase(ctx, oid.Callbacks{
+		View: func(ctx *sql.Context, schema oid.ItemSchema, view oid.ItemView) (cont bool, err error) {
+			stmts, err := parser.Parse(view.Item.CreateViewStatement)
+			if err != nil {
+				return false, err
+			}
+			if len(stmts) == 0 {
+				return false, sql.ErrViewCreateStatementInvalid.New(view.Item.CreateViewStatement)
+			}
+			cv, ok := stmts[0].AST.(*tree.CreateView)
+			if !ok {
+				return false, sql.ErrViewCreateStatementInvalid.New(view.Item.CreateViewStatement)
+			}
+
+			viewDef := cv.AsSource.String()
+
+			checkOpt := "NONE"
+			if cv.CheckOption == tree.ViewCheckOptionCascaded {
+				checkOpt = "CASCADED"
+			}
+			if cv.CheckOption == tree.ViewCheckOptionLocal {
+				checkOpt = "LOCAL"
+			}
+
+			// TODO: Fill out the rest of the columns.
+			rows = append(rows, sql.Row{
+				schema.Item.Name(),       // table_catalog
+				schema.Item.SchemaName(), // table_schema
+				view.Item.Name,           // table_name
+				viewDef,                  // view_definition
+				checkOpt,                 // check_option
+				nil,                      // is_updatable
+				nil,                      // is_insertable_into
+				nil,                      // is_trigger_updatable
+				nil,                      // is_trigger_deletable
+				nil,                      // is_trigger_insertable_into
+			})
+			return true, nil
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return sql.RowsToRowIter(rows...), nil
+}

server/tables/pgcatalog/pg_attribute.go

@@ -143,6 +143,10 @@ func (iter *pgAttributeRowIter) Next(ctx *sql.Context) (sql.Row, error) {
 	typeOid := uint32(0)
 	if doltgresType, ok := col.Type.(pgtypes.DoltgresType); ok {
 		typeOid = doltgresType.OID()
+	} else {
+		// TODO: Remove once all information_schema tables are converted to use DoltgresType
+		doltgresType := pgtypes.FromGmsType(col.Type)
+		typeOid = doltgresType.OID()
 	}
 
 	// TODO: Fill in the rest of the pg_attribute columns