GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Don't load enum definitions on old PG · roji/Npgsql@da2614a

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src/Npgsql
- NpgsqlDatabaseInfo.cs
- PostgresDatabaseInfo.cs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/Npgsql/NpgsqlDatabaseInfo.cs‎`

Copy file name to clipboardExpand all lines: src/Npgsql/NpgsqlDatabaseInfo.cs

+4Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,10 @@ internal static ConcurrentDictionary<string, NpgsqlDatabaseInfo> Cache`
`79`	`79`	`/// </summary>`
`80`	`80`	`public virtual bool SupportsRangeTypes => Version >= new Version(9, 2, 0);`
`81`	`81`	`/// <summary>`
	`82`	`+ /// Whether the backend supports enum types.`
	`83`	`+ /// </summary>`
	`84`	`+ public virtual bool SupportsEnumTypes => Version >= new Version(8, 3, 0);`
	`85`	`+ /// <summary>`
`82`	`86`	`/// Whether the backend supports the CLOSE ALL statement.`
`83`	`87`	`/// </summary>`
`84`	`88`	`public virtual bool SupportsCloseAll => Version >= new Version(8, 3, 0);`

Collapse file

`‎src/Npgsql/PostgresDatabaseInfo.cs‎`

Copy file name to clipboardExpand all lines: src/Npgsql/PostgresDatabaseInfo.cs

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ internal async Task LoadPostgresInfo(NpgsqlConnection conn, NpgsqlTimeout timeou`
`82`	`82`	`// Order by primitives first, container later.`
`83`	`83`	`// For arrays and ranges, join in the element OID and type (to filter out arrays of unhandled`
`84`	`84`	`// types).`
`85`		`- static string GenerateTypesQuery(bool withRange, bool loadTableComposites)`
	`85`	`+ static string GenerateTypesQuery(bool withRange, bool withEnum, bool loadTableComposites)`
`86`	`86`	`=> $@"`
`87`	`87`	`/* Load all supported types */`
`88`	`88`	`SELECT ns.nspname, a.typname, a.oid, a.typrelid, a.typbasetype,`
`@@ -126,12 +126,12 @@ JOIN pg_attribute AS att ON (att.attrelid = typ.typrelid)`
`126`	`126`	`attnum > 0 AND /* Don't load system attributes */`
`127`	`127`	`NOT attisdropped`
`128`	`128`	`ORDER BY typ.typname, att.attnum;`
`129`		`-`
	`129`	`+{(withEnum ? @"`
`130`	`130`	`/* Load enum fields */`
`131`	`131`	`SELECT pg_type.oid, enumlabel`
`132`	`132`	`FROM pg_enum`
`133`	`133`	`JOIN pg_type ON pg_type.oid=enumtypid`
`134`		`-ORDER BY oid, enumsortorder;`
	`134`	`+ORDER BY oid, enumsortorder;" : "")}`
`135`	`135`	`";`
`136`	`136`
`137`	`137`	`internal async Task<List<PostgresType>> LoadBackendTypes(NpgsqlConnection conn, NpgsqlTimeout timeout, bool async)`
`@@ -144,7 +144,7 @@ internal async Task<List<PostgresType>> LoadBackendTypes(NpgsqlConnection conn,`
`144`	`144`	`throw new TimeoutException();`
`145`	`145`	`}`
`146`	`146`
`147`		`- var typeLoadingQuery = GenerateTypesQuery(SupportsRangeTypes, conn.Settings.LoadTableComposites);`
	`147`	`+ var typeLoadingQuery = GenerateTypesQuery(SupportsRangeTypes, SupportsEnumTypes, conn.Settings.LoadTableComposites);`
`148`	`148`
`149`	`149`	`using (var command = new NpgsqlCommand(typeLoadingQuery, conn))`
`150`	`150`	`{`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.