db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1367610 - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/sql/dictionary/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/ testing/org/apache/derbyTesting/functionTests/tests/lang/ tools/org/apache/d...
Date Tue, 31 Jul 2012 15:18:51 GMT
Author: rhillegas
Date: Tue Jul 31 15:18:50 2012
New Revision: 1367610

URL: http://svn.apache.org/viewvc?rev=1367610&view=rev
Log:
DERBY-5879: Fix capitalization and punctuation problems in messages with SQLStates.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java?rev=1367610&r1=1367609&r2=1367610&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
Tue Jul 31 15:18:50 2012
@@ -208,10 +208,7 @@ public final class DefaultDescriptor 
 
 				throw StandardException.newException(SQLState.LANG_PROVIDER_HAS_DEPENDENT_OBJECT, 
 									dm.getActionString(action), 
-									p.getObjectName(),
-									MessageService.getTextMessage(
-										SQLState.LANG_COLUMN_DEFAULT
-									),
+									p.getObjectName(), "DEFAULT",
 									td.getQualifiedName() + "." +
 									cd.getColumnName());
 		}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=1367610&r1=1367609&r2=1367610&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Tue Jul 31 15:18:50
2012
@@ -2824,6 +2824,7 @@ Guide.
             <msg>
                 <name>42Z92</name>
                 <text>repeatable read</text>
+                <comment>A transaction isolation level. See http://en.wikipedia.org/wiki/Isolation_%28database_systems%29</comment>
             </msg>
 
             <msg>
@@ -2848,6 +2849,7 @@ Guide.
             <msg>
                 <name>42Z9A</name>
                 <text>read uncommitted</text>
+                <comment>A transaction isolation level. See http://en.wikipedia.org/wiki/Isolation_%28database_systems%29</comment>
             </msg>
 
             <msg>
@@ -5562,7 +5564,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XSDAB.S</name>
-                <text>cannot set a null time stamp</text>
+                <text>Cannot set a null time stamp.</text>
             </msg>
 
             <msg>
@@ -6020,14 +6022,14 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XSLAP.D</name>
-                <text>Database at {0} is at version {1}. Beta databases cannot be upgraded,</text>
+                <text>Database at {0} is at version {1}. Beta databases cannot be upgraded.</text>
                 <arg>directoryPath</arg>
                 <arg>versionNumber</arg>
             </msg>
 
             <msg>
                 <name>XSLAQ.D</name>
-                <text>cannot create log file at directory {0}.</text>
+                <text>Cannot create log file at directory {0}.</text>
                 <arg>directoryName</arg>
             </msg>
 
@@ -6264,11 +6266,6 @@ MessageId.java.
             </msg>
 
             <msg>
-                <name>42Z09.U</name>
-                <text>the COLUMN DEFAULT for</text>
-            </msg>
-
-            <msg>
                 <name>42Z10</name>
                 <text>The Java class bound to a user defined type may not be a class
used internally by Derby: '{0}'.</text>
                 <arg>javaClassName</arg>
@@ -6414,46 +6411,55 @@ MessageId.java.
             <msg>
                 <name>42Z80.U</name>
                 <text>serializable</text>
+                <comment>A transaction isolation level. See http://en.wikipedia.org/wiki/Isolation_%28database_systems%29</comment>
             </msg>
 
             <msg>
                 <name>42Z81.U</name>
                 <text>read committed</text>
+                <comment>A transaction isolation level. See http://en.wikipedia.org/wiki/Isolation_%28database_systems%29</comment>
             </msg>
 
             <msg>
                 <name>42Z82.U</name>
                 <text>exclusive</text>
+                <comment>A lock mode.</comment>
             </msg>
 
             <msg>
                 <name>42Z83.U</name>
                 <text>instantaneous share</text>
+                <comment>A lock mode.</comment>
             </msg>
 
             <msg>
                 <name>42Z84.U</name>
                 <text>share</text>
+                <comment>A lock mode.</comment>
             </msg>
 
             <msg>
                 <name>42Z85.U</name>
                 <text>table</text>
+                <comment>A lock granularity.</comment>
             </msg>
 
             <msg>
                 <name>42Z86.U</name>
                 <text>row</text>
