Update of /cvsroot/firebird/manual/src/docs/refdocs/langref/fblangref25
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23534
Modified Files:
fblangref25-commons.xml fblangref25-functions-vars.xml
fblangref25.xml
Log Message:
Corrections from P. Vinkenoog and D. Simonov.
Index: fblangref25-functions-vars.xml
===================================================================
RCS file:
/cvsroot/firebird/manual/src/docs/refdocs/langref/fblangref25/fblangref25-functions-vars.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fblangref25-functions-vars.xml 27 Mar 2016 21:20:48 -0000 1.5
+++ fblangref25-functions-vars.xml 13 May 2016 10:14:26 -0000 1.6
@@ -5085,7 +5085,7 @@
<formalpara>
<title>Syntax</title>
<para><blockquote>
- <programlisting>BIN_AND
(<replaceable>number</replaceable> [, <replaceable>number</replaceable>
...])</programlisting>
+ <programlisting>BIN_AND
(<replaceable>number</replaceable>, <replaceable>number</replaceable> [,
<replaceable>number</replaceable> ...])</programlisting>
</blockquote></para>
</formalpara>
<table id="fblangref25-funcs-tbl-binand">
@@ -5103,15 +5103,19 @@
<tbody>
<row valign="middle">
<entry align="center">number</entry>
- <entry align="left">A 32-bit or 64-bit integer</entry>
+ <entry align="left">Any integer number (literal,
smallint/integer/bigint, numeric/decimal with scale 0)</entry>
</row>
</tbody>
</tgroup>
</table>
<formalpara>
<title>Result type</title>
- <para><database>INTEGER</database> or
<database>BIGINT</database></para>
+ <para><database>SMALLINT</database>,
<database>INTEGER</database> or <database>BIGINT</database></para>
</formalpara>
+ <note>
+ <para>SMALLINT result is returned only if all the arguments
are explicit SMALLINTs or NUMERIC(n, 0)
+ with n <= 4; otherwise small integers return an INTEGER
result.</para>
+ </note>
<formalpara>
<title>Description</title>
<para>Returns the result of the bitwise AND operation on
the argument(s).</para>
@@ -5133,8 +5137,7 @@
</formalpara>
<formalpara>
<title>Possible name conflict</title>
- <para> YES—<link
linkend="fblangref25-functions-nameclashes">>Read details</link>
- </para>
+ <para> NO</para>
</formalpara>
<formalpara>
@@ -5159,19 +5162,23 @@
<tbody>
<row valign="middle">
<entry align="center">number</entry>
- <entry align="left">A 32-bit or 64-bit integer</entry>
+ <entry align="left">Any integer number (literal,
smallint/integer/bigint, numeric/decimal with scale 0)</entry>
</row>
</tbody>
</tgroup>
</table>
<formalpara>
<title>Result type</title>
- <para><database>INTEGER</database> or
<database>BIGINT</database></para>
+ <para><database>SMALLINT</database>,
<database>INTEGER</database> or <database>BIGINT</database></para>
</formalpara>
+ <note>
+ <para>SMALLINT result is returned only if all the arguments
are explicit SMALLINTs or NUMERIC(n, 0)
+ with n <= 4; otherwise small integers return an INTEGER
result.</para>
+ </note>
<formalpara>
<title>Description</title>
- <para>Returns the result of the bitwise NOT operation on
the argument, i.e., negation,
- or <firstterm>ones complement</firstterm>.</para>
+ <para>Returns the result of the bitwise NOT operation on
the argument, i.e.,
+ <firstterm>ones complement</firstterm>.</para>
</formalpara>
<formalpara>
<title>See also</title>
@@ -5196,7 +5203,7 @@
<formalpara>
<title>Syntax</title>
<para><blockquote>
- <programlisting>BIN_OR
(<replaceable>number</replaceable> [, <replaceable>number</replaceable>
...])</programlisting>
+ <programlisting>BIN_OR
(<replaceable>number</replaceable>, <replaceable>number</replaceable> [,
<replaceable>number</replaceable> ...])</programlisting>
</blockquote></para>
</formalpara>
<table id="fblangref25-funcs-tbl-binor">
@@ -5214,15 +5221,19 @@
<tbody>
<row valign="middle">
<entry align="center">number</entry>
- <entry align="left">A number of an integer type</entry>
+ <entry align="left">Any integer number (literal,
smallint/integer/bigint, numeric/decimal with scale 0)</entry>
</row>
</tbody>
</tgroup>
</table>
<formalpara>
<title>Result type</title>
- <para><database>INTEGER</database> or
<database>BIGINT</database></para>
+ <para><database>SMALLINT</database>,
<database>INTEGER</database> or <database>BIGINT</database></para>
</formalpara>
+ <note>
+ <para>SMALLINT result is returned only if all the arguments
are explicit SMALLINTs or NUMERIC(n, 0)
+ with n <= 4; otherwise small integers return an INTEGER
result.</para>
+ </note>
<formalpara>
<title>Description</title>
<para>Returns the result of the bitwise OR operation on the
argument(s).</para>
@@ -5365,7 +5376,7 @@
<formalpara>
<title>Syntax</title>
<para><blockquote>
- <programlisting>BIN_XOR
(<replaceable>number</replaceable> [, <replaceable>number</replaceable>
...])</programlisting>
+ <programlisting>BIN_XOR
(<replaceable>number</replaceable>, <replaceable>number</replaceable> [,
<replaceable>number</replaceable> ...])</programlisting>
</blockquote></para>
</formalpara>
<table id="fblangref25-funcs-tbl-binxor">
@@ -5383,7 +5394,7 @@
<tbody>
<row valign="middle">
<entry align="center">number</entry>
- <entry align="left">A number of an integer type</entry>
+ <entry align="left">Any integer number (literal,
smallint/integer/bigint, numeric/decimal with scale 0)</entry>
</row>
</tbody>
</tgroup>
@@ -5394,8 +5405,12 @@
</formalpara>
<formalpara>
<title>Result type</title>
- <para><database>INTEGER</database> or
<database>BIGINT</database></para>
+ <para><database>SMALLINT</database>,
<database>INTEGER</database> or <database>BIGINT</database></para>
</formalpara>
+ <note>
+ <para>SMALLINT result is returned only if all the arguments
are explicit SMALLINTs or NUMERIC(n, 0)
+ with n <= 4; otherwise small integers return an INTEGER
result.</para>
+ </note>
<formalpara>
<title>See also</title>
<para> <link
linkend="fblangref25-functions-scalarfuncs-bin_and"><database>BIN_AND</database></link>,
Index: fblangref25-commons.xml
===================================================================
RCS file:
/cvsroot/firebird/manual/src/docs/refdocs/langref/fblangref25/fblangref25-commons.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fblangref25-commons.xml 26 Apr 2016 22:38:33 -0000 1.8
+++ fblangref25-commons.xml 13 May 2016 10:14:26 -0000 1.9
@@ -396,24 +396,34 @@
</thead>
<tbody>
<row valign="middle">
+ <entry align="center"><command>+
<replaceable>signed_number</replaceable></command></entry>
+ <entry align="center">Unary plus</entry>
+ <entry align="center">1</entry>
+ </row>
+ <row valign="middle">
+ <entry align="center"><command>-
<replaceable>signed_number</replaceable></command></entry>
+ <entry align="center">Unary minus</entry>
+ <entry align="center">1</entry>
+ </row>
+ <row valign="middle">
<entry align="center"><command>*</command></entry>
<entry align="center">Multiplication</entry>
- <entry align="center">1</entry>
+ <entry align="center">2</entry>
</row>
<row valign="middle">
<entry align="center"><command>/</command></entry>
<entry align="center">Division</entry>
- <entry align="center">1</entry>
+ <entry align="center">2</entry>
</row>
<row valign="middle">
<entry align="center"><command>+</command></entry>
<entry align="center">Addition</entry>
- <entry align="center">2</entry>
+ <entry align="center">3</entry>
</row>
<row valign="middle">
<entry align="center"><command>-</command></entry>
<entry align="center">Subtraction</entry>
- <entry align="center">2</entry>
+ <entry align="center">3</entry>
</row>
</tbody>
</tgroup>
@@ -426,9 +436,9 @@
</programlisting>
</formalpara>
<note>
- <para>Where operators have the same precedence, they are evaluated
in
+ <para>Where operators have the same precedence, they are evaluated
in
left-to-right sequence.</para>
- </note>
+ </note>
</section><!-- Arithmetic operators -->
<section id="fblangref25-commons-compar">
@@ -456,43 +466,43 @@
<row valign="middle">
<entry align="center"><command><>, !=, ~=,
^=</command></entry>
<entry align="center">Is not equal to</entry>
- <entry align="center">2</entry>
+ <entry align="center">1</entry>
</row>
<row valign="middle">
<entry align="center"><command>></command></entry>
<entry align="center">Is greater than</entry>
- <entry align="center">3</entry>
+ <entry align="center">1</entry>
</row>
<row valign="middle">
<entry align="center"><command><</command></entry>
<entry align="center">Is less than</entry>
- <entry align="center">4</entry>
+ <entry align="center">1</entry>
</row>
<row valign="middle">
<entry align="center"><command>>=</command></entry>
<entry align="center">Is greater than or equal to</entry>
- <entry align="center">5</entry>
+ <entry align="center">1</entry>
</row>
<row valign="middle">
<entry align="center"><command><=</command></entry>
<entry align="center">Is less than or equal to</entry>
- <entry align="center">6</entry>
+ <entry align="center">1</entry>
</row>
<row valign="middle">
<entry align="center"><command>!>, ~>,
^></command></entry>
<entry align="center">Is not greater than</entry>
- <entry align="center">7</entry>
+ <entry align="center">1</entry>
</row>
<row valign="middle">
<entry align="center"><command>!<, ~<,
^<</command></entry>
<entry align="center">Is not less than</entry>
- <entry align="center">8</entry>
+ <entry align="center">1</entry>
</row>
</tbody>
</tgroup>
</table>
<para>This group also includes comparison predicates
<database>BETWEEN, LIKE,
- CONTAINING, SIMILAR TO</database> and others.</para>
+ CONTAINING, SIMILAR TO, IS</database> and others.</para>
<formalpara><title>Example</title>
<programlisting>
IF (SALARY > 1400) THEN
@@ -991,8 +1001,8 @@
</programlisting>
</formalpara>
<para>The <database>LIKE</database> predicate compares the
character-type expression with
- the pattern defined in the second expression. Case- or
accent-sensitivity for the comparison
- is determined by the collation that is in use. A collation can be
specified for either
+ the pattern defined in the second expression. Case- or
accent-sensitivity for the comparison
+ is determined by the collation that is in use. A collation can be
specified for either
operand, if required.</para>
<section id="fblangref25-commons-wildcards">
@@ -1011,8 +1021,8 @@
<section id="fblangref25-commons-escapechar">
<title>Using the <database>ESCAPE</database> Character Option</title>
- <para>If the search string contains either of the wildcard symbols,
the <database>ESCAPE</database>
- clause can be used to specify an escape character. The escape
character must precede the '%' or '_'
+ <para>If the search string contains either of the wildcard symbols,
the <database>ESCAPE</database>
+ clause can be used to specify an escape character. The escape
character must precede the '%' or '_'
symbol in the search string, to indicate that the symbol is to be
interpreted as a
literal character.</para>
</section>
@@ -1055,9 +1065,9 @@
WHERE ADDRESS LIKE '%Rostov%'
</programlisting>
<note>
- <para>If you need to do a case-insensitive search for
something <emphasis>enclosed
- inside</emphasis> a string (<function> LIKE '%Abc%'
</function>), use of
- the <database>CONTAINING</database> predicate is
recommended, in preference to
+ <para>If you need to do a case-insensitive search for
something <emphasis>enclosed
+ inside</emphasis> a string (<function> LIKE '%Abc%'
</function>), use of
+ the <database>CONTAINING</database> predicate is
recommended, in preference to
the <database>LIKE</database> predicate.</para>
</note>
</listitem>
@@ -1123,7 +1133,7 @@
<para>The <database>CONTAINING</database> predicate searches for a
string or a string-like
type looking for the sequence of characters that matches its
argument. It can be used for
an alphanumeric (string-like) search on numbers and dates. A
<database>CONTAINING</database>
- search is not case-sensitive. However, if an accent-sensitive
collation is in use then
+ search is not case-sensitive. However, if an accent-sensitive
collation is in use then
the search will be accent-sensitive.</para>
<para>When <database>CONTAINING</database> is used in the search
conditions of DML queries,
the Firebird optimizer can use an index on the searched column, if a
suitable one exists.</para>
@@ -1338,7 +1348,7 @@
'Framboise' similar to 'Fr[^a][^a]boise' -- false
'Framboise' similar to 'Fra[^[:DIGIT:]]boise' -- true
</programlisting>
- If the caret is not placed at the start of the sequence, the
class contains everything
+ If the caret is not placed at the start of the sequence, the
class contains everything
before the caret, except for the elements that also occur after
the caret:
<programlisting>
'Grapefruit' similar to 'Grap[a-m^f-i]fruit' -- true
@@ -1498,6 +1508,12 @@
</para>
</formalpara>
</section> <!-- is not null -->
+ <note>
+ <title>Note regarding the IS predicates</title>
+ <para>Up to and including Firebird 2.5, the <database>IS</database>
predicates, like
+ the other comparison predicates, do not have precedence over the
others. In Firebird 3.0
+ and higher, these predicates take precedence above the others.</para>
+ </note>
</section><!-- Other comparison predicates -->
</section><!-- Comparison predicates -->
Index: fblangref25.xml
===================================================================
RCS file:
/cvsroot/firebird/manual/src/docs/refdocs/langref/fblangref25/fblangref25.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- fblangref25.xml 26 Apr 2016 22:38:33 -0000 1.21
+++ fblangref25.xml 13 May 2016 10:14:26 -0000 1.22
@@ -5,7 +5,7 @@
<bookinfo>
<title>Firebird 2.5 Language Reference</title>
<subtitle>Beta Release 1</subtitle>
- <edition>26 April 2016, document version 0.904</edition>
+ <edition>12 May 2016, document version 0.905</edition>
<authorgroup>
<author>
<firstname>Dmitry</firstname>
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
Firebird-checkins mailing list
firebird-check...@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/firebird-checkins
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
Firebird-docs mailing list
Firebird-docs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/firebird-docs
