Skip to content

Commit bc4a6c4

Browse files
authored
feat: adds database_collation to database_details (#429)
* feat: adds `database_collation` to `database_details` * chore: remove extra comma
1 parent bcabe2b commit bc4a6c4

File tree

4 files changed

+24
-6
lines changed

4 files changed

+24
-6
lines changed

scripts/collector/postgres/sql/12/database_details.sql

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
with db as (
22
select db.oid as database_oid,
33
db.datname as database_name,
4+
db.datcollate as database_collation,
45
db.datconnlimit as max_connection_limit,
56
db.datistemplate as is_template_database,
67
pg_encoding_to_char(db.encoding) as character_set_encoding,
@@ -40,6 +41,7 @@ db_size as (
4041
src as (
4142
select db.database_oid,
4243
db.database_name,
44+
db.database_collation,
4345
db.max_connection_limit,
4446
db.is_template_database,
4547
db.character_set_encoding,
@@ -114,5 +116,6 @@ select chr(34) || :PKEY || chr(34) as pkey,
114116
),
115117
'1970-01-01 00:00:00'
116118
) as statistics_last_reset_on,
117-
inet_server_addr() as inet_server_addr
119+
inet_server_addr() as inet_server_addr,
120+
src.database_collation
118121
from src;

scripts/collector/postgres/sql/13/database_details.sql

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
with db as (
22
select db.oid as database_oid,
33
db.datname as database_name,
4+
db.datcollate as database_collation,
45
db.datconnlimit as max_connection_limit,
56
db.datistemplate as is_template_database,
67
pg_encoding_to_char(db.encoding) as character_set_encoding,
@@ -40,6 +41,7 @@ db_size as (
4041
src as (
4142
select db.database_oid,
4243
db.database_name,
44+
db.database_collation,
4345
db.max_connection_limit,
4446
db.is_template_database,
4547
db.character_set_encoding,
@@ -114,5 +116,6 @@ select chr(34) || :PKEY || chr(34) as pkey,
114116
),
115117
'1970-01-01 00:00:00'
116118
) as statistics_last_reset_on,
117-
inet_server_addr() as inet_server_addr
119+
inet_server_addr() as inet_server_addr,
120+
src.database_collation
118121
from src;

scripts/collector/postgres/sql/base/database_details.sql

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
with db as (
22
select db.oid as database_oid,
33
db.datname as database_name,
4+
db.datcollate as database_collation,
45
db.datconnlimit as max_connection_limit,
56
db.datistemplate as is_template_database,
67
pg_encoding_to_char(db.encoding) as character_set_encoding,
@@ -40,6 +41,7 @@ db_size as (
4041
src as (
4142
select db.database_oid,
4243
db.database_name,
44+
db.database_collation,
4345
db.max_connection_limit,
4446
db.is_template_database,
4547
db.character_set_encoding,
@@ -114,5 +116,6 @@ select chr(34) || :PKEY || chr(34) as pkey,
114116
),
115117
'1970-01-01 00:00:00'
116118
) as statistics_last_reset_on,
117-
inet_server_addr() as inet_server_addr
119+
inet_server_addr() as inet_server_addr,
120+
src.database_collation
118121
from src;

src/dma/collector/sql/sources/postgres/collection-database_details.sql

+12-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
with db as (
33
select db.oid as database_oid,
44
db.datname as database_name,
5+
db.datcollate as database_collation,
56
db.datconnlimit as max_connection_limit,
67
db.datistemplate as is_template_database,
78
pg_encoding_to_char(db.encoding) as character_set_encoding,
@@ -41,6 +42,7 @@ db_size as (
4142
src as (
4243
select db.database_oid,
4344
db.database_name,
45+
db.database_collation,
4446
db.max_connection_limit,
4547
db.is_template_database,
4648
db.character_set_encoding,
@@ -115,13 +117,15 @@ select :PKEY as pkey,
115117
),
116118
'1970-01-01 00:00:00'
117119
) as statistics_last_reset_on,
118-
inet_server_addr()::varchar as inet_server_addr
120+
inet_server_addr()::varchar as inet_server_addr,
121+
src.database_collation
119122
from src;
120123

121124
-- name: collection-postgres-13-database-details
122125
with db as (
123126
select db.oid as database_oid,
124127
db.datname as database_name,
128+
db.datcollate as database_collation,
125129
db.datconnlimit as max_connection_limit,
126130
db.datistemplate as is_template_database,
127131
pg_encoding_to_char(db.encoding) as character_set_encoding,
@@ -161,6 +165,7 @@ db_size as (
161165
src as (
162166
select db.database_oid,
163167
db.database_name,
168+
db.database_collation,
164169
db.max_connection_limit,
165170
db.is_template_database,
166171
db.character_set_encoding,
@@ -235,13 +240,15 @@ select :PKEY as pkey,
235240
),
236241
'1970-01-01 00:00:00'
237242
) as statistics_last_reset_on,
238-
inet_server_addr()::varchar as inet_server_addr
243+
inet_server_addr()::varchar as inet_server_addr,
244+
src.database_collation
239245
from src;
240246

241247
-- name: collection-postgres-12-database-details
242248
with db as (
243249
select db.oid as database_oid,
244250
db.datname as database_name,
251+
db.datcollate as database_collation,
245252
db.datconnlimit as max_connection_limit,
246253
db.datistemplate as is_template_database,
247254
pg_encoding_to_char(db.encoding) as character_set_encoding,
@@ -281,6 +288,7 @@ db_size as (
281288
src as (
282289
select db.database_oid,
283290
db.database_name,
291+
db.database_collation,
284292
db.max_connection_limit,
285293
db.is_template_database,
286294
db.character_set_encoding,
@@ -355,5 +363,6 @@ select :PKEY as pkey,
355363
),
356364
'1970-01-01 00:00:00'
357365
) as statistics_last_reset_on,
358-
inet_server_addr()::varchar as inet_server_addr
366+
inet_server_addr()::varchar as inet_server_addr,
367+
src.database_collation
359368
from src;

0 commit comments

Comments
 (0)