← Back to branch summary

~ubuntu-branches/debian/squeeze/pgadmin3/squeeze

« back to all changes in this revision

Viewing changes to pgadmin/schema/pgFunction.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gerfried Fuchs
  • Date: 2009-12-17 20:34:00 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20091217203400-tlnmt4m3v7udjp0h
Tags: 1.10.1-1
http://bugs.debian.org/547940
http://bugs.debian.org/451038
http://bugs.debian.org/503291
* New upstream release, containing fix for:
  - default value in function parameters not shown (closes: #547940)
  - cannot open files without dot in names for restore (closes: #451038)
* Suggest postgresql-contrib (closes: #503291)
* Set myself as Maintainer and remove Raphael. Thanks for his work so far.
* Switch Uploaders and Maintainer role to better describe reality.
* Bump to Standards-Version to 3.8.3.
* Update to debhelper level 7, use dh_prep instead of dh_clean -k.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pgadmin/schema/pgFunction.cpp
1
1
//////////////////////////////////////////////////////////////////////////
2
2
//
3
3
// pgAdmin III - PostgreSQL Tools
4
 
// RCS-ID:      $Id: pgFunction.cpp 7883 2009-05-26 16:41:15Z dpage $
 
4
// RCS-ID:      $Id: pgFunction.cpp 8042 2009-09-24 17:04:37Z guillaume $
5
5
// Copyright (C) 2002 - 2009, The pgAdmin Development Team
6
6
// This software is released under the BSD Licence
7
7
//
245
245
            + GetSource()
246
246
            + wxT("\n\n")
247
247
            + GetGrant(wxT("X"), wxT("PROCEDURE ") + qtSig);
 
248
 
 
249
        if (!GetComment().IsNull())
 
250
        {
 
251
            sql += wxT("COMMENT ON PROCEDURE ") + GetQuotedFullIdentifier()
 
252
                + wxT(" IS ") + qtDbString(GetComment()) + wxT(";\n");
 
253
        }
248
254
    }
249
255
 
250
256
    return sql;
479
485
                // Check if it is a window function
480
486
                function->iSetIsWindow(functions->GetBool(wxT("proiswindow")));
481
487
            }
482
 
                        else
 
488
            else
483
489
                function->iSetIsWindow(false);
484
490
 
485
491
            // Now iterate the arguments and build the arrays
516
522
                        if (isProcedure)
517
523
                            mode = wxT("IN OUT");
518
524
                        else
 
525
                        {
519
526
                            mode = wxT("INOUT");
 
527
                            nArgsIN++;
 
528
                        }
520
529
                    else if (mode == wxT("3"))
521
530
                        mode = wxT("IN OUT");
522
531
                    else if (mode == wxT("v"))
574
583
                for (size_t index = 0; index < function->GetArgModesArray().Count(); index++)
575
584
                {
576
585
                    if (function->GetArgModesArray()[index] == wxT("IN") ||
 
586
                        function->GetArgModesArray()[index] == wxT("INOUT") ||
577
587
                        function->GetArgModesArray()[index].IsEmpty())
578
588
                    {
579
589
                        nArgsIN--;