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

Commit458bc44

Browse files
committed
Revert removal of relhaspkey support; fix unnecessary use of pg_index.oid.
1 parent6568939 commit458bc44

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

‎src/bin/pgaccess/lib/tables.tcl

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ global PgAcVar CurrentDB
4444
set PgAcVar(tblinfo,isunique) {}
4545
set PgAcVar(tblinfo,isclustered) {}
4646
set PgAcVar(tblinfo,indexfields) {}
47-
wpg_select$CurrentDB"select attnum,attname,typname,attlen,attnotnull,atttypmod,usename,usesysid,pg_class.oid,relpages,reltuples,relhasrules,relacl from pg_class,pg_user,pg_attribute,pg_type where (pg_class.relname='$PgAcVar(tblinfo,tablename)') and (pg_class.oid=pg_attribute.attrelid) and (pg_class.relowner=pg_user.usesysid) and (pg_attribute.atttypid=pg_type.oid) order by attnum" rec {
47+
wpg_select$CurrentDB"select attnum,attname,typname,attlen,attnotnull,atttypmod,usename,usesysid,pg_class.oid,relpages,reltuples,relhaspkey,relhasrules,relacl from pg_class,pg_user,pg_attribute,pg_type where (pg_class.relname='$PgAcVar(tblinfo,tablename)') and (pg_class.oid=pg_attribute.attrelid) and (pg_class.relowner=pg_user.usesysid) and (pg_attribute.atttypid=pg_type.oid) order by attnum" rec {
4848
set fsize$rec(attlen)
4949
set fsize1$rec(atttypmod)
5050
set ftype$rec(typname)
@@ -68,15 +68,20 @@ global PgAcVar CurrentDB
6868
set PgAcVar(tblinfo,numtuples)$rec(reltuples)
6969
set PgAcVar(tblinfo,numpages)$rec(relpages)
7070
set PgAcVar(tblinfo,permissions)$rec(relacl)
71+
if {$rec(relhaspkey)=="t"} {
72+
set PgAcVar(tblinfo,hasprimarykey) [intlmsg Yes]
73+
}else {
74+
set PgAcVar(tblinfo,hasprimarykey) [intlmsg No]
75+
}
7176
if {$rec(relhasrules)=="t"} {
7277
set PgAcVar(tblinfo,hasrules) [intlmsg Yes]
7378
}else {
7479
set PgAcVar(tblinfo,hasrules) [intlmsg No]
7580
}
7681
}
7782
set PgAcVar(tblinfo,indexlist) {}
78-
wpg_select$CurrentDB"selectpg_index.oid,indexrelid from pg_index, pg_class where (pg_class.relname='$PgAcVar(tblinfo,tablename)') and (pg_class.oid=pg_index.indrelid)" rec {
79-
lappend PgAcVar(tblinfo,indexlist)$rec(oid)
83+
wpg_select$CurrentDB"select indexrelid from pg_index, pg_class where (pg_class.relname='$PgAcVar(tblinfo,tablename)') and (pg_class.oid=pg_index.indrelid)" rec {
84+
lappend PgAcVar(tblinfo,indexlist)$rec(indexrelid)
8085
wpg_select$CurrentDB"select relname from pg_class where oid=$rec(indexrelid)" rec1 {
8186
.pgaw:TableInfo.f2.fl.ilb insert end$rec1(relname)
8287
}
@@ -1718,6 +1723,13 @@ if {[set PgAcVar(tblinfo,col_id) [.pgaw:TableInfo.f1.lb curselection]]==""} then
17181723
-anchor w -borderwidth 1\
17191724
-relief sunken -text {} -textvariable PgAcVar(tblinfo,ownerid)\
17201725
-width 200
1726+
label$base.f0.fi.l9\
1727+
-borderwidth 0\
1728+
-relief raised -text [intlmsg {Has primary key ?}]
1729+
label$base.f0.fi.l10\
1730+
-anchor w -borderwidth 1\
1731+
-relief sunken -text {}\
1732+
-textvariable PgAcVar(tblinfo,hasprimarykey) -width 200
17211733
label$base.f0.fi.l11\
17221734
-borderwidth 0\
17231735
-relief raised -text [intlmsg {Has rules ?}]
@@ -1881,6 +1893,11 @@ if {[set PgAcVar(tblinfo,col_id) [.pgaw:TableInfo.f1.lb curselection]]==""} then
18811893
grid$base.f0.fi.l8\
18821894
-in .pgaw:TableInfo.f0.fi -column 1 -row 3 -columnspan 1 -rowspan 1 -padx 2\
18831895
-pady 2
1896+
grid$base.f0.fi.l9\
1897+
-in .pgaw:TableInfo.f0.fi -column 0 -row 4 -columnspan 1 -rowspan 1 -sticky w
1898+
grid$base.f0.fi.l10\
1899+
-in .pgaw:TableInfo.f0.fi -column 1 -row 4 -columnspan 1 -rowspan 1 -padx 2\
1900+
-pady 2
18841901
grid$base.f0.fi.l11\
18851902
-in .pgaw:TableInfo.f0.fi -column 0 -row 5 -columnspan 1 -rowspan 1 -sticky w
18861903
grid$base.f0.fi.l12\
@@ -2158,7 +2175,7 @@ proc vTclWindow.pgaw:Permissions {base} {
21582175
#
21592176
# This file contains Tcl procedures used to input Japanese text.
21602177
#
2161-
# $Header: /cvsroot/pgsql/src/bin/pgaccess/lib/Attic/tables.tcl,v 1.9 2001/05/30 15:37:38 momjian Exp $
2178+
# $Header: /cvsroot/pgsql/src/bin/pgaccess/lib/Attic/tables.tcl,v 1.10 2001/08/10 23:29:46 tgl Exp $
21622179
#
21632180
# Copyright (c) 1993 Software Research Associates, Inc.
21642181
#

0 commit comments

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