+                <comment>A lock granularity.</comment>
             </msg>
 
             <msg>
                 <name>42Z87.U</name>
                 <text>share table</text>
+                <comment>Lock mode and granularity.</comment>
             </msg>
 
             <msg>
                 <name>42Z88.U</name>
                 <text>share row</text>
+                <comment>Lock mode and granularity.</comment>
             </msg>
 
             <msg>
@@ -6533,11 +6539,13 @@ MessageId.java.
             <msg>
                 <name>43X14.U</name>
                 <text>table locking</text>
+                <comment>Lock granularity.</comment>
             </msg>
 
             <msg>
                 <name>43X15.U</name>
                 <text>row locking</text>
+                <comment>Lock granularity.</comment>
             </msg>
 
             <msg>
@@ -7265,11 +7273,6 @@ MessageId.java.
             </msg>
 
             <msg>
-                <name>44X05.U</name>
-                <text>next error</text>
-            </msg>
-
-            <msg>
                 <name>46001</name>
                 <text>Exception while accessing jar file using URL '{0}'.</text>
                 <arg>url</arg>

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=1367610&r1=1367609&r2=1367610&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Tue Jul 31 15:18:50 2012
@@ -1026,7 +1026,6 @@ public interface SQLState {
 	String LANG_NO_BULK_INSERT_REPLACE_WITH_TRIGGER                    = "42Z08";
 
 	// MORE GENERIC LANGUAGE STUFF
-	String LANG_COLUMN_DEFAULT										   = "42Z09.U";
 	String LANG_UDT_BUILTIN_CONFLICT										   = "42Z10";
 	String LANG_STREAM												   = "42Z11.U";
     String LANG_STREAM_INVALID_ACCESS                                  = "42Z12.U";
@@ -1300,7 +1299,6 @@ public interface SQLState {
 
 	// org.apache.derby.catalog.types
 	String TI_SQL_TYPE_NAME			= "44X00.U";
-	String TI_NEXT_ERROR			= "44X05.U";
 
 	// INTERNAL EXCEPTIONS
 	String LANG_UNABLE_TO_GENERATE                                     = "42Z50";

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java?rev=1367610&r1=1367609&r2=1367610&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
Tue Jul 31 15:18:50 2012
@@ -245,8 +245,8 @@ public final class ErrorCodeTest extends
         		{"XSLAM","Cannot verify database format at {1} due to IOException: {0}","45000"},
         		{"XSLAN","Database at {0} has an incompatible format with the current version of
the software.  The database was created by or upgraded by version {1}.","45000"},
         		{"XSLAO","Recovery failed unexpected problem: {0}.","45000"},
-        		{"XSLAP","Database at {0} is at version {1}. Beta databases cannot be upgraded,","45000"},
-        		{"XSLAQ","cannot create log file at directory {0}.","45000"},
+        		{"XSLAP","Database at {0} is at version {1}. Beta databases cannot be upgraded.","45000"},
+        		{"XSLAQ","Cannot create log file at directory {0}.","45000"},
         		{"XSLAR","Unable to copy log file '{0}' to '{1}' during restore. Please make sure
that there is enough space and permissions are correct. ","45000"},
         		{"XSLAS","Log directory {0} not found in backup during restore. Please make sure
that backup copy is the correct one and it is not corrupted.","45000"},
         		{"XSLAT","The log directory '{0}' exists. The directory might belong to another
database. Check that the location specified for the logDevice attribute is correct.","45000"},

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=1367610&r1=1367609&r2=1367610&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Tue Jul 31
15:18:50 2012
@@ -169,7 +169,7 @@ IJ_ScroCursAre1=Scroll cursors are only 
 IJ_UnabToGetWar_22=Unable to get warnings for statement
 IJ_WaitForStatI=Wait for statement interrupted: {0}
 IJ_0IsAnInvaVal=0 is an invalid value for ABSOLUTE <integer> <cursorname>
-IJ_NotAvailForDriver=command not available for this driver: {0}
+IJ_NotAvailForDriver=Command not available for this driver: {0}
 # From ijFatalException.java
 IJ_FataExceTerm=Fatal Exception; terminating
 IJ_Fata01=FatalException: {0}: {1}



Mime
View raw message