Horton

Thread

Commits

  1. Allow psql's \df and \do commands to specify argument types.

  1. psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2020-10-15T17:21:06Z

    -----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160


Improve psql \df to choose functions by their arguments

== OVERVIEW

Having to scroll through same-named functions with different argument types
when you know exactly which one you want is annoying at best, error causing
at worst. This patch enables a quick narrowing of functions with the
same name but different arguments. For example, to see the full details
of a function names "myfunc" with a TEXT argument, but not showing
the version of "myfunc" with a BIGINT argument, one can now do:

psql=# \df myfunc text

For this, we are fairly liberal in what we accept, and try to be as
intuitive as possible.

Features:

* Type names are case insensitive. Whitespace is optional, but quoting is
respected:

greg=# \df myfunc text "character varying" INTEGER

* Abbreviations of common types is permitted (because who really likes
to type out "character varying"?), so the above could also be written as:

greg=# \df myfunc text varchar int

* The matching is greedy, so you can see everything matching a subset:

greg=# \df myfunc timestamptz
                                   List of functions
 Schema |  Name  | Result data type |            Argument data types
     | Type
-
--------+--------+------------------+-------------------------------------------+------
 public | myfunc | void             | timestamp with time zone
     | func
 public | myfunc | void             | timestamp with time zone, bigint
     | func
 public | myfunc | void             | timestamp with time zone, bigint,
boolean | func
 public | myfunc | void             | timestamp with time zone, integer
    | func
 public | myfunc | void             | timestamp with time zone, text, cidr
     | func
(5 rows)

* The appearance of a closing paren indicates we do not want the greediness:

greg=# \df myfunc (timestamptz, bigint)
                              List of functions
 Schema |  Name  | Result data type |       Argument data types        |
Type
-
--------+--------+------------------+----------------------------------+------
 public | myfunc | void             | timestamp with time zone, bigint |
func
(1 row)


== TAB COMPLETION:

I'm not entirely happy with this, but I figure piggybacking
onto COMPLETE_WITH_FUNCTION_ARG is better than nothing at all.
Ideally we'd walk prev*_wd to refine the returned list, but
that's an awful lot of complexity for very little gain, and I think
the current behavior of showing the complete list of args each time
should suffice.


== DOCUMENTATION:

The new feature is briefly mentioned: wordsmithing help in the
sgml section is appreciated. I'm not sure how many of the above features
need to be documented in detail.

Regarding psql/help.c, I don't think this really warrants a change there.
As it is, we've gone through great lengths to keep this overloaded
backslash
command left justified with the rest!


== TESTS:

I put this into psql.c, seems the best place. Mostly testing out
basic functionality, quoting, and the various abbreviations. Not much
else to test, near as I can tell, as this is a pure convienence addition
and shouldn't affect anything else. Any extra words after a function name
for \df was previously treated as an error.


== IMPLEMENTATION:

Rather than messing with psqlscanslash, we simply slurp in the entire rest
of the line via psql_scan_slash_option (all of which was previously
ignored).
This is passed to describeFunction, which then uses strtokx to break it
into tokens. We look for a match by comparing the current proargtypes
entry,
casted to text, against the lowercase version of the token found by
strtokx.
Along the way, we convert things like "timestamptz" to the official version
(i.e. "timestamp with time zone"). If any of the tokens start with a
closing
paren, we immediately stop parsing and set pronargs to the current number
of valid tokens, thereby forcing a match to one (or zero) functions.

6ab7a45d541f2c31c5631b811f14081bf7b22271
v1-psql-df-pick-function-by-type.patch

- --
Greg Sabino Mullane
PGP Key: 0x14964AC8 202010151316
http://biglumber.com/x/web?pk=2529DF6AB8F79407E94445B4BC9B906714964AC8

-----BEGIN PGP SIGNATURE-----

iF0EAREDAB0WIQQlKd9quPeUB+lERbS8m5BnFJZKyAUCX4iENQAKCRC8m5BnFJZK
yIUKAKDiv1E9KgXuSO7lE9p+ttFdk02O2ACg44lu9VdKt3IggIrPiXBPKR8C85M=
=QPSd
-----END PGP SIGNATURE-----

  2. Re: psql \df choose functions by their arguments

    Justin Pryzby <pryzby@telsasoft.com> — 2020-10-29T04:26:45Z

    On Thu, Oct 15, 2020 at 01:21:06PM -0400, Greg Sabino Mullane wrote:
