Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4f1ac05

Browse files
committed
Well, that certainly appeared to be very straight forward. pg.py and
syscat.py scripts were both modified. pg.py uses it to cache a list ofpks (which is seemingly does for every db connection) and variousattributes. syscat uses it to walk the list of system tables andqueries the various attributes from these tables.In both cases, it seemingly makes sense to apply what you've requested.Greg Copeland
1 parent147aa84 commit4f1ac05

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

‎src/interfaces/python/pg.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ def __init__(self, *args, **kw):
6969
WHERE pg_class.oid = pg_attribute.attrelid AND
7070
pg_class.oid = pg_index.indrelid AND
7171
pg_index.indkey[0] = pg_attribute.attnum AND
72-
pg_index.indisprimary = 't'""").getresult():
72+
pg_index.indisprimary = 't' AND
73+
pg_attribute.attisdropped = 'f'""").getresult():
7374
self.__pkeys__[rel]=att
7475

7576
# wrap query for debugging
@@ -111,7 +112,8 @@ def get_attnames(self, cl):
111112
WHERE pg_class.relname = '%s' AND
112113
pg_attribute.attnum > 0 AND
113114
pg_attribute.attrelid = pg_class.oid AND
114-
pg_attribute.atttypid = pg_type.oid"""
115+
pg_attribute.atttypid = pg_type.oid AND
116+
pg_attribute.attisdropped = 'f'"""
115117

116118
l= {}
117119
forattname,typnameinself.db.query(query%cl).getresult():

‎src/interfaces/python/tutorial/syscat.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def list_simple_ind(pgcnx):
3737
FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a
3838
WHERE i.indrelid = bc.oid AND i.indexrelid = bc.oid
3939
AND i.indkey[0] = a.attnum AND a.attrelid = bc.oid
40-
AND i.indproc = '0'::oid
40+
AND i.indproc = '0'::oid AND a.attisdropped = 'f'
4141
ORDER BY class_name, index_name, attname""")
4242
returnresult
4343

@@ -48,6 +48,7 @@ def list_all_attr(pgcnx):
4848
WHERE c.relkind = 'r' and c.relname !~ '^pg_'
4949
AND c.relname !~ '^Inv' and a.attnum > 0
5050
AND a.attrelid = c.oid and a.atttypid = t.oid
51+
AND a.attisdropped = 'f'
5152
ORDER BY relname, attname""")
5253
returnresult
5354

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp