Author: jta
Date: Wed May 4 20:40:33 2005
New Revision: 168252
URL: http://svn.apache.org/viewcvs?rev=168252&view=rev
Log:
Applied patch for DERBY-234
Modified:
incubator/derby/docs/trunk/src/ref/rrefsqlj18730.dita
incubator/derby/docs/trunk/src/ref/rrefsqlj21908.dita
incubator/derby/docs/trunk/src/ref/rrefsqlj27620.dita
Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj18730.dita
URL:
http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj18730.dita?rev=168252&r1=168251&r2=168252&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj18730.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj18730.dita Wed May 4 20:40:33
2005
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
<!--
Copyright 1997, 2004 The Apache Software Foundation or its licensors, as
applicable.
@@ -14,9 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
<reference id="rrefsqlj18730" xml:lang="en-us">
<title>DATE</title>
<prolog><metadata>
@@ -27,13 +26,21 @@
by <i>java.sql.Date</i>. </p></section>
<refsyn><title>Syntax</title> <codeblock><b>DATE</b></codeblock> </refsyn>
<section><title>Corresponding compile-time Java type</title>
<p><i>java.sql.Date</i></p> </section>
-<section><title>JDBC metadata type (java.sql.Types)</title> <p>DATE</p>
<p>Dates,
-times, and timestamps must not be mixed with one another in expressions.</p>
<p>Any
+<section><title>JDBC metadata type (java.sql.Types)</title><p>DATE</p><p>Dates,
+times, and timestamps must not be mixed with one another in
expressions.</p><p>Any
value that is recognized by the <i>java.sql.Date</i> method is permitted in
-a column of the corresponding SQL date/time data type.</p> </section>
-<example> <codeblock><b>VALUES DATE('1994-02-23')
+a column of the corresponding SQL date/time data type. <ph
conref="refconrefs.dita#prod/productshortname"></ph> supports
+the following formats for DATE:<codeblock>yyyy-mm-dd
+mm/dd/yyyy
+dd.mm.yyyy</codeblock>The first of the three formats above is the
<i>java.sql.Date</i> format.</p><p>The
+year must always be expressed with four digits, while months and days may
+have either one or two digits.</p><p><ph
conref="refconrefs.dita#prod/productshortname"></ph> also
+accepts strings in the locale specific datetime format, using the locale of
+the database server. If there is an ambiguity, the built-in formats above
+take precedence.</p> </section>
+<example> <title>Examples</title><codeblock><b>VALUES DATE('1994-02-23')
VALUES '1993-09-01'</b></codeblock> </example>
</refbody>
</reference>
-<?Pub *0000001126?>
+<?Pub *0000002340?>
Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj21908.dita
URL:
http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj21908.dita?rev=168252&r1=168251&r2=168252&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj21908.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj21908.dita Wed May 4 20:40:33
2005
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
<!--
Copyright 1997, 2004 The Apache Software Foundation or its licensors, as
applicable.
@@ -14,27 +16,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
<reference id="rrefsqlj21908" xml:lang="en-us">
<title>TIME</title>
<prolog><metadata>
<keywords><indexterm>TIME data type</indexterm></keywords>
</metadata></prolog>
<refbody>
-<section> <p>TIME provides for storage of an
hour-minutes-seconds-fractional-seconds
-value with six digits in the fractional-seconds part. <ph
conref="refconrefs.dita#prod/productshortname"></ph> also
-supports the ISO format of 8 characters (6 digits, and 2 decimal
points).</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>TIME</b></codeblock> </refsyn>
-<section><title>Corresponding compile-time Java type</title>
<p><i>java.sql.Time</i></p> </section>
-<section><title>JDBC metadata type (java.sql.Types)</title> <p>TIME</p>
<p>Dates,
+<section> <p>TIME provides for storage of a time-of-day value.</p></section>
+<refsyn><title>Syntax</title><codeblock><b>TIME</b></codeblock> </refsyn>
+<section><title>Corresponding compile-time Java
type</title><p><i>java.sql.Time</i></p> </section>
+<section><title>JDBC metadata type (java.sql.Types)</title><p>TIME</p><p>Dates,
times, and timestamps cannot be mixed with one another in expressions except
-with a CAST.</p> <p>Any value that is recognized by the <i>java.sql.Time</i>
method
-is permitted in a column of the corresponding SQL date/time data type.</p>
</section>
-<section><title>Related information</title>
<codeblock><b>TIME'HH:MM:SS[.FFFFFF']</b></codeblock> </section>
-<example> <codeblock><b>VALUES TIME('15:09:02')
+with a CAST.</p><p>Any value that is recognized by the <i>java.sql.Time</i>
method
+is permitted in a column of the corresponding SQL date/time data type. <ph
+conref="refconrefs.dita#prod/productshortname"></ph> supports the following
+formats for TIME:<codeblock>hh:mm[:ss]
+hh.mm[.ss]
+hh[:mm] {AM | PM}</codeblock>The first of the three formats above is the
<i>java.sql.Time</i> format.</p><p>Hours
+may have one or two digits. Minutes and seconds, if present, must have two
+digits.</p><p><ph conref="refconrefs.dita#prod/productshortname"></ph> also
+accepts strings in the locale specific datetime format, using the locale of
+the database server. If there is an ambiguity, the built-in formats above
+take precedence.</p> </section>
+<example> <title>Examples</title><codeblock><b>VALUES TIME('15:09:02')
VALUES '15:09:02'</b></codeblock> </example>
</refbody>
</reference>
-<?Pub *0000001414?>
+<?Pub *0000002292?>
Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj27620.dita
URL:
http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj27620.dita?rev=168252&r1=168251&r2=168252&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj27620.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj27620.dita Wed May 4 20:40:33
2005
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
<!--
Copyright 1997, 2004 The Apache Software Foundation or its licensors, as
applicable.
@@ -14,9 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
<reference id="rrefsqlj27620" xml:lang="en-us">
<title>TIMESTAMP</title>
<prolog><metadata>
@@ -24,19 +23,24 @@
</metadata></prolog>
<refbody>
<section> <p>TIMESTAMP stores a combined DATE and TIME value to be stored.
-It permits a fractional-seconds value of up to nine digits. <ph
conref="refconrefs.dita#prod/productshortname"></ph> also
-supports the ISO format of 23 characters (17 digits, 3 dashes, and 3 decimal
-points).</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>TIMESTAMP</b></codeblock> </refsyn>
-<section><title>Corresponding compile-time Java type</title>
<p><i>java.sql.Timestamp</i></p> </section>
-<section><title>JDBC metadata type (java.sql.Types)</title> <p>TIMESTAMP</p>
<p>Dates,
-times, and timestamps cannot be mixed with one another in expressions.</p>
<p>Timestamp
-only accepts formats accepted by Timestamp.valueOf. Any value that is
recognized
-by the <i>java.sql.Timestamp valueOf(String)</i> method is permitted in a
-column of the corresponding SQL date/time data type.</p> </section>
-<example> <codeblock><b>VALUES '1960-01-01 23:03:20'
+It permits a fractional-seconds value of up to nine digits.</p></section>
+<refsyn><title>Syntax</title><codeblock><b>TIMESTAMP</b></codeblock> </refsyn>
+<section><title>Corresponding compile-time Java
type</title><p><i>java.sql.Timestamp</i></p> </section>
+<section><title>JDBC metadata type
(java.sql.Types)</title><p>TIMESTAMP</p><p>Dates,
+times, and timestamps cannot be mixed with one another in
expressions.</p><p><ph
+conref="refconrefs.dita#prod/productshortname"></ph> supports the following
+formats for TIMESTAMP:<codeblock>yyyy-mm-dd hh[:mm[:ss[.nnnnnn]]]
+yyyy-mm-dd-hh[.mm[.ss[.nnnnnn]]]</codeblock>The first of the two formats above
+is the <i>java.sql.Timestamp</i> format.</p><p>The year must always have four
+digits. Months, days, and hours may have one or two digits. Minutes and
seconds,
+if present, must have two digits. Nanoseconds, if present may have between
+one and six digits.</p><p><ph
conref="refconrefs.dita#prod/productshortname"></ph> also
+accepts strings in the locale specific datetime format, using the locale of
+the database server. If there is an ambiguity, the built-in formats above
+take precedence.</p> </section>
+<example> <title>Examples</title><codeblock><b>VALUES '1960-01-01 23:03:20'
VALUES TIMESTAMP('1962-09-23 03:23:34.234')
VALUES TIMESTAMP('1960-01-01 23:03:20')</b></codeblock> </example>
</refbody>
</reference>
-<?Pub *0000001473?>
+<?Pub *0000002458?>
