db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r436862 [2/2] - /db/derby/docs/trunk/src/ref/
Date Fri, 25 Aug 2006 17:22:14 GMT
Modified: db/derby/docs/trunk/src/ref/rrefsqlj58560.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj58560.dita?rev=436862&r1=436861&r2=436862&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj58560.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj58560.dita Fri Aug 25 10:22:11 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,16 +18,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefsqlj58560" xml:lang="en-us">
 <title>Data type assignments and comparison, sorting, and ordering</title>
+<shortdesc></shortdesc>
+<prolog><metadata>
+<keywords><indexterm>data types<indexterm>assignments and comparisions</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <table><title>Assignments allowed by <ph conref="refconrefs.dita#prod/productshortname"></ph></title>
 <desc>This table displays valid assignments between data types in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
 A "Y" indicates that the assignment is valid.</desc>
-<tgroup cols="19"><colspec colname="colspec0" colwidth="350*"/><colspec colname="col2"
+<tgroup cols="20"><colspec colname="colspec0" colwidth="350*"/><colspec colname="col2"
 colwidth="84*"/><colspec colname="col3" colwidth="84*"/><colspec colname="col4"
 colwidth="84*"/><colspec colname="col5" colwidth="84*"/><colspec colname="col6"
 colwidth="81*"/><colspec colname="colspec1" colwidth="84*"/><colspec colname="colspec9"
@@ -33,7 +38,8 @@
 colwidth="84*"/><colspec colname="colspec4" colwidth="87*"/><colspec colname="colspec3"
 colwidth="81*"/><colspec colname="colspec2" colwidth="84*"/><colspec colname="colspec10"
 colwidth="84*"/><colspec colname="colspec13" colwidth="84*"/><colspec colname="colspec12"
-colwidth="84*"/><colspec colname="colspec11" colwidth="84*"/>
+colwidth="84*"/><colspec colname="colspec11" colwidth="84*"/><colspec colname="COLSPEC14"
+colwidth="84*"/>
 <thead>
 <row>
 <entry colname="colspec0" valign="top">Types</entry>
@@ -190,6 +196,9 @@
 A
 M
 P</lines></entry>
+<entry colname="COLSPEC14" valign="top"> <lines>X
+M
+L</lines></entry>
 </row>
 </thead>
 <tbody>
@@ -213,6 +222,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">INTEGER</entry>
@@ -234,6 +244,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BIGINT</entry>
@@ -255,6 +266,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DECIMAL</entry>
@@ -276,6 +288,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">REAL</entry>
@@ -297,6 +310,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DOUBLE</entry>
@@ -318,6 +332,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">FLOAT</entry>
@@ -339,6 +354,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR</entry>
@@ -360,6 +376,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR</entry>
@@ -381,6 +398,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR</entry>
@@ -402,6 +420,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR FOR BIT DATA</entry>
@@ -423,6 +442,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR FOR BIT DATA</entry>
@@ -444,6 +464,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR FOR BIT DATA</entry>
@@ -465,6 +486,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CLOB</entry>
@@ -486,6 +508,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BLOB</entry>
@@ -507,6 +530,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DATE</entry>
@@ -528,6 +552,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME</entry>
@@ -549,6 +574,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME STAMP</entry>
@@ -570,14 +596,37 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
+</row>
+<row>
+<entry colname="colspec0">XML</entry>
+<entry colname="col2">-</entry>
+<entry colname="col3">-</entry>
+<entry colname="col4">-</entry>
+<entry colname="col5">-</entry>
+<entry colname="col6">-</entry>
+<entry colname="colspec1">-</entry>
+<entry colname="colspec9">-</entry>
+<entry colname="colspec8">-</entry>
+<entry colname="colspec7">-</entry>
+<entry colname="colspec6">-</entry>
+<entry colname="colspec5">-</entry>
+<entry colname="colspec4">-</entry>
+<entry colname="colspec3">-</entry>
+<entry colname="colspec2">-</entry>
+<entry colname="colspec10">-</entry>
+<entry colname="colspec13">-</entry>
+<entry colname="colspec12">-</entry>
+<entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">Y</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
-<table><title>Comparisons allowed by Derby</title>
-<desc>This table displays valid comparisons between data types in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
+<table><title>Comparisons allowed by Derby</title><desc>This table
displays
+valid comparisons between data types in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
 A "Y" indicates that the comparison is allowed.</desc>
-<tgroup cols="19"><colspec colname="colspec0" colwidth="350*"/><colspec colname="col2"
+<tgroup cols="20"><colspec colname="colspec0" colwidth="350*"/><colspec colname="col2"
 colwidth="83*"/><colspec colname="col3" colwidth="83*"/><colspec colname="col4"
 colwidth="83*"/><colspec colname="col5" colwidth="83*"/><colspec colname="col6"
 colwidth="80*"/><colspec colname="colspec1" colwidth="83*"/><colspec colname="colspec9"
@@ -586,7 +635,8 @@
 colwidth="83*"/><colspec colname="colspec4" colwidth="86*"/><colspec colname="colspec3"
 colwidth="80*"/><colspec colname="colspec2" colwidth="83*"/><colspec colname="colspec10"
 colwidth="83*"/><colspec colname="colspec13" colwidth="75*"/><colspec colname="colspec12"
-colwidth="89*"/><colspec colname="colspec11" colwidth="89*"/>
+colwidth="89*"/><colspec colname="colspec11" colwidth="89*"/><colspec colname="COLSPEC15"
+colwidth="89*"/>
 <thead>
 <row>
 <entry colname="colspec0" valign="top">Types</entry>
@@ -743,6 +793,9 @@
 A
 M
 P</lines></entry>
+<entry colname="COLSPEC15" valign="top"> <lines>X
+M
+L</lines></entry>
 </row>
 </thead>
 <tbody>
@@ -766,6 +819,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">INTEGER</entry>
@@ -787,6 +841,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BIGINT</entry>
@@ -808,6 +863,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DECIMAL</entry>
@@ -829,6 +885,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">REAL</entry>
@@ -850,6 +907,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DOUBLE</entry>
@@ -871,6 +929,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">FLOAT</entry>
@@ -892,6 +951,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR</entry>
@@ -913,6 +973,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR</entry>
@@ -934,6 +995,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR</entry>
@@ -955,6 +1017,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR FOR BIT DATA</entry>
@@ -976,6 +1039,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR FOR BIT DATA</entry>
@@ -997,6 +1061,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR FOR BIT DATA</entry>
@@ -1018,6 +1083,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CLOB</entry>
@@ -1039,6 +1105,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BLOB</entry>
@@ -1060,6 +1127,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DATE</entry>
@@ -1081,6 +1149,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME</entry>
@@ -1102,6 +1171,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME STAMP</entry>
@@ -1123,10 +1193,32 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC15">-</entry>
+</row>
+<row>
+<entry colname="colspec0">XML</entry>
+<entry colname="col2">-</entry>
+<entry colname="col3">-</entry>
+<entry colname="col4">-</entry>
+<entry colname="col5">-</entry>
+<entry colname="col6">-</entry>
+<entry colname="colspec1">-</entry>
+<entry colname="colspec9">-</entry>
+<entry colname="colspec8">-</entry>
+<entry colname="colspec7">-</entry>
+<entry colname="colspec6">-</entry>
+<entry colname="colspec5">-</entry>
+<entry colname="colspec4">-</entry>
+<entry colname="colspec3">-</entry>
+<entry colname="colspec2">-</entry>
+<entry colname="colspec10">-</entry>
+<entry colname="colspec13">-</entry>
+<entry colname="colspec12">-</entry>
+<entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 </refbody>
 </reference>
-

Added: db/derby/docs/trunk/src/ref/rrefsqljtypexml.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljtypexml.dita?rev=436862&view=auto
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljtypexml.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefsqljtypexml.dita Fri Aug 25 10:22:11 2006
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<reference id="rrefsqljtypexml" xml:lang="en-us">
+<title>XML data type</title>
+<shortdesc>An XML column is used to store Unicode character-based data, such
+as large documents in any character set, that conform to the SQL/XML definition
+of a well-formed XML(DOCUMENT(ANY)) value. </shortdesc>
+<prolog><metadata>
+<keywords><indexterm>XML data type</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section> <p>An XML value can be up to 2,147,483,647 characters long. </p><note>For
+an application to retrieve, update, query, or otherwise access an XML data
+value, the application must have classes for a JAXP parser and for Xalan in
+the classpath.  <ph conref="refconrefs.dita#prod/productshortname"></ph> issues
+an error if either the parser or Xalan is not found.<p>Because none of the
+JDBC-side support for SQL/XML is implemented in <ph conref="refconrefs.dita#prod/productshortname"></ph>,
+it is not possible to bind directly into an XML value or to retrieve an XML
+value directly from a result set using JDBC.  Instead, you must bind and retrieve
+the XML data as Java strings or character streams by explicitly specifying
+the appropriate XML operators, XMLPARSE and XMLSERIALIZE, as part of your
+SQL queries.</p></note></section>
+<refsyn><title>Syntax</title><codeblock><b>XML</b></codeblock>
</refsyn>
+<section><title>Corresponding compile-time Java type</title><p>None</p><p>The
+Java type for XML values is java.sql.SQLXML. However, the java.sql.SQLXML
+type is not supported by <ph conref="refconrefs.dita#prod/productshortname"></ph>.
</p> </section>
+<section><title>JDBC metadata type (java.sql.Types)</title><p>None</p><p>The
+metadata type for XML values is SQLXML. However, the SQLXML type is not supported
+by <ph conref="refconrefs.dita#prod/productshortname"></ph>. </p><p>To
retrieve
+XML values from a <ph conref="refconrefs.dita#prod/productshortname"></ph> database
+using JDBC, use the XMLSERIALIZE operator in the SQL query. For example:<codeblock>SELECT
XMLSERIALIZE (xcol as CLOB) FROM myXmlTable </codeblock
+>Then retrieve the XML value by using the getXXX method that corresponds to
+the target serialization type, in this example CLOB data types.</p><p>To store
+an XML value into a <ph conref="refconrefs.dita#prod/productshortname"></ph>
database
+using JDBC, use the XMLPARSE operator in the SQL statement. For example: <codeblock>INSERT
INTO myXmlTable(xcol) VALUES XMLPARSE(
+    DOCUMENT CAST (? AS CLOB) PRESERVE WHITESPACE)
+</codeblock>Then use any of the setXXX methods that are compatible with String
+types, in this example use the PreparedStatement.setString or PreparedStatementsetCharacterStream
+method calls to bind the operator.</p> </section>
+</refbody>
+</reference>

