Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rUI4G-009zVv-Pv for pgsql-hackers@arkaria.postgresql.org; Mon, 29 Jan 2024 03:12:17 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1rUI4G-00B6a2-1W for pgsql-hackers@arkaria.postgresql.org; Mon, 29 Jan 2024 03:12:16 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rUI4F-00B6Zu-Lz for pgsql-hackers@lists.postgresql.org; Mon, 29 Jan 2024 03:12:15 +0000 Received: from mail-yw1-x1135.google.com ([2607:f8b0:4864:20::1135]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1rUI4D-004GQL-6Z for pgsql-hackers@lists.postgresql.org; Mon, 29 Jan 2024 03:12:15 +0000 Received: by mail-yw1-x1135.google.com with SMTP id 00721157ae682-5f69383e653so26059317b3.1 for ; Sun, 28 Jan 2024 19:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706497932; x=1707102732; darn=lists.postgresql.org; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:from:subject:cc:to:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=+j4LwzKHCDpBp+JZXeMW/GU9jaAfQsx4WUHve9DwNBw=; b=UTa+567kl17ThGtUgoSHBrdBJzmwlYCdu/j+Hncxh8D2uzokdSFaXivG1XTqHws+Mc t9sGcROuHwFl9W2Bwuf5P4rl6dVWwrs8xWqiuaW9N/vz+0Q/uF5z7qvmRdX9vIX4pVvm 9MVvWWtZQRP2EjuzXb106HwHSO0ENiwwyGqi033BSIfNqb9m+wB0kL37m2SBSn3zyKDo MSZyLEmNpaH7CcvycTT/Yg0ks5/t5bGfJyToxnMRAKZY7+RuX6OtncYhHupeHRpkvgmc Q++9c/3ZogrTrxYcbvbi8Cf6rQQ2Uuhs3OiMh4caJqwWviKOEa/WlY7zkCkvW+9YL1p+ LzNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706497932; x=1707102732; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:from:subject:cc:to:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+j4LwzKHCDpBp+JZXeMW/GU9jaAfQsx4WUHve9DwNBw=; b=SjRv8sdHYj0Iq36rnPnWtE8+bFZ0dtvH8JyA8WkZ0HcVzS9Rn53an5xt6aQgXQpcU1 1Ndwhljl2fpOlJGBdHHUiSzozjcujR7ryDPK+NmRHWYAxmAC7vsTEv1A50340AjKpyx0 xJEWJmzhMlmPmke7bq4hHPkhiTlPPeRdDXFpowk27O8XLi7Rn9b2RdBvVJOypaqbyMVr XQXLUqziIbBCQx5CATXC0E587AX/a7zJOFXjBSSDnMe77npC+8Ky3imU3kigDyWU+UxI 8jNqmv5KCvVpo0Jevb0cZvXiFJMqUN4Ys4S3LCumCRJLjjHbzLpttnnFpFVHbJKrjmLY RZow== X-Gm-Message-State: AOJu0YzoFQ3gOMiSSuhqC2vzdYU9unx909Obxwxv3AVLml8OD6a9tXzV dK0fXw4WSaHJve7GbDVJNJyxavlQETaEj2m3AG2juQiW/f7hWtcK X-Google-Smtp-Source: AGHT+IG/mhB0+4J0tjSzM1A/lnBD7o6RTp355u7RB9uKg5onVOLM3CRq1VGvYGSatDP3MzdNSGBXBQ== X-Received: by 2002:a05:690c:e0f:b0:5ff:a40c:5fc1 with SMTP id cp15-20020a05690c0e0f00b005ffa40c5fc1mr3879585ywb.54.1706497931771; Sun, 28 Jan 2024 19:12:11 -0800 (PST) Received: from localhost (KD036014041111.ppp-bb.dion.ne.jp. [36.14.41.111]) by smtp.gmail.com with ESMTPSA id k30-20020a63ba1e000000b005c661a432d7sm4227795pgf.75.2024.01.28.19.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jan 2024 19:12:11 -0800 (PST) Date: Mon, 29 Jan 2024 12:12:00 +0900 (JST) Message-Id: <20240129.121200.235012930453045390.horikyota.ntt@gmail.com> To: jeevan.chalke@enterprisedb.com Cc: andrew@dunslane.net, tgl@sss.pgh.pa.us, peter@eisentraut.org, pgsql-hackers@lists.postgresql.org Subject: Re: More new SQL/JSON item methods From: Kyotaro Horiguchi In-Reply-To: References: <451195.1706216300@sss.pgh.pa.us> <65ac43de-8abe-f9ef-1fe8-838ea22e9c45@dunslane.net> User-Agent: Mew version 6.8 on Emacs 27.2 Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Mon_Jan_29_12_12_00_2024_372)--" Content-Transfer-Encoding: 7bit List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk ----Next_Part(Mon_Jan_29_12_12_00_2024_372)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit I have two possible issues in a recent commit. Commit 66ea94e8e6 has introduced the following messages: (Aplogizies in advance if the commit is not related to this thread.) jsonpath_exec.c:1287 > if (numeric_is_nan(num) || numeric_is_inf(num)) > RETURN_ERROR(ereport(ERROR, > (errcode(ERRCODE_NON_NUMERIC_SQL_JSON_ITEM), > errmsg("numeric argument of jsonpath item method .%s() is out of range for type decimal or number", > jspOperationName(jsp->type))))); :1387 > noerr = DirectInputFunctionCallSafe(numeric_in, numstr, ... > if (!noerr || escontext.error_occurred) > RETURN_ERROR(ereport(ERROR, > (errcode(ERRCODE_NON_NUMERIC_SQL_JSON_ITEM), > errmsg("string argument of jsonpath item method .%s() is not a valid representation of a decimal or number", They seem to be suggesting that PostgreSQL has the types "decimal" and "number". I know of the former, but I don't think PostgreSQL has the latter type. Perhaps the "number" was intended to refer to "numeric"? (And I think it is largely helpful if the given string were shown in the error message, but it would be another issue.) The same commit has introduced the following set of messages: > %s format is not recognized: "%s" > date format is not recognized: "%s" > time format is not recognized: "%s" > time_tz format is not recognized: "%s" > timestamp format is not recognized: "%s" > timestamp_tz format is not recognized: "%s" I believe that the first line was intended to cover all the others:p They are attached to this message separately. regards. -- Kyotaro Horiguchi NTT Open Source Software Center ----Next_Part(Mon_Jan_29_12_12_00_2024_372)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="jsonpath_exec_fix_a_type_name.patch" ZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9qc29ucGF0aF9leGVjLmMgYi9zcmMv YmFja2VuZC91dGlscy9hZHQvanNvbnBhdGhfZXhlYy5jDQppbmRleCAyMmY1OThjZDM1Li5jMTA5 MjZhOGEyIDEwMDY0NA0KLS0tIGEvc3JjL2JhY2tlbmQvdXRpbHMvYWR0L2pzb25wYXRoX2V4ZWMu Yw0KKysrIGIvc3JjL2JhY2tlbmQvdXRpbHMvYWR0L2pzb25wYXRoX2V4ZWMuYw0KQEAgLTEyODcs NyArMTI4Nyw3IEBAIGV4ZWN1dGVJdGVtT3B0VW53cmFwVGFyZ2V0KEpzb25QYXRoRXhlY0NvbnRl eHQgKmN4dCwgSnNvblBhdGhJdGVtICpqc3AsDQogCQkJCQlpZiAobnVtZXJpY19pc19uYW4obnVt KSB8fCBudW1lcmljX2lzX2luZihudW0pKQ0KIAkJCQkJCVJFVFVSTl9FUlJPUihlcmVwb3J0KEVS Uk9SLA0KIAkJCQkJCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfTk9OX05VTUVSSUNfU1FMX0pTT05f SVRFTSksDQotCQkJCQkJCQkJCQkgIGVycm1zZygibnVtZXJpYyBhcmd1bWVudCBvZiBqc29ucGF0 aCBpdGVtIG1ldGhvZCAuJXMoKSBpcyBvdXQgb2YgcmFuZ2UgZm9yIHR5cGUgZGVjaW1hbCBvciBu dW1iZXIiLA0KKwkJCQkJCQkJCQkJICBlcnJtc2coIm51bWVyaWMgYXJndW1lbnQgb2YganNvbnBh dGggaXRlbSBtZXRob2QgLiVzKCkgaXMgb3V0IG9mIHJhbmdlIGZvciB0eXBlIGRlY2ltYWwgb3Ig bnVtZXJpYyIsDQogCQkJCQkJCQkJCQkJCSBqc3BPcGVyYXRpb25OYW1lKGpzcC0+dHlwZSkpKSkp Ow0KIA0KIAkJCQkJaWYgKGpzcC0+dHlwZSA9PSBqcGlEZWNpbWFsKQ0KQEAgLTEzMTIsMTQgKzEz MTIsMTQgQEAgZXhlY3V0ZUl0ZW1PcHRVbndyYXBUYXJnZXQoSnNvblBhdGhFeGVjQ29udGV4dCAq Y3h0LCBKc29uUGF0aEl0ZW0gKmpzcCwNCiAJCQkJCWlmICghbm9lcnIgfHwgZXNjb250ZXh0LmVy cm9yX29jY3VycmVkKQ0KIAkJCQkJCVJFVFVSTl9FUlJPUihlcmVwb3J0KEVSUk9SLA0KIAkJCQkJ CQkJCQkJIChlcnJjb2RlKEVSUkNPREVfTk9OX05VTUVSSUNfU1FMX0pTT05fSVRFTSksDQotCQkJ CQkJCQkJCQkgIGVycm1zZygic3RyaW5nIGFyZ3VtZW50IG9mIGpzb25wYXRoIGl0ZW0gbWV0aG9k IC4lcygpIGlzIG5vdCBhIHZhbGlkIHJlcHJlc2VudGF0aW9uIG9mIGEgZGVjaW1hbCBvciBudW1i ZXIiLA0KKwkJCQkJCQkJCQkJICBlcnJtc2coInN0cmluZyBhcmd1bWVudCBvZiBqc29ucGF0aCBp dGVtIG1ldGhvZCAuJXMoKSBpcyBub3QgYSB2YWxpZCByZXByZXNlbnRhdGlvbiBvZiBhIGRlY2lt YWwgb3IgbnVtZXJpYyIsDQogCQkJCQkJCQkJCQkJCSBqc3BPcGVyYXRpb25OYW1lKGpzcC0+dHlw ZSkpKSkpOw0KIA0KIAkJCQkJbnVtID0gRGF0dW1HZXROdW1lcmljKGRhdHVtKTsNCiAJCQkJCWlm IChudW1lcmljX2lzX25hbihudW0pIHx8IG51bWVyaWNfaXNfaW5mKG51bSkpDQogCQkJCQkJUkVU VVJOX0VSUk9SKGVyZXBvcnQoRVJST1IsDQogCQkJCQkJCQkJCQkgKGVycmNvZGUoRVJSQ09ERV9O T05fTlVNRVJJQ19TUUxfSlNPTl9JVEVNKSwNCi0JCQkJCQkJCQkJCSAgZXJybXNnKCJzdHJpbmcg YXJndW1lbnQgb2YganNvbnBhdGggaXRlbSBtZXRob2QgLiVzKCkgaXMgbm90IGEgdmFsaWQgcmVw cmVzZW50YXRpb24gb2YgYSBkZWNpbWFsIG9yIG51bWJlciIsDQorCQkJCQkJCQkJCQkgIGVycm1z Zygic3RyaW5nIGFyZ3VtZW50IG9mIGpzb25wYXRoIGl0ZW0gbWV0aG9kIC4lcygpIGlzIG5vdCBh IHZhbGlkIHJlcHJlc2VudGF0aW9uIG9mIGEgZGVjaW1hbCBvciBudW1lcmljIiwNCiAJCQkJCQkJ CQkJCQkJIGpzcE9wZXJhdGlvbk5hbWUoanNwLT50eXBlKSkpKSk7DQogDQogCQkJCQlyZXMgPSBq cGVyT2s7DQpAQCAtMTQwMSw3ICsxNDAxLDcgQEAgZXhlY3V0ZUl0ZW1PcHRVbndyYXBUYXJnZXQo SnNvblBhdGhFeGVjQ29udGV4dCAqY3h0LCBKc29uUGF0aEl0ZW0gKmpzcCwNCiAJCQkJCWlmICgh bm9lcnIgfHwgZXNjb250ZXh0LmVycm9yX29jY3VycmVkKQ0KIAkJCQkJCVJFVFVSTl9FUlJPUihl cmVwb3J0KEVSUk9SLA0KIAkJCQkJCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfTk9OX05VTUVSSUNf U1FMX0pTT05fSVRFTSksDQotCQkJCQkJCQkJCQkgIGVycm1zZygic3RyaW5nIGFyZ3VtZW50IG9m IGpzb25wYXRoIGl0ZW0gbWV0aG9kIC4lcygpIGlzIG5vdCBhIHZhbGlkIHJlcHJlc2VudGF0aW9u IG9mIGEgZGVjaW1hbCBvciBudW1iZXIiLA0KKwkJCQkJCQkJCQkJICBlcnJtc2coInN0cmluZyBh cmd1bWVudCBvZiBqc29ucGF0aCBpdGVtIG1ldGhvZCAuJXMoKSBpcyBub3QgYSB2YWxpZCByZXBy ZXNlbnRhdGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVtZXJpYyIsDQogCQkJCQkJCQkJCQkJCSBqc3BP cGVyYXRpb25OYW1lKGpzcC0+dHlwZSkpKSkpOw0KIA0KIAkJCQkJbnVtID0gRGF0dW1HZXROdW1l cmljKG51bWRhdHVtKTsNCmRpZmYgLS1naXQgYS9zcmMvdGVzdC9yZWdyZXNzL2V4cGVjdGVkL2pz b25iX2pzb25wYXRoLm91dCBiL3NyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvanNvbmJfanNvbnBh dGgub3V0DQppbmRleCBlZWEyYWYzMGM4Li45ZDhjZTQ4YTI1IDEwMDY0NA0KLS0tIGEvc3JjL3Rl c3QvcmVncmVzcy9leHBlY3RlZC9qc29uYl9qc29ucGF0aC5vdXQNCisrKyBiL3NyYy90ZXN0L3Jl Z3Jlc3MvZXhwZWN0ZWQvanNvbmJfanNvbnBhdGgub3V0DQpAQCAtMjE0NCw3ICsyMTQ0LDcgQEAg c2VsZWN0IGpzb25iX3BhdGhfcXVlcnkoJyIxLjIzIicsICckLmRlY2ltYWwoKScpOw0KICgxIHJv dykNCiANCiBzZWxlY3QganNvbmJfcGF0aF9xdWVyeSgnIjEuMjNhYWEiJywgJyQuZGVjaW1hbCgp Jyk7DQotRVJST1I6ICBzdHJpbmcgYXJndW1lbnQgb2YganNvbnBhdGggaXRlbSBtZXRob2QgLmRl Y2ltYWwoKSBpcyBub3QgYSB2YWxpZCByZXByZXNlbnRhdGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVt YmVyDQorRVJST1I6ICBzdHJpbmcgYXJndW1lbnQgb2YganNvbnBhdGggaXRlbSBtZXRob2QgLmRl Y2ltYWwoKSBpcyBub3QgYSB2YWxpZCByZXByZXNlbnRhdGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVt ZXJpYw0KIHNlbGVjdCBqc29uYl9wYXRoX3F1ZXJ5KCcxZTEwMDAnLCAnJC5kZWNpbWFsKCknKTsN CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAganNvbmJfcGF0aF9xdWVyeSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgDQogLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQ0KQEAgLTIxNTIsMTMgKzIxNTIsMTMgQEAgc2VsZWN0IGpzb25iX3Bh dGhfcXVlcnkoJzFlMTAwMCcsICckLmRlY2ltYWwoKScpOw0KICgxIHJvdykNCiANCiBzZWxlY3Qg anNvbmJfcGF0aF9xdWVyeSgnIm5hbiInLCAnJC5kZWNpbWFsKCknKTsNCi1FUlJPUjogIHN0cmlu ZyBhcmd1bWVudCBvZiBqc29ucGF0aCBpdGVtIG1ldGhvZCAuZGVjaW1hbCgpIGlzIG5vdCBhIHZh bGlkIHJlcHJlc2VudGF0aW9uIG9mIGEgZGVjaW1hbCBvciBudW1iZXINCitFUlJPUjogIHN0cmlu ZyBhcmd1bWVudCBvZiBqc29ucGF0aCBpdGVtIG1ldGhvZCAuZGVjaW1hbCgpIGlzIG5vdCBhIHZh bGlkIHJlcHJlc2VudGF0aW9uIG9mIGEgZGVjaW1hbCBvciBudW1lcmljDQogc2VsZWN0IGpzb25i X3BhdGhfcXVlcnkoJyJOYU4iJywgJyQuZGVjaW1hbCgpJyk7DQotRVJST1I6ICBzdHJpbmcgYXJn dW1lbnQgb2YganNvbnBhdGggaXRlbSBtZXRob2QgLmRlY2ltYWwoKSBpcyBub3QgYSB2YWxpZCBy ZXByZXNlbnRhdGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVtYmVyDQorRVJST1I6ICBzdHJpbmcgYXJn dW1lbnQgb2YganNvbnBhdGggaXRlbSBtZXRob2QgLmRlY2ltYWwoKSBpcyBub3QgYSB2YWxpZCBy ZXByZXNlbnRhdGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVtZXJpYw0KIHNlbGVjdCBqc29uYl9wYXRo X3F1ZXJ5KCciaW5mIicsICckLmRlY2ltYWwoKScpOw0KLUVSUk9SOiAgc3RyaW5nIGFyZ3VtZW50 IG9mIGpzb25wYXRoIGl0ZW0gbWV0aG9kIC5kZWNpbWFsKCkgaXMgbm90IGEgdmFsaWQgcmVwcmVz ZW50YXRpb24gb2YgYSBkZWNpbWFsIG9yIG51bWJlcg0KK0VSUk9SOiAgc3RyaW5nIGFyZ3VtZW50 IG9mIGpzb25wYXRoIGl0ZW0gbWV0aG9kIC5kZWNpbWFsKCkgaXMgbm90IGEgdmFsaWQgcmVwcmVz ZW50YXRpb24gb2YgYSBkZWNpbWFsIG9yIG51bWVyaWMNCiBzZWxlY3QganNvbmJfcGF0aF9xdWVy eSgnIi1pbmYiJywgJyQuZGVjaW1hbCgpJyk7DQotRVJST1I6ICBzdHJpbmcgYXJndW1lbnQgb2Yg anNvbnBhdGggaXRlbSBtZXRob2QgLmRlY2ltYWwoKSBpcyBub3QgYSB2YWxpZCByZXByZXNlbnRh dGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVtYmVyDQorRVJST1I6ICBzdHJpbmcgYXJndW1lbnQgb2Yg anNvbnBhdGggaXRlbSBtZXRob2QgLmRlY2ltYWwoKSBpcyBub3QgYSB2YWxpZCByZXByZXNlbnRh dGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVtZXJpYw0KIHNlbGVjdCBqc29uYl9wYXRoX3F1ZXJ5KCci aW5mIicsICckLmRlY2ltYWwoKScsIHNpbGVudCA9PiB0cnVlKTsNCiAganNvbmJfcGF0aF9xdWVy eSANCiAtLS0tLS0tLS0tLS0tLS0tLS0NCkBAIC0yMjI0LDcgKzIyMjQsNyBAQCBzZWxlY3QganNv bmJfcGF0aF9xdWVyeSgnMTIzNDUuNjc4JywgJyQuZGVjaW1hbCg2LCAxKScpOw0KICgxIHJvdykN CiANCiBzZWxlY3QganNvbmJfcGF0aF9xdWVyeSgnMTIzNDUuNjc4JywgJyQuZGVjaW1hbCg2LCAy KScpOw0KLUVSUk9SOiAgc3RyaW5nIGFyZ3VtZW50IG9mIGpzb25wYXRoIGl0ZW0gbWV0aG9kIC5k ZWNpbWFsKCkgaXMgbm90IGEgdmFsaWQgcmVwcmVzZW50YXRpb24gb2YgYSBkZWNpbWFsIG9yIG51 bWJlcg0KK0VSUk9SOiAgc3RyaW5nIGFyZ3VtZW50IG9mIGpzb25wYXRoIGl0ZW0gbWV0aG9kIC5k ZWNpbWFsKCkgaXMgbm90IGEgdmFsaWQgcmVwcmVzZW50YXRpb24gb2YgYSBkZWNpbWFsIG9yIG51 bWVyaWMNCiBzZWxlY3QganNvbmJfcGF0aF9xdWVyeSgnMTIzNC41Njc4JywgJyQuZGVjaW1hbCg2 LCAyKScpOw0KICBqc29uYl9wYXRoX3F1ZXJ5IA0KIC0tLS0tLS0tLS0tLS0tLS0tLQ0KQEAgLTIy MzIsNyArMjIzMiw3IEBAIHNlbGVjdCBqc29uYl9wYXRoX3F1ZXJ5KCcxMjM0LjU2NzgnLCAnJC5k ZWNpbWFsKDYsIDIpJyk7DQogKDEgcm93KQ0KIA0KIHNlbGVjdCBqc29uYl9wYXRoX3F1ZXJ5KCcx MjM0NS42NzgnLCAnJC5kZWNpbWFsKDQsIDYpJyk7DQotRVJST1I6ICBzdHJpbmcgYXJndW1lbnQg b2YganNvbnBhdGggaXRlbSBtZXRob2QgLmRlY2ltYWwoKSBpcyBub3QgYSB2YWxpZCByZXByZXNl bnRhdGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVtYmVyDQorRVJST1I6ICBzdHJpbmcgYXJndW1lbnQg b2YganNvbnBhdGggaXRlbSBtZXRob2QgLmRlY2ltYWwoKSBpcyBub3QgYSB2YWxpZCByZXByZXNl bnRhdGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVtZXJpYw0KIHNlbGVjdCBqc29uYl9wYXRoX3F1ZXJ5 KCcxMjM0NS42NzgnLCAnJC5kZWNpbWFsKDAsIDYpJyk7DQogRVJST1I6ICBOVU1FUklDIHByZWNp c2lvbiAwIG11c3QgYmUgYmV0d2VlbiAxIGFuZCAxMDAwDQogc2VsZWN0IGpzb25iX3BhdGhfcXVl cnkoJzEyMzQ1LjY3OCcsICckLmRlY2ltYWwoMTAwMSwgNiknKTsNCkBAIC0yNDQwLDcgKzI0NDAs NyBAQCBzZWxlY3QganNvbmJfcGF0aF9xdWVyeSgnIjEuMjMiJywgJyQubnVtYmVyKCknKTsNCiAo MSByb3cpDQogDQogc2VsZWN0IGpzb25iX3BhdGhfcXVlcnkoJyIxLjIzYWFhIicsICckLm51bWJl cigpJyk7DQotRVJST1I6ICBzdHJpbmcgYXJndW1lbnQgb2YganNvbnBhdGggaXRlbSBtZXRob2Qg Lm51bWJlcigpIGlzIG5vdCBhIHZhbGlkIHJlcHJlc2VudGF0aW9uIG9mIGEgZGVjaW1hbCBvciBu dW1iZXINCitFUlJPUjogIHN0cmluZyBhcmd1bWVudCBvZiBqc29ucGF0aCBpdGVtIG1ldGhvZCAu bnVtYmVyKCkgaXMgbm90IGEgdmFsaWQgcmVwcmVzZW50YXRpb24gb2YgYSBkZWNpbWFsIG9yIG51 bWVyaWMNCiBzZWxlY3QganNvbmJfcGF0aF9xdWVyeSgnMWUxMDAwJywgJyQubnVtYmVyKCknKTsN CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAganNvbmJfcGF0aF9xdWVyeSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgDQogLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQ0KQEAgLTI0NDgsMTMgKzI0NDgsMTMgQEAgc2VsZWN0IGpzb25iX3Bh dGhfcXVlcnkoJzFlMTAwMCcsICckLm51bWJlcigpJyk7DQogKDEgcm93KQ0KIA0KIHNlbGVjdCBq c29uYl9wYXRoX3F1ZXJ5KCcibmFuIicsICckLm51bWJlcigpJyk7DQotRVJST1I6ICBzdHJpbmcg YXJndW1lbnQgb2YganNvbnBhdGggaXRlbSBtZXRob2QgLm51bWJlcigpIGlzIG5vdCBhIHZhbGlk IHJlcHJlc2VudGF0aW9uIG9mIGEgZGVjaW1hbCBvciBudW1iZXINCitFUlJPUjogIHN0cmluZyBh cmd1bWVudCBvZiBqc29ucGF0aCBpdGVtIG1ldGhvZCAubnVtYmVyKCkgaXMgbm90IGEgdmFsaWQg cmVwcmVzZW50YXRpb24gb2YgYSBkZWNpbWFsIG9yIG51bWVyaWMNCiBzZWxlY3QganNvbmJfcGF0 aF9xdWVyeSgnIk5hTiInLCAnJC5udW1iZXIoKScpOw0KLUVSUk9SOiAgc3RyaW5nIGFyZ3VtZW50 IG9mIGpzb25wYXRoIGl0ZW0gbWV0aG9kIC5udW1iZXIoKSBpcyBub3QgYSB2YWxpZCByZXByZXNl bnRhdGlvbiBvZiBhIGRlY2ltYWwgb3IgbnVtYmVyDQorRVJST1I6ICBzdHJpbmcgYXJndW1lbnQg b2YganNvbnBhdGggaXRlbSBtZXRob2QgLm51bWJlcigpIGlzIG5vdCBhIHZhbGlkIHJlcHJlc2Vu dGF0aW9uIG9mIGEgZGVjaW1hbCBvciBudW1lcmljDQogc2VsZWN0IGpzb25iX3BhdGhfcXVlcnko JyJpbmYiJywgJyQubnVtYmVyKCknKTsNCi1FUlJPUjogIHN0cmluZyBhcmd1bWVudCBvZiBqc29u cGF0aCBpdGVtIG1ldGhvZCAubnVtYmVyKCkgaXMgbm90IGEgdmFsaWQgcmVwcmVzZW50YXRpb24g b2YgYSBkZWNpbWFsIG9yIG51bWJlcg0KK0VSUk9SOiAgc3RyaW5nIGFyZ3VtZW50IG9mIGpzb25w YXRoIGl0ZW0gbWV0aG9kIC5udW1iZXIoKSBpcyBub3QgYSB2YWxpZCByZXByZXNlbnRhdGlvbiBv ZiBhIGRlY2ltYWwgb3IgbnVtZXJpYw0KIHNlbGVjdCBqc29uYl9wYXRoX3F1ZXJ5KCciLWluZiIn LCAnJC5udW1iZXIoKScpOw0KLUVSUk9SOiAgc3RyaW5nIGFyZ3VtZW50IG9mIGpzb25wYXRoIGl0 ZW0gbWV0aG9kIC5udW1iZXIoKSBpcyBub3QgYSB2YWxpZCByZXByZXNlbnRhdGlvbiBvZiBhIGRl Y2ltYWwgb3IgbnVtYmVyDQorRVJST1I6ICBzdHJpbmcgYXJndW1lbnQgb2YganNvbnBhdGggaXRl bSBtZXRob2QgLm51bWJlcigpIGlzIG5vdCBhIHZhbGlkIHJlcHJlc2VudGF0aW9uIG9mIGEgZGVj aW1hbCBvciBudW1lcmljDQogc2VsZWN0IGpzb25iX3BhdGhfcXVlcnkoJyJpbmYiJywgJyQubnVt YmVyKCknLCBzaWxlbnQgPT4gdHJ1ZSk7DQogIGpzb25iX3BhdGhfcXVlcnkgDQogLS0tLS0tLS0t LS0tLS0tLS0tDQo= ----Next_Part(Mon_Jan_29_12_12_00_2024_372)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="jsonpath_exec_merge_msgs_in_same_pattern.patch" diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index c10926a8a2..4a2a995325 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -2368,8 +2368,8 @@ executeDateTimeMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, if (jsp->type == jpiDatetime) RETURN_ERROR(ereport(ERROR, (errcode(ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION), - errmsg("datetime format is not recognized: \"%s\"", - text_to_cstring(datetime)), + errmsg("%s format is not recognized: \"%s\"", + "datetime", text_to_cstring(datetime)), errhint("Use a datetime template argument to specify the input data format.")))); else RETURN_ERROR(ereport(ERROR, @@ -2401,8 +2401,8 @@ executeDateTimeMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, case TIMETZOID: RETURN_ERROR(ereport(ERROR, (errcode(ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION), - errmsg("date format is not recognized: \"%s\"", - text_to_cstring(datetime))))); + errmsg("%s format is not recognized: \"%s\"", + "date", text_to_cstring(datetime))))); break; case TIMESTAMPOID: value = DirectFunctionCall1(timestamp_date, @@ -2427,8 +2427,8 @@ executeDateTimeMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, case DATEOID: RETURN_ERROR(ereport(ERROR, (errcode(ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION), - errmsg("time format is not recognized: \"%s\"", - text_to_cstring(datetime))))); + errmsg("%s format is not recognized: \"%s\"", + "time", text_to_cstring(datetime))))); break; case TIMEOID: /* Nothing to do for TIME */ break; @@ -2476,8 +2476,8 @@ executeDateTimeMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, case TIMESTAMPOID: RETURN_ERROR(ereport(ERROR, (errcode(ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION), - errmsg("time_tz format is not recognized: \"%s\"", - text_to_cstring(datetime))))); + errmsg("%s format is not recognized: \"%s\"", + "time_tz", text_to_cstring(datetime))))); break; case TIMEOID: value = DirectFunctionCall1(time_timetz, @@ -2525,8 +2525,8 @@ executeDateTimeMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, case TIMETZOID: RETURN_ERROR(ereport(ERROR, (errcode(ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION), - errmsg("timestamp format is not recognized: \"%s\"", - text_to_cstring(datetime))))); + errmsg("%s format is not recognized: \"%s\"", + "timestamp", text_to_cstring(datetime))))); break; case TIMESTAMPOID: /* Nothing to do for TIMESTAMP */ break; @@ -2577,8 +2577,8 @@ executeDateTimeMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, case TIMETZOID: RETURN_ERROR(ereport(ERROR, (errcode(ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION), - errmsg("timestamp_tz format is not recognized: \"%s\"", - text_to_cstring(datetime))))); + errmsg("%s format is not recognized: \"%s\"", + "timestamp_tz", text_to_cstring(datetime))))); break; case TIMESTAMPOID: value = DirectFunctionCall1(timestamp_timestamptz, ----Next_Part(Mon_Jan_29_12_12_00_2024_372)----