> Improve psql \df to choose functions by their arguments

I think this is a good idea.

This isn't working for arrays:

postgres=# \df aa
 public | aa   | integer          | integer, integer            | func
 public | aa   | integer          | integer, integer, integer   | func
 public | aa   | integer          | integer[], integer, integer | func

postgres=# \df aa aa int[]

I think it should use the same syntax as \sf and \ef, which require parenthesis
and commas, not spaces.

int x = 0
while ((functoken = strtokx(x++ ? NULL : funcargs, " \t\n\r", ".,();", "\"", 0, false, true, pset.encoding)))

I think x is just used as "initial", so I think you should make it boolean and
then set is_initial = false, or similar.

+                                                                 pg_strcasecmp(functoken, "bool") == 0 ? "'boolean'"

I think writing this all within a call to appendPQExpBuffer() is excessive.
You can make an array or structure to search through and then append the result
to the buffer.

-- 
Justin

  3. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2020-10-30T00:35:20Z

    Thank you for looking this over.


> This isn't working for arrays:
> ...
> postgres=# \df aa aa int[]
>

Arrays should work as expected, I think you have one too many "aa" in there?


> I think it should use the same syntax as \sf and \ef, which require
> parenthesis
> and commas, not spaces.
>

Hmm, that will not allow partial matches if we require a closing parens.
Right now both commas and parens are accepted, but optional.


> I think x is just used as "initial", so I think you should make it boolean
> and
> then set is_initial = false, or similar.
>

Good suggestion, it is done.


> +
>  pg_strcasecmp(functoken, "bool") == 0 ? "'boolean'"
>
> I think writing this all within a call to appendPQExpBuffer() is excessive.
> You can make an array or structure to search through and then append the
> result
> to the buffer.
>

Hmm, like a custom struct we loop through? I will look into implementing
that and submit a new patch.

Cheers,
Greg

  4. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2020-11-01T16:40:28Z

    Thanks for the feedback, attached is version two of the patch. Major
changes:

* Use booleans not generic "int x"
* Build a quick list of abbreviations at the top of the function
* Add array mapping for all types
* Removed the tab-complete bit, it was too fragile and unhelpful

Cheers,
Greg

  5. Re: psql \df choose functions by their arguments

    David Christensen <david@pgguru.net> — 2020-11-01T17:05:25Z

    > * Removed the tab-complete bit, it was too fragile and unhelpful

I can’t speak for the specific patch, but tab completion of proc args for \df, \ef and friends has long been a desired feature of mine, particularly when you are dealing with functions with huge numbers of arguments and the same name which I have (sadly) come across many times in the wild. 

Removing this because it was brittle is fine, but would be good to see if we could figure out a way to have this kind of feature in psql IMHO. 

Best,

David

  6. RE: psql \df choose functions by their arguments

    Hou, Zhijie <houzj.fnst@cn.fujitsu.com> — 2020-11-03T07:59:51Z

    Hi

(sorry forget to cc the hacklist)

> Improve psql \df to choose functions by their arguments

I think this is useful.

I found some comments in the patch.

1.
> * Abbreviations of common types is permitted (because who really likes 
> to type out "character varying"?), so the above could also be written as:

some Abbreviations of common types are not added to the type_abbreviations[] Such as:

Int8                => bigint
Int2                => smallint
Int4 ,int           => integer
Float4              => real
Float8,float,double => double precision
(as same as array type)

Single array seems difficult to handle it, may be we can use double array or use a struct.

2.
And I think It's better to update '/?' info about '\df[+]' in function slashUsage(unsigned short int pager).

Best regards,
houzj

  7. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2020-11-03T14:27:04Z

    Thanks for looking this over!


> some Abbreviations of common types are not added to the
> type_abbreviations[] Such as:
>
> Int8                => bigint
>

