diff --git a/src/bin/pgaccess/README b/src/bin/pgaccess/README new file mode 100644 index 0000000000..1ad06ca202 --- /dev/null +++ b/src/bin/pgaccess/README @@ -0,0 +1,167 @@ +--------------------------------------------------------------------------- + +Copyright (c) 1994-7 Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + +--------------------------------------------------------------------------- + + +PGACCESS 0.96 9 March 1999 +================================ +I dedicate this program to my little daughters Ana-Maria and Emilia and to my +wife for their understanding. I hope they will forgive me for spending so many +time far from them. + + + +1.Why PgAccess ? + +First of all because PostgreSQL lacks a graphical interface where you +can manage your tables, edit them, define queries, sequences and +functions. + + + +2.How to INSTALL ? + +You will need Tcl/Tk package, I am using now Tcl 7.6 and Tk 4.2. +PgAccess is running fine also on Tcl/Tk 8.0 + +Also, you will need the PostgreSQL to Tcl interface library, lined as a +Tcl/Tk 'load'-able module. It is called libpgtcl and the source is +located in the PostgreSQL directory /src/interfaces/libpgtcl. +Specifically, you will need a libpgtcl library that is 'load'-able from +Tcl/Tk. This is technically different from an ordinary PostgreSQL +loadable object file, because libpgtcl is a collection of object files. + +Under Linux, this is called libpgtcl.so. You will find a pre-compiled +copy of it for Linux i386 systems at : http://www.flex.ro/pgaccess. +Just copy libpgtcl.so into your system library directory /usr/lib or +/lib and go for it. + +Under Windows, copy libpgtcl.dll and libpq.dll into C:\WINDOWS\SYSTEM directory. +Make sure you have Tcl/Tk at least version 8.0.0 for Microsoft Windows 95 & NT. +PgAccess has been checked with Tcl/Tk 8.0.4 version on Windows95 and Windows98 +platforms. + +Tcl/Tk 8.0.4 for Windows95 & NT can be downloaded from +ftp://ftp.scriptics.com/pub/tcl/tcl8_0/tcl804.exe +It is 1833712 bytes long. + + +3.How to run it? + +You run it with the command: + + wish -f pgaccess.tcl [database] + +[database] is optional. + +Another way of loading the PostgreSQL library is running it with pgwish. +It's a wish compiled with libpgtcl library so it could understand the +commands for working with PostgreSQL. For this, remove the line "load +libpgtcl.so" from the source. If your operating system has a different +library name or location, change the 'load libpgtcl.so' line in the +pgaccess.tcl file. + + +4.What does it now ? + +- Opens any database on a specified host at the specified port, username and password +- Perform vacuum command. +- Saves preferences in ~/.pgaccessrc file + +Tables +- opening multiple tables for viewing, max n records (configurable) +- column resizing by dragging the vertical grid lines +- text will wrap in cells now +- dynamic row height when editing +- table layout saved for every table +- import/export to external files (SDF,CSV) +- filter capabilities ,enter filter like price>3.14 +- sort order capabilities ,enter manually the sort field(s) +- editing in place, double click the text you want to change +- record deleting , point the record, press Del key +- adding new records ,save new row with right-button-click on table for the moment +- table generator assistant +- table renaming and deleting (dropping) +- table information retrieving : owner, field information, indexes + +Queries +- define, edit and store "user defined queries" +- save view layout +- can store queries as views +- execution of queries with optional user input parameters ( select * from invoices where year=[parameter "Year of selection"] ) +- viewing of select type queries result +- running action queries (insert, update, delete) +- visual query builder with drag & drop support, table aliasing + +Sequences +- define +- inspect +- delete + +Views +- defining them saving queries as views +- view them , with filtering and sorting capabilities +- design views +- delete them + +Functions +- define , inspect , delete + +Reports +- simple reports from a table (beta stage) +- change font,size and style of fields and labels +- load and save reports from the database +- table previews, sample postscript print + +Forms +- open user defined forms +- form design module available +- query widget allowing access to a record set + +Scripts +- define, modify and call user defined scripts + +5.What it should do in the future ? + +- sequence and function renaming +- more powerful report generator and viewer +- help on line + + + +6. How you should report the errors? +First of all : operating system, PostgreSQL version,Tcl/Tk version. +A more detailed story of what have you done when error had occurred. +Tcl/Tk stops usually with a error message and there is a button there +"Stack Trace" and if you press it, you will see a detailed information +about the place where it stuck. Please send it to me. +Some information about table structure, no. of fields, records would +be also good. + +=========================================================================== +You would find always the latest version at http://www.flex.ro/pgaccess + +Please feel free to e-mail me with any suggestion or bug description +that will help to improve it. + +Constantin Teodorescu + diff --git a/src/bin/pgaccess/index.html b/src/bin/pgaccess/index.html index 57b1dc59ae..c38f3d3a00 100644 --- a/src/bin/pgaccess/index.html +++ b/src/bin/pgaccess/index.html @@ -1,109 +1,114 @@ - - - - - - PgAccess - a Tcl/Tk PostgreSQL interface - - + + + + + + PgAccess - a Tcl/Tk PostgreSQL interface + + -

-PgAccess - a free database management tool for PostgreSQL

+

+PgAccess - a free database management tool for PostgreSQL

-
-
  • -Download the last version of PgAccess (press -shift and click this link) (tar.gz file)  or   this -one (zip file for Windows)
    • +
    +
  • +Download the last version of PgAccess (press +shift and click this link) (tar.gz file)  or   this +one (zip file for Windows)
    • -
    -


    Latest stable version of PgAccess is 0.93 , released 10 December -1998 ! -

    NEW * NEW -*  -==> Microsoft Windows compatible version -

      NEW * ==== > PostgreSQL -user management, multiple table views,. Query parameters (see +


    +

    +

    Latest stable version of PgAccess is 0.96 , released 9 March 1999 +! +

    PgAccess 0.93 and higher will not work from the begining +with PostgreSQL 6.3.x !!
    +Read here how to apply a simple patch in order +to make it work !     +
      +

    NEW * NEW +*  +==> Microsoft Windows compatible version +

      NEW * ==== > PostgreSQL +user management, multiple table views,. Query parameters (see section Queries below) -

    Precompiled libpgtcl and libpq binaries and dll's for i386 are here -!!!

    +

    Precompiled libpgtcl and libpq binaries and dll's for i386 are here +!!!

    -
      -

    -Installation problems

    +

    +Installation problems

    - -

    -What does PgAccess now!

    -Here are some screenshots from PgAccess windows : Main -window , table builder , table(query) -view , visual query builder . -

    Tables -
    - opening multiple tables for viewing, max. n records (changed by preferences +

    +What does PgAccess now!

    +Here are some screenshots from PgAccess windows : Main +window , table builder , table(query) +view , visual query builder . +

    Tables +
    - opening multiple tables for viewing, max. n records (changed by preferences menu) -
    - column resizing, dragging the vertical grid line (better in table +
    - column resizing, dragging the vertical grid line (better in table space rather than in the table header) -
    - text wrap in cells - layout saved for every table -
    - import/export to external files (SDF,CSV) -
    - filter capabilities (enter filter like (price>3.14) -
    - sort order capabilities (enter manually the sort field(s)) -
    - editing in place -
    - improved table generator assistant -
    - improved field editing -
    Queries -
    - define , edit and stores "user defined queries" -
    - store queries as views -
    - execution of queries with optional user input parameters ( select +
    - text wrap in cells - layout saved for every table +
    - import/export to external files (SDF,CSV) +
    - filter capabilities (enter filter like (price>3.14) +
    - sort order capabilities (enter manually the sort field(s)) +
    - editing in place +
    - improved table generator assistant +
    - improved field editing +
    Queries +
    - define , edit and stores "user defined queries" +
    - store queries as views +
    - execution of queries with optional user input parameters ( select * from invoices where year=[parameter "Year of selection"] ) -
    - viewing of select type queries result -
    - query deleting and renaming -
    - visual query builder with drag & drop capabilities. For any of +
    - viewing of select type queries result +
    - query deleting and renaming +
    - visual query builder with drag & drop capabilities. For any of you who had installed the Tcl/Tk plugin for Netscape Navigator, you can -see it at work clicking here -
    Sequences -
    - defines sequences, delete them and inspect them -
    Functions -
    - define, inspect and delete functions in SQL language -
    Reports -
    - design and display simple reports from tables -
    - fields and labels, font changing, style and size -
    - saves and loads report description from database -
    - show report previews, sample postscript output file -
    Forms -
    - open user defined forms -
    - form design module available -
    - query widget available, controls bound to query results -
    - click here for a description of forms and +see it at work clicking here +
    Sequences +
    - defines sequences, delete them and inspect them +
    Functions +
    - define, inspect and delete functions in SQL language +
    Reports +
    - design and display simple reports from tables +
    - fields and labels, font changing, style and size +
    - saves and loads report description from database +
    - show report previews, sample postscript output file +
    Forms +
    - open user defined forms +
    - form design module available +
    - query widget available, controls bound to query results +
    - click here for a description of forms and how they can be used -
    Scripts -
    - define, modify and call user defined scripts -
    Users -
    - define and modify user parameters -

    Here is a special section concerning forms and -scripts . -

    This program is protected by the following copyright -

    If you have any comment, suggestion for improvements, please feel free -to e-mail to : teo@flex.ro -

    Mailing list for PgAccess Here -you will find how to subscribe to this mailing list. -

    -

    -

    -More information about libpgtcl - downloads

    +
    Scripts +
    - define, modify and call user defined scripts +
    Users +
    - define and modify user parameters +

    Here is a special section concerning forms and +scripts . +

    This program is protected by the following copyright +

    If you have any comment, suggestion for improvements, please feel free +to e-mail to : teo@flex.ro +

    Mailing list for PgAccess Here +you will find how to subscribe to this mailing list. +

    +

    +

    +More information about libpgtcl - downloads

         Also, you will need the PostgreSQL to Tcl interface library, lined as a Tcl/Tk 'load'-able module. It is called libpgtcl and the source is located in the PostgreSQL directory /src/interfaces/libpgtcl. @@ -111,19 +116,19 @@ Specifically, you will need a libpgtcl library that is 'load'-able from Tcl/Tk.      This is technically different from an ordinary PostgreSQL loadable object file, because libpgtcl is a collection of object files. Under Linux, this is called libpgtcl.so. -

         One of the solutions is to remove from the -source the line containing load libpgtcl.so and to load pgaccess.tcl +

         One of the solutions is to remove from the +source the line containing load libpgtcl.so and to load pgaccess.tcl not with wish, but with pgwish (or wishpg) that wish that was linked with libpgtcl library! I do not recommend this one. -

         If you have installed RedHat 5.x, you should +

         If you have installed RedHat 5.x, you should get the last distribution kit of PostgreSQL and compile it from scratch. RedHat 5.x is using some new versions of libraries and you have to compile -and install again at least libpq and libpgtcl libraries. -

        PostgreSQL 6.4 release has a minor bug. I does not +and install again at least libpq and libpgtcl libraries. +

        PostgreSQL 6.4 release has a minor bug. I does not includ by default the crypt lib when compiling libpgtcl. So, you will need to manually add a -lcrypt to SHLIB line in Makefile in src/interfaces/libpgtcl and then make clean and make again. The new libpgtcl.so library is properly configured to run pgaccess. -
      - - +
      + + diff --git a/src/bin/pgaccess/pg93patch.html b/src/bin/pgaccess/pg93patch.html new file mode 100644 index 0000000000..4c77bfac61 --- /dev/null +++ b/src/bin/pgaccess/pg93patch.html @@ -0,0 +1,25 @@ + + + + + + + + +

    +PgAccess 0.93 patch to make it work with PostgreSQL 6.3.x +

    + +


    PgAccess 0.93 is working fine with PostgreSQL 6.4.x due to some +changes in libpgtcl ! +

    There is a small patch that you have to make in order to make it work +with 6.3.x ! +

    Replace in procedure wpg_exec the following line: +

    set pgsql(errmsg) [pg_result $pgsql(res) -error] +

    with this one : +

    set pgsql(errmsg) "NO ERROR INFORMATION SUPPLIED" +

    And it will work fine! In some error cases, you will not get the appropriate +error message from libpgtcl. +

     Back + + diff --git a/src/bin/pgaccess/pgaccess.tcl b/src/bin/pgaccess/pgaccess.tcl index c8d73aaabf..da14d6c86a 100644 --- a/src/bin/pgaccess/pgaccess.tcl +++ b/src/bin/pgaccess/pgaccess.tcl @@ -1,4 +1,6 @@ -#!/usr/bin/wish +#!/bin/sh +# the next line restarts using wish \ +exec wish "$0" "$@" global widget; @@ -74,6 +76,7 @@ set qlvar(xoffs) 50 set qlvar(reswidth) 150 set qlvar(resfields) {} set qlvar(ressort) {} +set qlvar(resreturn) {} set qlvar(rescriteria) {} set qlvar(restables) {} set qlvar(critedit) 0 @@ -288,6 +291,7 @@ set objname [.dw.lb get [.dw.lb curselection]] set tablename $objname switch $activetab { Queries {open_query design} + Views {open_view_design} Scripts {design_script $objname} Forms {fd_load_form $objname design} Reports { @@ -343,25 +347,21 @@ cursor_normal proc {cmd_Functions} {} { global dbc -set maxim 0 -set pgid 0 +set maxim 16384 cursor_clock catch { - wpg_select $dbc "select proowner,count(*) from pg_proc group by proowner" rec { - if {$rec(count)>$maxim} { - set maxim $rec(count) - set pgid $rec(proowner) - } + wpg_select $dbc "select oid from pg_database where datname='template1'" rec { + set maxim $rec(oid) } +} .dw.lb delete 0 end catch { - wpg_select $dbc "select proname from pg_proc where prolang=14 and proowner<>$pgid order by proname" rec { + wpg_select $dbc "select proname from pg_proc where prolang=14 and oid>$maxim order by proname" rec { .dw.lb insert end $rec(proname) } } cursor_normal } -} proc {cmd_Import_Export} {how} { global dbc ie_tablename ie_filename activetab @@ -397,7 +397,7 @@ switch $activetab { Window show .qb set queryoid 0 set queryname {} - set cbv 0 + set cbv 0 .qb.cbv configure -state normal } Users { @@ -585,12 +585,18 @@ cursor_normal proc {cmd_Views} {} { global dbc - cursor_clock .dw.lb delete 0 end catch { + wpg_select $dbc "select c.relname,count(c.relname) from pg_class C, pg_rewrite R where (relname !~ '^pg_') and (r.ev_class = C.oid) and (r.ev_type = '1') group by relname" rec { + if {$rec(count)!=0} { + set itsaview($rec(relname)) 1 + } + } wpg_select $dbc "select relname from pg_class where (relname !~ '^pg_') and (relkind='r') and (relhasrules) order by relname" rec { - .dw.lb insert end $rec(relname) + if {[info exists itsaview($rec(relname))]} { + .dw.lb insert end $rec(relname) + } } } cursor_normal @@ -602,7 +608,7 @@ if {[winfo exists $base.ddf]} { return } frame $base.ddf -borderwidth 1 -height 75 -relief raised -width 55 -listbox $base.ddf.lb -background #fefefe -borderwidth 1 -font $pref(font_normal) -highlightthickness 0 -selectborderwidth 0 -yscrollcommand [subst {$base.ddf.sb set}] +listbox $base.ddf.lb -background #fefefe -foreground #000000 -selectbackground #c3c3c3 -borderwidth 1 -font $pref(font_normal) -highlightthickness 0 -selectborderwidth 0 -yscrollcommand [subst {$base.ddf.sb set}] scrollbar $base.ddf.sb -borderwidth 1 -command [subst {$base.ddf.lb yview}] -highlightthickness 0 -orient vert place $base.ddf -x $x -y $y -width $w -height 185 -anchor nw -bordermode ignore place $base.ddf.lb -x 1 -y 1 -width [expr $w-18] -height 182 -anchor nw -bordermode ignore @@ -773,6 +779,9 @@ switch $fdobj($i,t) { fd_draw_rectangle $x1 $y1 $x2 $y2 raised #a0a0a0 o$i .fd.c create text [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] -text $fdobj($i,l) -font $pref(font_normal) -tags o$i } + text { + fd_draw_rectangle $x1 $y1 $x2 $y2 sunken #a0a0a0 o$i + } entry { fd_draw_rectangle $x1 $y1 $x2 $y2 sunken white o$i } @@ -1141,6 +1150,9 @@ switch $fdobj($item,t) { entry $base.$name -bo 1 -ba white -selectborderwidth 0 -highlightthickness 0 if {$var!=""} {$base.$name configure -textvar $var} } + text { + text $base.$name -font $pref(font_normal) -borderwidth 1 + } label { set wh {} label $base.$name -font $pref(font_normal) -anchor nw -padx 0 -pady 0 -text $fdobj($item,l) @@ -1177,10 +1189,21 @@ return $temp proc {get_tables} {} { global dbc set tbl {} -catch { - wpg_select $dbc "select * from pg_class where (relname !~ '^pg_') and (relkind='r') order by relname" rec { - if {![regexp "^pga_" $rec(relname)]} then {lappend tbl $rec(relname)} +if {[catch { + wpg_select $dbc "select c.relname,count(c.relname) from pg_class C, pg_rewrite R where (relname !~ '^pg_') and (r.ev_class = C.oid) and (r.ev_type = '1') group by relname" rec { + if {$rec(count)!=0} { + set itsaview($rec(relname)) 1 + } } + wpg_select $dbc "select relname from pg_class where (relname !~ '^pg_') and (relkind='r') order by relname" rec { + if {![regexp "^pga_" $rec(relname)]} then { + if {![info exists itsaview($rec(relname))]} { + lappend tbl $rec(relname) + } + } + } +} gterrmsg]} { + show_error $gterrmsg } return $tbl } @@ -1779,6 +1802,25 @@ set rbvar(justpreview) 1 rb_preview } +proc {open_view_design} {} { +global dbc cbv queryname +set viewname [.dw.lb get [.dw.lb curselection]] +set vd {} +wpg_select $dbc "select pg_get_viewdef('$viewname')as vd" tup { + set vd $tup(vd) +} +if {$vd==""} { + show_error "Error retrieving view definition for '$viewname'!" + return +} +Window show .qb +.qb.text1 delete 0.0 end +.qb.text1 insert end $vd +set cbv 1 +.qb.cbv configure -state disabled +set queryname $viewname +} + proc {open_query} {how} { global dbc queryname mw queryoid @@ -1968,9 +2010,12 @@ focus .ql.entt proc {ql_compute_sql} {} { global qlvar set sqlcmd "select " +#rjr 8Mar1999 added logical return state for results for {set i 0} {$i<[llength $qlvar(resfields)]} {incr i} { + if {[lindex $qlvar(resreturn) $i]} { if {$sqlcmd!="select "} {set sqlcmd "$sqlcmd, "} - set sqlcmd "$sqlcmd[lindex $qlvar(restables) $i].[lindex $qlvar(resfields) $i]" + set sqlcmd "$sqlcmd[lindex $qlvar(restables) $i].\"[lindex $qlvar(resfields) $i]\"" +} } set tables {} for {set i 0} {$i<$qlvar(ntables)} {incr i} { @@ -1984,7 +2029,7 @@ if {[llength $qlvar(links)]>0} { set sup1 "where " foreach link $qlvar(links) { if {$sup1!="where "} {set sup1 "$sup1 and "} - set sup1 "$sup1 ([lindex $link 0].[lindex $link 1]=[lindex $link 2].[lindex $link 3])" + set sup1 "$sup1 ([lindex $link 0].\"[lindex $link 1]\"=[lindex $link 2].\"[lindex $link 3]\")" } } for {set i 0} {$i<[llength $qlvar(resfields)]} {incr i} { @@ -1992,7 +2037,7 @@ for {set i 0} {$i<[llength $qlvar(resfields)]} {incr i} { if {$crit!=""} { if {$sup1==""} {set sup1 "where "} if {[string length $sup1]>6} {set sup1 "$sup1 and "} - set sup1 "$sup1 ([lindex $qlvar(restables) $i].[lindex $qlvar(resfields) $i] $crit) " + set sup1 "$sup1 ([lindex $qlvar(restables) $i].\"[lindex $qlvar(resfields) $i]\" $crit) " } } set sqlcmd "$sqlcmd $sup1" @@ -2002,7 +2047,7 @@ for {set i 0} {$i<[llength $qlvar(ressort)]} {incr i} { if {$how!="unsorted"} { if {$how=="Ascending"} {set how asc} else {set how desc} if {$sup2==""} {set sup2 " order by "} else {set sup2 "$sup2,"} - set sup2 "$sup2 [lindex $qlvar(restables) $i].[lindex $qlvar(resfields) $i] $how " + set sup2 "$sup2 [lindex $qlvar(restables) $i].\"[lindex $qlvar(resfields) $i]\" $how " } } set sqlcmd "$sqlcmd $sup2" @@ -2031,6 +2076,8 @@ if {[ql_get_tag_info $obj res]=="f"} { if {$col==""} return if {[tk_messageBox -title WARNING -icon question -parent .ql -message "Remove field from result ?" -type yesno -default no]=="no"} return set qlvar(resfields) [lreplace $qlvar(resfields) $col $col] + set qlvar(ressort) [lreplace $qlvar(ressort) $col $col] + set qlvar(resreturn) [lreplace $qlvar(resreturn) $col $col] set qlvar(restables) [lreplace $qlvar(restables) $col $col] set qlvar(rescriteria) [lreplace $qlvar(rescriteria) $col $col] ql_draw_res_panel @@ -2044,6 +2091,8 @@ if {[tk_messageBox -title WARNING -icon question -parent .ql -message "Remove ta for {set i [expr [llength $qlvar(restables)]-1]} {$i>=0} {incr i -1} { if {"$tablename"==[lindex $qlvar(restables) $i]} { set qlvar(resfields) [lreplace $qlvar(resfields) $i $i] + set qlvar(ressort) [lreplace $qlvar(ressort) $i $i] + set qlvar(resreturn) [lreplace $qlvar(resreturn) $i $i] set qlvar(restables) [lreplace $qlvar(restables) $i $i] set qlvar(rescriteria) [lreplace $qlvar(rescriteria) $i $i] } @@ -2149,6 +2198,7 @@ if {($y>$qlvar(yoffs)) && ($x>$qlvar(xoffs))} { set qlvar(ressort) [linsert $qlvar(ressort) $col unsorted] set qlvar(rescriteria) [linsert $qlvar(rescriteria) $col {}] set qlvar(restables) [linsert $qlvar(restables) $col $tabtag] + set qlvar(resreturn) [linsert $qlvar(resreturn) $col yes] ql_draw_res_panel } else { # Drop position : in the table panel @@ -2242,6 +2292,7 @@ for {set i $qlvar(xoffs)} {$i<10000} {incr i $qlvar(reswidth)} { .ql.c create text 5 [expr 16+$qlvar(yoffs)] -text Table: -anchor nw -font $pref(font_normal) -tags {reshdr} .ql.c create text 5 [expr 31+$qlvar(yoffs)] -text Sort: -anchor nw -font $pref(font_normal) -tags {reshdr} .ql.c create text 5 [expr 46+$qlvar(yoffs)] -text Criteria: -anchor nw -font $pref(font_normal) -tags {reshdr} +.ql.c create text 5 [expr 61+$qlvar(yoffs)] -text Return: -anchor nw -font $pref(font_normal) -tags {reshdr} .ql.c bind mov {ql_dragstart %W %x %y} .ql.c bind mov {ql_dragit %W %x %y} bind .ql {ql_dragstop %x %y} @@ -2262,10 +2313,12 @@ for {set i 0} {$i<[llength $qlvar(resfields)]} {incr i} { if {[lindex $qlvar(rescriteria) $i]!=""} { .ql.c create text [expr $resoffset+4+$qlvar(xoffs)+$i*$qlvar(reswidth)] [expr $qlvar(yoffs)+46+15*0] -anchor nw -text [lindex $qlvar(rescriteria) $i] -font $pref(font_normal) -tags [subst {resp cr-c$i-r0}] } + .ql.c create text [expr $resoffset+4+$qlvar(xoffs)+$i*$qlvar(reswidth)] [expr 61+$qlvar(yoffs)] -text [lindex $qlvar(resreturn) $i] -anchor nw -tags {resp retval} -font $pref(font_normal) } .ql.c raise reshdr .ql.c bind resf {ql_resfield_click %x %y} .ql.c bind sort {ql_swap_sort %W %x %y} +.ql.c bind retval {ql_toggle_return %W %x %y} } proc {ql_draw_table} {it} { @@ -2304,6 +2357,7 @@ set qlvar(yoffs) 360 set qlvar(xoffs) 50 set qlvar(reswidth) 150 set qlvar(resfields) {} +set qlvar(resreturn) {} set qlvar(ressort) {} set qlvar(rescriteria) {} set qlvar(restables) {} @@ -2383,6 +2437,23 @@ set qlvar(ressort) [lreplace $qlvar(ressort) $col $col $cum] .ql.c itemconfigure $obj -text $cum } +#rjr 8Mar1999 toggle logical return state for result +proc {ql_toggle_return} {w x y} { +global qlvar +set obj [$w find closest $x $y] +set taglist [.ql.c gettags $obj] +if {[lsearch $taglist retval]==-1} return +set cum [.ql.c itemcget $obj -text] +if {$cum} { + set cum no +} else { + set cum yes +} +set col [expr int(($x-$qlvar(xoffs))/$qlvar(reswidth))] +set qlvar(resreturn) [lreplace $qlvar(resreturn) $col $col $cum] +.ql.c itemconfigure $obj -text $cum +} + proc {qlc_click} {x y w} { global qlvar pref set qlvar(panstarted) 0 @@ -2771,7 +2842,7 @@ place $w -x 7 place .dw.lmask -x 80 -y [expr 86+25*[lsearch -exact $tablist $curtab]] set activetab $curtab # Tabs where button Design is enabled -if {[lsearch {Scripts Queries Reports Forms Users} $activetab]!=-1} { +if {[lsearch {Scripts Queries Views Reports Forms Users} $activetab]!=-1} { .dw.btndesign configure -state normal } .dw.lb delete 0 end @@ -2916,7 +2987,7 @@ proc vTclWindow.about {base} { label $base.l2 -relief groove -text {A Tcl/Tk interface to PostgreSQL by Constantin Teodorescu} - label $base.l3 -borderwidth 0 -relief sunken -text {v 0.93} + label $base.l3 -borderwidth 0 -relief sunken -text {v 0.96} label $base.l4 -relief groove -text {You will always get the latest version at: http://www.flex.ro/pgaccess @@ -3042,6 +3113,7 @@ global pref -relief raised listbox $base.lb \ -background #fefefe \ + -selectbackground #c3c3c3 \ -foreground black -highlightthickness 0 -selectborderwidth 0 \ -yscrollcommand {.dw.sb set} bind $base.lb { @@ -3445,6 +3517,7 @@ global pref -text Create listbox $base.lb \ -background #fefefe -borderwidth 1 \ + -selectbackground #c3c3c3 \ -font $pref(font_fix) \ -selectborderwidth 0 -yscrollcommand {.nt.sb set} bind $base.lb { @@ -3686,6 +3759,16 @@ global pref set qtype A } if {$cbv} { + wpg_select $dbc "select pg_get_viewdef('$queryname') as vd" tup { + if {$tup(vd)!="Not a view"} { + if {[tk_messageBox -title Warning -message "View '$queryname' already exists! Delete ?" -type yesno -default no]=="yes"} { + set pg_res [wpg_exec $dbc "drop view \"$queryname\""] + if {$pgsql(status)!="PGRES_COMMAND_OK"} { + show_error "Error deleting view '$queryname'" + } + } + } + } set pgres [wpg_exec $dbc "create view \"$queryname\" as $qcmd"] if {$pgsql(status)!="PGRES_COMMAND_OK"} { show_error "Error defining view\n\n$pgsql(errmsg)" @@ -3900,6 +3983,7 @@ global pref -relief raised -text {Report fields} listbox $base.lb \ -background #fefefe -borderwidth 1 \ + -selectbackground #c3c3c3 \ -highlightthickness 1 -selectborderwidth 0 \ -yscrollcommand {.rb.sb set} bind $base.lb { @@ -4263,7 +4347,7 @@ global pref label $base.l2 -anchor w -borderwidth 0 -text conturi -textvariable tiw(tablename) label $base.l3 -borderwidth 0 -text Owner label $base.l4 -anchor w -borderwidth 1 -textvariable tiw(owner) - listbox $base.lb -background #fefefe -borderwidth 1 -font $pref(font_fix) -highlightthickness 1 -selectborderwidth 0 -yscrollcommand {.tiw.sb set} + listbox $base.lb -background #fefefe -selectbackground #c3c3c3 -borderwidth 1 -font $pref(font_fix) -highlightthickness 1 -selectborderwidth 0 -yscrollcommand {.tiw.sb set} scrollbar $base.sb -activebackground #d9d9d9 -activerelief sunken -borderwidth 1 -command {.tiw.lb yview} -orient vert button $base.closebtn -borderwidth 1 -command {Window destroy .tiw} -pady 3 -text Close button $base.renbtn -borderwidth 1 -command { @@ -4274,7 +4358,7 @@ global pref label $base.l12 -borderwidth 1 -relief raised -text size label $base.lfi -borderwidth 0 -text {Field information} label $base.lii -borderwidth 1 -relief raised -text {Indexes defined} - listbox $base.ilb -background #fefefe -borderwidth 1 -highlightthickness 1 -selectborderwidth 0 + listbox $base.ilb -background #fefefe -borderwidth 1 -highlightthickness 1 -selectborderwidth 0 -selectbackground #c3c3c3 bind $base.ilb { tiw_show_index } @@ -4664,7 +4748,7 @@ proc vTclWindow.fdtb {base} { } toplevel $base -class Toplevel wm focusmodel $base passive - wm geometry $base 90x152+0+0 + wm geometry $base 90x172+0+0 wm maxsize $base 785 570 wm minsize $base 1 1 wm overrideredirect $base 0 @@ -4699,6 +4783,10 @@ proc vTclWindow.fdtb {base} { -anchor w -borderwidth 1 \ -highlightthickness 0 -text {Radio btn} -value radio \ -variable fdvar(tool) -width 9 + radiobutton $base.rb9 \ + -anchor w -borderwidth 1 \ + -highlightthickness 0 -text {Text} -value text \ + -variable fdvar(tool) -width 9 radiobutton $base.rb8 \ -anchor w -borderwidth 1 \ -highlightthickness 0 -text Query -value query -variable fdvar(tool) \ @@ -4717,8 +4805,10 @@ proc vTclWindow.fdtb {base} { -in .fdtb -column 0 -row 5 -columnspan 1 -rowspan 1 grid $base.rb7 \ -in .fdtb -column 0 -row 6 -columnspan 1 -rowspan 1 - grid $base.rb8 \ + grid $base.rb9 \ -in .fdtb -column 0 -row 7 -columnspan 1 -rowspan 1 + grid $base.rb8 \ + -in .fdtb -column 0 -row 8 -columnspan 1 -rowspan 1 } proc vTclWindow.sqlw {base} {