Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1a6FiU-0007QY-CG for pgadmin-hackers@arkaria.postgresql.org; Tue, 08 Dec 2015 10:41:54 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1a6FiT-0002oO-79 for pgadmin-hackers@arkaria.postgresql.org; Tue, 08 Dec 2015 10:41:53 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1a6DyJ-0000LT-L5 for pgadmin-hackers@postgresql.org; Tue, 08 Dec 2015 08:50:07 +0000 Received: from imp-m.ru ([93.174.79.86]) by magus.postgresql.org with esmtp (Exim 4.84) (envelope-from ) id 1a6DyF-0007q5-9J for pgadmin-hackers@postgresql.org; Tue, 08 Dec 2015 08:50:06 +0000 Received: by imp-m.ru (Postfix, from userid 80) id 4EA8B73F4890; Tue, 8 Dec 2015 11:50:00 +0300 (MSK) To: pgadmin-hackers@postgresql.org Subject: patch: fix to use =?UTF-8?Q?=60=60pg=5Fget=5Ffunctiondef=28=29=60?= =?UTF-8?Q?=60?= X-PHP-Originating-Script: 0:rcube.php MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_a382c0ac7c84c4b37b4676dc19daaba7" Date: Tue, 08 Dec 2015 11:50:00 +0300 From: Andrej Antonov Message-ID: <8214ef66e4cf3dc04bd99a0af601e5ab@imp-m.ru> X-Sender: antonov@imp-m.ru User-Agent: Roundcube Webmail/1.0.3 X-Pg-Spam-Score: -1.9 (-) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --=_a382c0ac7c84c4b37b4676dc19daaba7 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8; format=flowed patch: fix to use ``pg_get_functiondef()`` [see attachment file] it is copy of pull-request https://github.com/postgres/pgadmin3/pull/12 thank you! -- Андрей Антонов, инженер-программист отдела информационных технологий и программирования, компания «Импульс М» --=_a382c0ac7c84c4b37b4676dc19daaba7 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-using-pg_get_functiondef.patch Content-Disposition: attachment; filename=0001-using-pg_get_functiondef.patch; size=4985 RnJvbSBjODMzMGZlZmEwNTI3OGI3M2Y4YTRmNzk2NDVmNGM0ZTkyZjM0Mzc1 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiAiQW5kcmVqIEFudG9u b3YgKGltcHVsc20ud29yaykiIDxhbnRvbm92QGltcC1tLnJ1PgpEYXRlOiBN b24sIDcgRGVjIDIwMTUgMTg6MjY6NTIgKzAzMDAKU3ViamVjdDogW1BBVENI XSB1c2luZyBgYHBnX2dldF9mdW5jdGlvbmRlZiguLilgYAoKLS0tCiBwZ2Fk bWluL2luY2x1ZGUvc2NoZW1hL3BnRnVuY3Rpb24uaCB8IDEwICsrKysrKysr Ky0KIHBnYWRtaW4vc2NoZW1hL3BnRnVuY3Rpb24uY3BwICAgICAgIHwgMzEg KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogMiBmaWxlcyBjaGFu Z2VkLCAzMyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3BnYWRtaW4vaW5jbHVkZS9zY2hlbWEvcGdGdW5jdGlvbi5oIGIv cGdhZG1pbi9pbmNsdWRlL3NjaGVtYS9wZ0Z1bmN0aW9uLmgKaW5kZXggN2Nk NmZmZC4uYmMzOTg2NSAxMDA2NDQKLS0tIGEvcGdhZG1pbi9pbmNsdWRlL3Nj aGVtYS9wZ0Z1bmN0aW9uLmgKKysrIGIvcGdhZG1pbi9pbmNsdWRlL3NjaGVt YS9wZ0Z1bmN0aW9uLmgKQEAgLTExOCw2ICsxMTgsMTQgQEAgcHVibGljOgog CXsKIAkJc291cmNlID0gczsKIAl9CisJd3hTdHJpbmcgR2V0RnVuY3Rpb25E ZWZCeVBnKCkgY29uc3QKKwl7CisJCXJldHVybiBmdW5jdGlvbkRlZkJ5UGc7 CisJfQorCXZvaWQgaVNldEZ1bmN0aW9uRGVmQnlQZyhjb25zdCB3eFN0cmlu ZyAmcykKKwl7CisJCWZ1bmN0aW9uRGVmQnlQZyA9IHM7CisJfQogCXd4U3Ry aW5nIEdldEJpbigpIGNvbnN0CiAJewogCQlyZXR1cm4gYmluOwpAQCAtMjUx LDcgKzI1OSw3IEBAIHByb3RlY3RlZDoKIAlwZ0Z1bmN0aW9uKHBnU2NoZW1h ICpuZXdTY2hlbWEsIGludCBuZXdUeXBlLCBjb25zdCB3eFN0cmluZyAmbmV3 TmFtZSA9IHd4VCgiIikpOwogCiBwcml2YXRlOgotCXd4U3RyaW5nIHJldHVy blR5cGUsIGxhbmd1YWdlLCB2b2xhdGlsaXR5LCBzb3VyY2UsIGJpbjsKKwl3 eFN0cmluZyByZXR1cm5UeXBlLCBsYW5ndWFnZSwgdm9sYXRpbGl0eSwgc291 cmNlLCBmdW5jdGlvbkRlZkJ5UGcsIGJpbjsKIAl3eEFycmF5U3RyaW5nIGFy Z05hbWVzQXJyYXksIGFyZ1R5cGVzQXJyYXksIGFyZ01vZGVzQXJyYXksIGFy Z0RlZnNBcnJheTsKIAlib29sIHJldHVybkFzU2V0LCBzZWN1cmVEZWZpbmVy LCBpc1N0cmljdCwgaXNXaW5kb3csIGlzTGVha1Byb29mOwogCWxvbmcgYXJn Q291bnQsIGNvc3QsIHJvd3MsIGFyZ0RlZlZhbENvdW50LCBwcm9jVHlwZTsK ZGlmZiAtLWdpdCBhL3BnYWRtaW4vc2NoZW1hL3BnRnVuY3Rpb24uY3BwIGIv cGdhZG1pbi9zY2hlbWEvcGdGdW5jdGlvbi5jcHAKaW5kZXggYmQwMzQyYS4u NTQ0MGEwOSAxMDA2NDQKLS0tIGEvcGdhZG1pbi9zY2hlbWEvcGdGdW5jdGlv bi5jcHAKKysrIGIvcGdhZG1pbi9zY2hlbWEvcGdGdW5jdGlvbi5jcHAKQEAg LTI4NywxMiArMjg3LDE4IEBAIHd4U3RyaW5nIHBnRnVuY3Rpb246OkdldFNx bChjdGxUcmVlICpicm93c2VyKQogCQl3eFN0cmluZyBxdFNpZyA9IEdldFF1 b3RlZEZ1bGxJZGVudGlmaWVyKCkgICsgd3hUKCIoIikgKyBHZXRBcmdTaWdM aXN0KCkgKyB3eFQoIikiKTsKIAogCQlzcWwgPSB3eFQoIi0tIEZ1bmN0aW9u OiAiKSArIHF0U2lnICsgd3hUKCJcblxuIikKLQkJICAgICAgKyB3eFQoIi0t IERST1AgRlVOQ1RJT04gIikgKyBxdFNpZyArIHd4VCgiOyIpCi0JCSAgICAg ICsgd3hUKCJcblxuQ1JFQVRFIE9SIFJFUExBQ0UgRlVOQ1RJT04gIikgKyBx dE5hbWU7Ci0KLQkJLy8gVXNlIE9yYWNsZSBzdHlsZSBzeW50YXggZm9yIGVk Yi1zcGwgZnVuY3Rpb25zCi0JCWlmIChHZXRMYW5ndWFnZSgpID09IHd4VCgi ZWRic3BsIikgJiYgR2V0UHJvY1R5cGUoKSA9PSAyKQorCQkgICAgICArIHd4 VCgiLS0gRFJPUCBGVU5DVElPTiAiKSArIHF0U2lnICsgd3hUKCI7XG5cbiIp OworCQkKKwkJaWYgKCEhR2V0RnVuY3Rpb25EZWZCeVBnKCkpCisJCXsKKwkJ CXNxbCArPSBHZXRGdW5jdGlvbkRlZkJ5UGcoKS5UcmltKCk7CisJCX0KKwkJ ZWxzZSBpZiAoR2V0TGFuZ3VhZ2UoKSA9PSB3eFQoImVkYnNwbCIpICYmIEdl dFByb2NUeXBlKCkgPT0gMikKIAkJeworCQkJc3FsICs9IHd4VCgiQ1JFQVRF IE9SIFJFUExBQ0UgRlVOQ1RJT04gIikgKyBxdE5hbWU7CisKKwkJCS8vIFVz ZSBPcmFjbGUgc3R5bGUgc3ludGF4IGZvciBlZGItc3BsIGZ1bmN0aW9ucwor CiAJCQlzcWwgKz0gd3hUKCJcblJFVFVSTiAiKTsKIAkJCXNxbCArPSBHZXRS ZXR1cm5UeXBlKCk7CiAKQEAgLTMwNCw2ICszMTAsOCBAQCB3eFN0cmluZyBw Z0Z1bmN0aW9uOjpHZXRTcWwoY3RsVHJlZSAqYnJvd3NlcikKIAkJfQogCQll bHNlCiAJCXsKKwkJCXNxbCArPSB3eFQoIkNSRUFURSBPUiBSRVBMQUNFIEZV TkNUSU9OICIpICsgcXROYW1lOworCiAJCQlzcWwgKz0gd3hUKCJcbiAgUkVU VVJOUyAiKTsKIAkJCWlmIChHZXRSZXR1cm5Bc1NldCgpICYmICFHZXRSZXR1 cm5UeXBlKCkuU3RhcnRzV2l0aCh3eFQoIlRBQkxFIikpKQogCQkJCXNxbCAr PSB3eFQoIlNFVE9GICIpOwpAQCAtNjQzLDcgKzY1MSw3IEBAIHBnRnVuY3Rp b24gKnBnRnVuY3Rpb25GYWN0b3J5OjpBcHBlbmRGdW5jdGlvbnMocGdPYmpl Y3QgKm9iaiwgcGdTY2hlbWEgKnNjaGVtYSwKIAljYWNoZU1hcCB0eXBlQ2Fj aGUsIGV4cHJDYWNoZTsKIAogCXBnRnVuY3Rpb24gKmZ1bmN0aW9uID0gMDsK LQl3eFN0cmluZyBhcmdOYW1lc0NvbCwgYXJnRGVmc0NvbCwgcHJvQ29uZmln Q29sLCBwcm9UeXBlLCBzZWNsYWI7CisJd3hTdHJpbmcgYXJnTmFtZXNDb2ws IGFyZ0RlZnNDb2wsIHByb0NvbmZpZ0NvbCwgcHJvVHlwZSwgZnVuY3Rpb25E ZWZCeVBnU2VsZWN0LCBzZWNsYWI7CiAJaWYgKG9iai0+R2V0Q29ubmVjdGlv bigpLT5CYWNrZW5kTWluaW11bVZlcnNpb24oOCwgMCkpCiAJCWFyZ05hbWVz Q29sID0gd3hUKCJwcm9hcmduYW1lcywgIik7CiAJaWYgKG9iai0+R2V0Q29u bmVjdGlvbigpLT5IYXNGZWF0dXJlKEZFQVRVUkVfRlVOQ1RJT05fREVGQVVM VFMpICYmICFvYmotPkdldENvbm5lY3Rpb24oKS0+QmFja2VuZE1pbmltdW1W ZXJzaW9uKDgsIDQpKQpAQCAtNjU0LDYgKzY2MiwxMSBAQCBwZ0Z1bmN0aW9u ICpwZ0Z1bmN0aW9uRmFjdG9yeTo6QXBwZW5kRnVuY3Rpb25zKHBnT2JqZWN0 ICpvYmosIHBnU2NoZW1hICpzY2hlbWEsCiAJCXByb0NvbmZpZ0NvbCA9IHd4 VCgicHJvY29uZmlnLCAiKTsKIAlpZiAob2JqLT5HZXRDb25uZWN0aW9uKCkt PkVkYk1pbmltdW1WZXJzaW9uKDgsIDEpKQogCQlwcm9UeXBlID0gd3hUKCJw cm90eXBlLCAiKTsKKwlpZiAob2JqLT5HZXRDb25uZWN0aW9uKCktPkJhY2tl bmRNaW5pbXVtVmVyc2lvbig4LCA0KSkKKwl7CisJCWZ1bmN0aW9uRGVmQnlQ Z1NlbGVjdCA9IHd4VCgiLFxuIikKKwkJICAgICAgICAgd3hUKCJwZ19nZXRf ZnVuY3Rpb25kZWYocHIub2lkKSBBUyBmdW5jdGlvbl9kZWZfYnlfcGciKTsK Kwl9CiAJaWYgKG9iai0+R2V0Q29ubmVjdGlvbigpLT5CYWNrZW5kTWluaW11 bVZlcnNpb24oOSwgMSkpCiAJewogCQlzZWNsYWIgPSB3eFQoIixcbiIpCkBA IC02NjQsNyArNjc3LDcgQEAgcGdGdW5jdGlvbiAqcGdGdW5jdGlvbkZhY3Rv cnk6OkFwcGVuZEZ1bmN0aW9ucyhwZ09iamVjdCAqb2JqLCBwZ1NjaGVtYSAq c2NoZW1hLAogCXBnU2V0ICpmdW5jdGlvbnMgPSBvYmotPkdldERhdGFiYXNl KCktPkV4ZWN1dGVTZXQoCiAJICAgICAgICAgICAgICAgICAgICAgICB3eFQo IlNFTEVDVCBwci5vaWQsIHByLnhtaW4sIHByLiosIGZvcm1hdF90eXBlKFRZ UC5vaWQsIE5VTEwpIEFTIHR5cG5hbWUsIHR5cG5zLm5zcG5hbWUgQVMgdHlw bnNwLCBsYW5uYW1lLCAiKSArCiAJICAgICAgICAgICAgICAgICAgICAgICBh cmdOYW1lc0NvbCAgKyBhcmdEZWZzQ29sICsgcHJvQ29uZmlnQ29sICsgcHJv VHlwZSArCi0JICAgICAgICAgICAgICAgICAgICAgICB3eFQoIiAgICAgICBw Z19nZXRfdXNlcmJ5aWQocHJvb3duZXIpIGFzIGZ1bmNvd25lciwgZGVzY3Jp cHRpb24iKSArIHNlY2xhYiArIHd4VCgiXG4iKQorCSAgICAgICAgICAgICAg ICAgICAgICAgd3hUKCIgICAgICAgcGdfZ2V0X3VzZXJieWlkKHByb293bmVy KSBhcyBmdW5jb3duZXIsIGRlc2NyaXB0aW9uIikgKyBmdW5jdGlvbkRlZkJ5 UGdTZWxlY3QgKyBzZWNsYWIgKyB3eFQoIlxuIikKIAkgICAgICAgICAgICAg ICAgICAgICAgIHd4VCgiICBGUk9NIHBnX3Byb2MgcHJcbiIpCiAJICAgICAg ICAgICAgICAgICAgICAgICB3eFQoIiAgSk9JTiBwZ190eXBlIHR5cCBPTiB0 eXAub2lkPXByb3JldHR5cGVcbiIpCiAJICAgICAgICAgICAgICAgICAgICAg ICB3eFQoIiAgSk9JTiBwZ19uYW1lc3BhY2UgdHlwbnMgT04gdHlwbnMub2lk PXR5cC50eXBuYW1lc3BhY2VcbiIpCkBAIC05NDgsNiArOTYxLDEwIEBAIHBn RnVuY3Rpb24gKnBnRnVuY3Rpb25GYWN0b3J5OjpBcHBlbmRGdW5jdGlvbnMo cGdPYmplY3QgKm9iaiwgcGdTY2hlbWEgKnNjaGVtYSwKIAkJCWZ1bmN0aW9u LT5pU2V0UmV0dXJuQXNTZXQoZnVuY3Rpb25zLT5HZXRCb29sKHd4VCgicHJv cmV0c2V0IikpKTsKIAkJCWZ1bmN0aW9uLT5pU2V0SXNTdHJpY3QoZnVuY3Rp b25zLT5HZXRCb29sKHd4VCgicHJvaXNzdHJpY3QiKSkpOwogCQkJZnVuY3Rp b24tPmlTZXRTb3VyY2UoZnVuY3Rpb25zLT5HZXRWYWwod3hUKCJwcm9zcmMi KSkpOworCQkJaWYgKCEhZnVuY3Rpb25EZWZCeVBnU2VsZWN0KQorCQkJewor CQkJCWZ1bmN0aW9uLT5pU2V0RnVuY3Rpb25EZWZCeVBnKGZ1bmN0aW9ucy0+ R2V0VmFsKHd4VCgiZnVuY3Rpb25fZGVmX2J5X3BnIikpKTsKKwkJCX0KIAkJ CWZ1bmN0aW9uLT5pU2V0QmluKGZ1bmN0aW9ucy0+R2V0VmFsKHd4VCgicHJv YmluIikpKTsKIAogCQkJd3hTdHJpbmcgdm9sID0gZnVuY3Rpb25zLT5HZXRW YWwod3hUKCJwcm92b2xhdGlsZSIpKTsKLS0gCjIuNi4zCgo= --=_a382c0ac7c84c4b37b4676dc19daaba7 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --=_a382c0ac7c84c4b37b4676dc19daaba7--