pike.git/ lib/ modules/ Sql.pmod/ pgsql_util.pmod

2017-07-10

2017-07-10 11:59:50 by Stephen R. van den Berg <srb@cuci.nl>

• d99e6e2b05f03ed2515ee7369b8b9d44cfe2ac40 (35 lines) (+26/-9) ^{[ Show | Annotate ]}
  Branch: 8.0

pgsql: Support multiset binary literals and avoid copying Stdio.Buffer() bindings.

32:    "cache_autoprepared_statements","reconnect","text_query","is_superuser",    "server_encoding","server_version","integer_datetimes",    "session_authorization">); + constant stdiobuftype = typeof(Stdio.Buffer());       /* Statements matching createprefix cause the prepared statement cache    * to be flushed to prevent stale references to (temporary) tables
879:    plugbuffer->add_int32(-1);    break;    } -  value=(string)value; -  if(String.width(value)>8) -  if(dtoid[i]==BYTEAOID) -  value=string_to_utf8(value); +  if (!objectp(value) || typeof(value) != stdiobuftype) +  /* +  * Like Oracle and SQLite, we accept literal binary values +  * from single-valued multisets. +  */ +  if (multisetp(value) && sizeof(value) == 1) +  value = indices(value)[0];    else { -  SUSERERROR("Wide string %O not supported for type OID %d\n", +  value = (string)value; +  if (String.width(value) > 8) +  if (dtoid[i] == BYTEAOID) +  /* +  * FIXME We should throw an error here, it would +  * have been correct, but for historical reasons and +  * as a DWIM convenience we autoconvert to UTF8 here. +  */ +  value = string_to_utf8(value); +  else { +  SUSERERROR( +  "Wide string %O not supported for type OID %d\n",    value,dtoid[i]);    value="";    } -  +  }    plugbuffer->add_hstring(value,4);    break;    }