git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml

index 075e02ad9d8868c5e384cd1ad0a598b0657d368f..43f49dd658f0b319f9b5ad46f2ca0615e977a069 100644 (file)

--- a/doc/src/sgml/ecpg.sgml

+++ b/doc/src/sgml/ecpg.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.97 2010年02月19日 00:15:25 momjian Exp $ -->

+<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.98 2010年02月27日 04:29:44 tgl Exp $ -->

<chapter id="ecpg">

<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>

EXEC SQL DESCRIBE mystmt INTO sqlda;

- printf("# of fields: %d\n", sqlda->sqld);

- for (i = 0; i < sqlda->sqld; i++)

- printf("field %d: \"%s\"\n", sqlda->sqlvar[i]->sqlname);

+ printf("# of fields: %d\n", sqlda-&gt;sqld);

+ for (i = 0; i &lt; sqlda-&gt;sqld; i++)

+ printf("field %d: \"%s\"\n", sqlda-&gt;sqlvar[i]-&gt;sqlname);

EXEC SQL DECLARE mycursor CURSOR FOR mystmt;

EXEC SQL OPEN mycursor;

EXEC SQL CLOSE mycursor;

free(sqlda); /* The main structure is all to be free(),

- * sqlda and sqlda->sqlvar is in one allocated area */

+ * sqlda and sqlda-&gt;sqlvar is in one allocated area */

</programlisting>

For more information, see the <literal>sqlda.h</> header and the

<literal>src/interfaces/ecpg/test/compat_informix/sqlda.pgc</literal> regression test.

diff --git a/doc/src/sgml/hstore.sgml b/doc/src/sgml/hstore.sgml

index 958a6b9d160ab1ce8436dfa495866280c13a6957..f9110616f7a5e3669d2fb028c9dc2d22fb35b4ae 100644 (file)

--- a/doc/src/sgml/hstore.sgml

+++ b/doc/src/sgml/hstore.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/hstore.sgml,v 1.7 2010年02月17日 04:19:37 tgl Exp $ -->

+<!-- $PostgreSQL: pgsql/doc/src/sgml/hstore.sgml,v 1.8 2010年02月27日 04:29:44 tgl Exp $ -->

<sect1 id="hstore">

<title>hstore</title>

<para>

<type>hstore</> has GiST and GIN index support for the <literal>@&gt;</>,

- <literal>?</>, <literal>?&</> and <literal>?|</> operators. For example:

+ <literal>?</>, <literal>?&amp;</> and <literal>?|</> operators. For example:

</para>

<programlisting>

CREATE INDEX hidx ON testhstore USING GIST (h);

diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml

index a68ce56f46c36e01ca5bac967a09ebd2d3324fa1..c5b0223c6b8340de0ab796aba6489a8a0f1c71cf 100644 (file)

--- a/doc/src/sgml/ref/create_table.sgml

+++ b/doc/src/sgml/ref/create_table.sgml

<!--

-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.122 2010年02月22日 23:51:40 momjian Exp $

+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.123 2010年02月27日 04:29:44 tgl Exp $

PostgreSQL documentation

-->

For example, you can specify a constraint that

no two rows in the table contain overlapping circles

(see <xref linkend="datatype-geometric">) by using the

- <literal>&&</> operator.

+ <literal>&amp;&amp;</> operator.

</para>

<para>

<programlisting>

CREATE TABLE circles (

c circle,

- EXCLUDE USING gist (c WITH &&)

+ EXCLUDE USING gist (c WITH &amp;&amp;)

);

</programlisting>

</para>