Propchange: db/derby/docs/trunk/src/ref/rrefsqljtypexml.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/trunk/src/ref/rreftimefunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftimefunc.dita?rev=436862&r1=436861&r2=436862&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftimefunc.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftimefunc.dita Fri Aug 25 10:22:11 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,21 +18,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rreftimefunc" xml:lang="en-us">
 <title>TIME</title>
+<shortdesc>The TIME function returns a time from a value.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>TIME function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The TIME function returns a time from a value.  The argument
-must be a time, timestamp, or a valid string representation of a time or timestamp
-that is not a CLOB or LONG VARCHAR. The result of the function is a time.
-If the argument can be null, the result can be null; if the argument is null,
-the result is the null value. </p> <p>The other rules depend on the data type
-of the argument specified:  <ul>
+<section> <p>The argument must be a time, timestamp, or a valid string representation
+of a time or timestamp that is not a CLOB, LONG VARCHAR, or XML value. The
+result of the function is a time. If the argument can be null, the result
+can be null; if the argument is null, the result is the null value. </p> <p>The
+other rules depend on the data type of the argument specified:  <ul>
 <li>If the argument is a time: The result is that time.</li>
 <li>If the argument is a timestamp: The result is the time part of the timestamp.</li>
 <li>If the argument is a string: The result is the time represented by the
@@ -40,4 +40,3 @@
 the current time is 5:03 PM, the value returned is <codeph>17:03:00</codeph>.</p>
</example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/trunk/src/ref/rreftimestampfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftimestampfunc.dita?rev=436862&r1=436861&r2=436862&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftimestampfunc.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftimestampfunc.dita Fri Aug 25 10:22:11 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,22 +18,20 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rreftimestampfunc" xml:lang="en-us">
 <title>TIMESTAMP</title>
+<shortdesc>The TIMESTAMP function returns a timestamp from a value or a pair
+of values.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>TIMESTAMP function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The TIMESTAMP function returns a timestamp from a value or a
-pair of values.</p> <p>The rules for the arguments depend on whether the second
-argument is specified:  <ul>
+<section> <p>The rules for the arguments depend on whether the second argument
+is specified:  <ul>
 <li>If only one argument is specified: It must be a timestamp, a valid string
-representation of a timestamp, or a string of length 14 that is not a CLOB
-or LONG VARCHAR. A string of length 14 must be a string of digits that represents
-a valid date and time in the form <i>yyyyxxddhhmmss</i>, where <i>yyyy</i>
is
+representation of a timestamp, or a string of length 14 that is not a CLOB,
+LONG VARCHAR, or XML value. A string of length 14 must be a string of digits
+that represents a valid date and time in the form <i>yyyyxxddhhmmss</i>, where
<i>yyyy</i> is
 the year, <i>xx</i> is the month, <i>dd</i> is the day, <i>hh</i>
is the hour, <i>mm</i> is
 the minute, and <i>ss</i> is the seconds.</li>
 <li>If both arguments are specified: The first argument must be a date or
@@ -48,8 +49,7 @@
 </ul></p></section>
 <refsyn><title>Syntax</title> <codeblock><b>TIMESTAMP ( <i>expression</i>
[, <i>expression</i> ] )</b></codeblock> </refsyn>
 <example> <p>Assume the column START_DATE (date) has a value equivalent to
-1988-12-25, and the column START_TIME (time) has a value equivalent to 17.12.30.</p>
<codeblock><b>TIMESTAMP(START_DATE, START_TIME)</b></codeblock
-> <p>Returns the value '1988-12-25-17.12.30.000000'.</p> </example>
+1998-12-25, and the column START_TIME (time) has a value equivalent to 17.12.30.</p>
<codeblock><b>TIMESTAMP(START_DATE, START_TIME)</b></codeblock
+> <p>Returns the value '1998-12-25-17.12.30.000000'.</p> </example>
 </refbody>
 </reference>
-



Mime
View raw message