I wasn't aiming to provide a canonical list, as I personally have never
seen anyone use int8 instead of bigint when (for example) creating a
function, but I'm not strongly opposed to expanding the list.

Single array seems difficult to handle it, may be we can use double array
> or use a struct.
>

I think the single works out okay, as this is a simple write-once variable
that is not likely to get updated often.


> And I think It's better to update '/?' info about '\df[+]' in function
> slashUsage(unsigned short int pager).
>

Suggestions welcome, but it's already pretty tight in there, so I couldn't
think of anything:

    fprintf(output, _("  \\dew[+] [PATTERN]      list foreign-data
wrappers\n"));
    fprintf(output, _("  \\df[anptw][S+] [PATRN] list [only
agg/normal/procedures/trigger/window] functions\n"));
    fprintf(output, _("  \\dF[+]  [PATTERN]      list text search
configurations\n"));

The \df option is already our longest one, even with the silly attempt to
shorten PATTERN :)

Cheers,
Greg

  8. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2020-11-03T14:31:32Z

    On Sun, Nov 1, 2020 at 12:05 PM David Christensen <david@pgguru.net> wrote:

>
> I can’t speak for the specific patch, but tab completion of proc args for
> \df, \ef and friends has long been a desired feature of mine, particularly
> when you are dealing with functions with huge numbers of arguments and the
> same name which I have (sadly) come across many times in the wild.
>

If someone can get this working against this current patch, that would be
great, but I suspect it will require some macro-jiggering in tab-complete.c
and possibly more, so yeah, could be something to add to the todo list.

Cheers,
Greg

  9. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2020-12-30T18:00:24Z

    Attached is the latest patch against HEAD - basically fixes a few typos.

Cheers,
Greg

  10. Re: psql \df choose functions by their arguments

    Thomas Munro <thomas.munro@gmail.com> — 2021-01-02T06:55:25Z

    On Thu, Dec 31, 2020 at 7:01 AM Greg Sabino Mullane <htamfids@gmail.com> wrote:
> Attached is the latest patch against HEAD - basically fixes a few typos.

Hi Greg,

It looks like there is a collation dependency here that causes the
test to fail on some systems:

=== ./src/test/regress/regression.diffs ===
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/psql.out
/tmp/cirrus-ci-build/src/test/regress/results/psql.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/psql.out 2021-01-01
16:05:25.749692000 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/psql.out 2021-01-01
16:11:28.525632000 +0000
@@ -5094,8 +5094,8 @@
public | mtest | integer | double precision, double precision, integer | func
public | mtest | integer | integer | func
public | mtest | integer | integer, text | func
- public | mtest | integer | timestamp without time zone, timestamp
with time zone | func
public | mtest | integer | time without time zone, time with time zone | func
+ public | mtest | integer | timestamp without time zone, timestamp
with time zone | func

  11. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2021-01-06T20:48:14Z

    On Sat, Jan 2, 2021 at 1:56 AM Thomas Munro <thomas.munro@gmail.com> wrote:

> ...
> It looks like there is a collation dependency here that causes the
> test to fail on some systems:
>

Thanks for pointing that out. I tweaked the function definitions to
hopefully sidestep the ordering issue - attached is v4.

Cheers,
Greg

  12. Re: psql \df choose functions by their arguments

    Ian Lawrence Barwick <barwick@gmail.com> — 2021-01-11T07:45:36Z

    Hi

I tried this patch out last year but was overrolled by Other Stuff before I got
around to providing any feedback, and was reminded of it just now when I was
trying to execute "\df somefunction text int" or similar, which had me
confused until I remembered it's not a feature yet, so it would
certainly be very
welcome to have this.

2020年11月3日(火) 23:27 Greg Sabino Mullane <htamfids@gmail.com>:
>
> Thanks for looking this over!
>
>>
>> some Abbreviations of common types are not added to the type_abbreviations[] Such as:
>>
>> Int8                => bigint
>
>
> I wasn't aiming to provide a canonical list, as I personally have never seen
> anyone use int8 instead of bigint when (for example) creating a function, but
> I'm not strongly opposed to expanding the list.

I have vague memories of working with "int8" a bit (possibly related to an
Informix migration), anyway it seems easy enough to add them for completeness
as someone (possibly migrating from another database) might wonder why
it's not working.

Just a small code readability suggestion - in exec_command_d(), it seems
neater to put the funcargs declaration in a block together with the
code with which uses it (see attached diff).


Regards

Ian Barwick


-- 
EnterpriseDB: https://www.enterprisedb.com

  13. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2021-01-14T16:45:44Z

    Thanks for the feedback: new version v5 (attached) has int8, plus the
suggested code formatting.

Cheers,
Greg

  14. Re: psql \df choose functions by their arguments

    Ian Lawrence Barwick <barwick@gmail.com> — 2021-01-19T02:03:34Z

    2021年1月15日(金) 1:46 Greg Sabino Mullane <htamfids@gmail.com>:

> Thanks for the feedback: new version v5 (attached) has int8, plus the
> suggested code formatting.
>
> Cheers,
> Greg
>

Thanks for the update.

In my preceding mail I meant we should add int2, int4 and int8 for
completeness
(apologies, I was a bit unclear there), as AFAICS that covers all aliases,
even if these
three are less widely used.

FWIW one place where these do get used in substantial numbers is in the
regression tests themselves:

  $ for L in 2 4 8; do git grep int$L src/test/regress/ | wc -l; done
  544
  2332
  1353

Regards

Ian Barwick

-- 
EnterpriseDB: https://www.enterprisedb.com

  15. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2021-01-19T16:58:27Z

    Ha ha ha, my bad, I am not sure why I left those out. Here is a new patch
with int2, int4, and int8. Thanks for the email.

Cheers,
Greg

  16. Re: psql \df choose functions by their arguments

    David Steele <david@pgmasters.net> — 2021-03-19T15:40:07Z

    On 1/19/21 11:58 AM, Greg Sabino Mullane wrote:
> Ha ha ha, my bad, I am not sure why I left those out. Here is a new 
> patch with int2, int4, and int8. Thanks for the email.

Ian, does the new patch look good to you?

Also, not sure why the target version for this patch is stable so I have 
updated it to PG14.

Regards,
-- 
-David
david@pgmasters.net

  17. Re: psql \df choose functions by their arguments

    Tom Lane <tgl@sss.pgh.pa.us> — 2021-04-07T19:57:31Z

    Greg Sabino Mullane <htamfids@gmail.com> writes:
>  [ v6-psql-df-pick-function-by-type.patch ]

I looked this over.  I like the idea a lot, but not much of anything
about the implementation.  I think the additional arguments should be
matched to the function types using the same rules as for \dT.  That
allows patterns for the argument type names, which is particularly
useful if you want to do something like
	\df foo * integer
to find functions whose second argument is integer, without restricting
the first argument.

As a lesser quibble, splitting the arguments with strtokx is a hack;
we should let the normal psql scanner collect the arguments.

So that leads me to the attached, which I think is committable.  Since
we're down to the last day of the CF, I'm going to push this shortly if
there aren't squawks soon.

			regards, tom lane

  18. Re: psql \df choose functions by their arguments

    Greg Sabino Mullane <htamfids@gmail.com> — 2021-04-07T21:25:13Z

    I like the wildcard aspect, but I have a few issues with the patch:

* It doesn't respect some common abbreviations that work elsewhere (e.g.
CREATE FUNCTION). So while "int4" works, "int" does not. Nor does "float",
which thus requires the mandatory-double-quoted "double precision"

* Adding commas to the args, as returned by psql itself via \df, provides
no matches.

* There seems to be no way (?) to limit the functions returned if they
share a common root. The previous incantation allowed you to pull out
foo(int) from foo(int, bigint). This was a big motivation for writing this
patch.

* SQL error on \df foo a..b as well as one on \df foo (bigint bigint)

Cheers,
Greg

  19. Re: psql \df choose functions by their arguments

    Tom Lane <tgl@sss.pgh.pa.us> — 2021-04-07T21:39:39Z

    Greg Sabino Mullane <htamfids@gmail.com> writes:
> I like the wildcard aspect, but I have a few issues with the patch:

> * It doesn't respect some common abbreviations that work elsewhere (e.g.
> CREATE FUNCTION). So while "int4" works, "int" does not. Nor does "float",
> which thus requires the mandatory-double-quoted "double precision"

"\dT int" doesn't match anything either.  Maybe there's room to improve
on that, but I don't think this patch should deviate from what \dT does.

> * Adding commas to the args, as returned by psql itself via \df, provides
> no matches.

The docs are fairly clear that the args are to be space-separated, not
comma-separated.  This fits with psql's general treatment of backslash
arguments, and I think trying to "improve" on it will just end badly.

> * There seems to be no way (?) to limit the functions returned if they
> share a common root. The previous incantation allowed you to pull out
> foo(int) from foo(int, bigint). This was a big motivation for writing this
> patch.

Hmm, are you trying to say that a invocation with N arg patterns should
match only functions with exactly N arguments?  We could do that, but
I'm not convinced it's an improvement over what I did here.  Default
arguments are a counterexample.

> * SQL error on \df foo a..b as well as one on \df foo (bigint bigint)

The first one seems to be a bug, will look.  As for the second, I still
don't agree that that should be within the mandated syntax.

			regards, tom lane

  20. Re: psql \df choose functions by their arguments

    Tom Lane <tgl@sss.pgh.pa.us> — 2021-04-07T21:58:24Z

    I wrote:
> Greg Sabino Mullane <htamfids@gmail.com> writes:
>> * SQL error on \df foo a..b as well as one on \df foo (bigint bigint)

> The first one seems to be a bug, will look.

Argh, silly typo (and I'd failed to test the schema-qualified-name case).

While I was thinking about use-cases for this, I realized that at least
for me, being able to restrict \do operator searches by input type would
be even more useful than is true for \df.  Operator names tend to be
overloaded even more heavily than functions.  So here's a v8 that
also fixes \do in the same spirit.

(With respect to the other point: for \do it does seem to make sense
to constrain the match to operators with exactly as many arguments
as specified.  I still say that's a bad idea for functions, though.)

			regards, tom lane

  21. Re: psql \df choose functions by their arguments

    Tom Lane <tgl@sss.pgh.pa.us> — 2021-04-07T23:34:26Z

    I wrote:
> Greg Sabino Mullane <htamfids@gmail.com> writes:
>> * There seems to be no way (?) to limit the functions returned if they
>> share a common root. The previous incantation allowed you to pull out
>> foo(int) from foo(int, bigint). This was a big motivation for writing this
>> patch.

> Hmm, are you trying to say that a invocation with N arg patterns should
> match only functions with exactly N arguments?  We could do that, but
> I'm not convinced it's an improvement over what I did here.  Default
> arguments are a counterexample.

I had an idea about that.  I've not tested this, but I think it would be
a trivial matter of adding a coalesce() call to make the query act like
the type name for a not-present argument is an empty string, rather than
NULL which is what it gets right now.  Then you could do what I think
you're asking for with

\df foo integer ""

Admittedly this is a bit of a hack, but to me this seems like a
minority use-case, so maybe that's good enough.

As for the point about "int" versus "integer" and so on, I wouldn't
be averse to installing a mapping layer for that, so long as we
did it to \dT as well.

			regards, tom lane

  22. Re: psql \df choose functions by their arguments

    Tom Lane <tgl@sss.pgh.pa.us> — 2021-04-08T02:00:08Z

    I wrote:
> I had an idea about that.  I've not tested this, but I think it would be
> a trivial matter of adding a coalesce() call to make the query act like
> the type name for a not-present argument is an empty string, rather than
> NULL which is what it gets right now.  Then you could do what I think
> you're asking for with

> \df foo integer ""

Actually, what would make more sense is to treat "-" as specifying
a non-existent argument.  There are precedents for that in, eg, \c,
and a dash is a little more robust than an empty-string argument.
So that leads me to 0001 attached.

> As for the point about "int" versus "integer" and so on, I wouldn't
> be averse to installing a mapping layer for that, so long as we
> did it to \dT as well.

And for that, I suggest 0002.  (We only need mappings for cases that
don't work out-of-the-box, so your list seemed a bit redundant.)

			regards, tom lane