You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2013/03/14 10:00:24 UTC
svn commit: r1456369 - in /db/derby/code/trunk/java:
engine/org/apache/derby/impl/sql/compile/ engine/org/apache/derby/loc/
shared/org/apache/derby/shared/common/reference/
Author: kahatlen
Date: Thu Mar 14 09:00:23 2013
New Revision: 1456369
URL: http://svn.apache.org/r1456369
Log:
DERBY-6075: Use modern collections in impl/sql/compile
- Remove dead code for old syntax that allowed declaring columns as
nullable explicitly.
- Remove unneeded imports.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Thu Mar 14 09:00:23 2013
@@ -38,73 +38,8 @@ PARSER_BEGIN(SQLParser)
package org.apache.derby.impl.sql.compile;
-import org.apache.derby.iapi.sql.Statement;
import org.apache.derby.iapi.sql.StatementType;
-/* aggregates */
-import org.apache.derby.impl.sql.compile.CountAggregateDefinition;
-import org.apache.derby.impl.sql.compile.MaxMinAggregateDefinition;
-import org.apache.derby.impl.sql.compile.SumAvgAggregateDefinition;
-
-import org.apache.derby.impl.sql.compile.AggregateNode;
-import org.apache.derby.impl.sql.compile.BinaryOperatorNode;
-import org.apache.derby.impl.sql.compile.CallStatementNode;
-import org.apache.derby.impl.sql.compile.CharConstantNode;
-import org.apache.derby.impl.sql.compile.CastNode;
-import org.apache.derby.impl.sql.compile.ColumnDefinitionNode;
-import org.apache.derby.impl.sql.compile.ColumnReference;
-import org.apache.derby.impl.sql.compile.CreateAliasNode;
-import org.apache.derby.impl.sql.compile.CursorNode;
-import org.apache.derby.impl.sql.compile.FromBaseTable;
-import org.apache.derby.impl.sql.compile.FromList;
-import org.apache.derby.impl.sql.compile.FromSubquery;
-import org.apache.derby.impl.sql.compile.FromTable;
-import org.apache.derby.impl.sql.compile.GroupByList;
-import org.apache.derby.impl.sql.compile.HasNodeVisitor;
-import org.apache.derby.impl.sql.compile.JavaToSQLValueNode;
-import org.apache.derby.impl.sql.compile.JoinNode;
-import org.apache.derby.impl.sql.compile.MethodCallNode;
-import org.apache.derby.impl.sql.compile.QueryTreeNode;
-import org.apache.derby.impl.sql.compile.ReplaceAggregatesWithCRVisitor;
-import org.apache.derby.impl.sql.compile.ResultColumnList;
-import org.apache.derby.impl.sql.compile.ResultColumn;
-import org.apache.derby.impl.sql.compile.OrderByList;
-import org.apache.derby.impl.sql.compile.OrderByColumn;
-import org.apache.derby.impl.sql.compile.ResultSetNode;
-import org.apache.derby.impl.sql.compile.SelectNode;
-import org.apache.derby.impl.sql.compile.SubqueryNode;
-import org.apache.derby.impl.sql.compile.TableName;
-import org.apache.derby.impl.sql.compile.TernaryOperatorNode;
-import org.apache.derby.impl.sql.compile.ParameterNode;
-import org.apache.derby.impl.sql.compile.PrivilegeNode;
-import org.apache.derby.impl.sql.compile.ConstraintDefinitionNode;
-import org.apache.derby.impl.sql.compile.DMLModStatementNode;
-import org.apache.derby.impl.sql.compile.RoutineDesignator;
-import org.apache.derby.impl.sql.compile.StatementNode;
-import org.apache.derby.impl.sql.compile.TableElementList;
-import org.apache.derby.impl.sql.compile.TableElementNode;
-import org.apache.derby.impl.sql.compile.TableOperatorNode;
-import org.apache.derby.impl.sql.compile.TablePrivilegesNode;
-import org.apache.derby.impl.sql.compile.TransactionStatementNode;
-import org.apache.derby.impl.sql.compile.TriggerReferencingStruct;
-import org.apache.derby.impl.sql.compile.UnionNode;
-import org.apache.derby.impl.sql.compile.IntersectOrExceptNode;
-import org.apache.derby.impl.sql.compile.UnaryOperatorNode;
-import org.apache.derby.impl.sql.compile.UntypedNullConstantNode;
-import org.apache.derby.impl.sql.compile.UpdateNode;
-import org.apache.derby.impl.sql.compile.UserTypeConstantNode;
-import org.apache.derby.impl.sql.compile.ValueNode;
-import org.apache.derby.impl.sql.compile.ValueNodeList;
-import org.apache.derby.impl.sql.compile.GroupByColumn;
-import org.apache.derby.impl.sql.compile.CurrentDatetimeOperatorNode;
-import org.apache.derby.impl.sql.compile.DDLStatementNode;
-import org.apache.derby.impl.sql.compile.AlterTableNode;
-
-import org.apache.derby.impl.sql.compile.ParseException;
-import org.apache.derby.impl.sql.compile.Token;
-import org.apache.derby.impl.sql.compile.TokenMgrError;
-import org.apache.derby.impl.sql.compile.SQLParserConstants;
-import org.apache.derby.impl.sql.compile.CharStream;
import org.apache.derby.impl.sql.execute.TablePrivilegeInfo;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.PermDescriptor;
@@ -114,10 +49,8 @@ import org.apache.derby.iapi.sql.diction
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
import org.apache.derby.iapi.sql.conn.Authorizer;
-import org.apache.derby.iapi.sql.execute.ConstantAction;
import org.apache.derby.iapi.sql.execute.ExecutionContext;
-import org.apache.derby.iapi.types.DataTypeDescriptor;
import org.apache.derby.iapi.types.TypeId;
import org.apache.derby.iapi.sql.compile.TypeCompiler;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
@@ -150,20 +83,16 @@ import org.apache.derby.catalog.TypeDesc
import org.apache.derby.catalog.types.RoutineAliasInfo;
import org.apache.derby.iapi.services.io.FormatableProperties;
-import org.apache.derby.iapi.services.io.StoredFormatIds;
import org.apache.derby.iapi.util.ReuseFactory;
-import org.apache.derby.iapi.services.io.FormatableBitSet;
import org.apache.derby.iapi.util.StringUtil;
import org.apache.derby.iapi.util.IdUtil;
import java.sql.Types;
import java.util.List;
import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.Vector;
-import java.lang.Character;
public class SQLParser
{
@@ -268,18 +197,6 @@ public class SQLParser
static final String DEFAULT_INDEX_TYPE = "BTREE";
- //the following 2 booleans are used to make sure only null or not null is
- //defined for a column while creating a table or altering a table. Defining
- //both at the same time will be an error case.
- boolean explicitNotNull = false;
- boolean explicitNull = false;
-
- //this vector keeps a list of explicitly nullable columns, so that if they
- //get used in the table level primary key constraint, it will result in an
- //exception.
- Vector explicitlyNullableColumnsList = new Vector();
-
-
final void setCompilerContext(CompilerContext cc) {
this.compilerContext = cc;
this.cm = cc.getContextManager();
@@ -3061,11 +2978,6 @@ StatementNode
StatementPart(Token[] tokenHolder) throws StandardException :
{
StatementNode statementNode;
- //before starting new statements, initialize this variables. Otherwise, the left
- //over values from previously failed sql will affect the next sql.
- explicitNotNull = false;
- explicitNull = false;
- explicitlyNullableColumnsList = new Vector();
/*
** Grab the token preceding this production
@@ -3965,11 +3877,6 @@ void
tableElement(TableElementList tableElementList) throws StandardException :
{
TableElementNode tableElement;
- //initialize following two booleans for every new table element so that the
- //values from previous tableElement doesn't impact the next tableElement
- explicitNotNull = false;
- explicitNull = false;
-
}
{
tableElement = columnDefinition(tableElementList)
@@ -12866,9 +12773,6 @@ tableConstraintDefinition() throws Stand
Properties properties = null;
ConstraintDefinitionNode tcdn;
TableName constraintName = null;
- //initialize following two booleans before handling table level constraints
- explicitNotNull = false;
- explicitNull = false;
}
{
[ constraintName = constraintNameDefinition() ]
@@ -12916,28 +12820,6 @@ uniqueConstraintDefinition(TableName con
constraintType = uniqueSpecification(null)
<LEFT_PAREN> uniqueColumnList = uniqueColumnList() <RIGHT_PAREN>
{
- //go through the unique columns list and if any of the columns in the
- //list is explicitly defined null, throw an exception for this. Columns
- //for which no nullability is defined are by default nullable. But in
- //case of create table, there nullability changes automatically to
- //non-nullable if primary key is defined on it. But if user explicitly
- //defines the nullability, then defining a primary key on it in create
- //table will result in an exception.
- if (constraintType == DataDictionary.PRIMARYKEY_CONSTRAINT)
- {
- for (int index = 0; index < uniqueColumnList.size(); index++)
- {
- String primaryKeyColumnName = ((ResultColumn) uniqueColumnList.elementAt(index)).getName();
- if (explicitlyNullableColumnsList.contains(primaryKeyColumnName))
- {
- String errorState =
- (checkVersion (DataDictionary.DD_VERSION_DERBY_10_4, null))
- ? SQLState.LANG_ADD_PRIMARY_KEY_ON_NULL_COLS
- : SQLState.LANG_DB2_ADD_UNIQUE_OR_PRIMARY_KEY_ON_NULL_COLS;
- throw StandardException.newException(errorState, primaryKeyColumnName);
- }
- }
- }
return (ConstraintDefinitionNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
constraintName,
@@ -12965,18 +12847,6 @@ uniqueSpecification(String columnName) t
|
<PRIMARY> <KEY>
{
- //explicitNull can be true only if it's column level constraint and
- //that column has null constraint defined on it. In that case, defining
- //a column-level constraint of primary key on it will result in an error.
- if (explicitNull)
- {
- String errorState =
- (checkVersion (DataDictionary.DD_VERSION_DERBY_10_4, null))
- ? SQLState.LANG_ADD_PRIMARY_KEY_ON_NULL_COLS
- : SQLState.LANG_DB2_ADD_UNIQUE_OR_PRIMARY_KEY_ON_NULL_COLS;
-
- throw StandardException.newException(errorState, columnName);
- }
return DataDictionary.PRIMARYKEY_CONSTRAINT;
}
}
@@ -13158,13 +13028,6 @@ columnConstraint(TableName constraintNam
{
<NOT> <NULL>
{
- //if column is explicitly defined not nullable, set following flag
- explicitNotNull = true;
- //if both null and not null constraints are defined for a column,
- //throw an exception
- if (explicitNull)
- throw StandardException.newException(SQLState.LANG_ADDING_COLUMN_WITH_NULL_AND_NOT_NULL_CONSTRAINT, columnName);
-
// columns with generation clauses can omit the datatype
if ( dataTypeDescriptor[0] == null ) { throw StandardException.newException(SQLState.LANG_NOT_NULL_NEEDS_DATATYPE); }
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=1456369&r1=1456368&r2=1456369&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 Thu Mar 14 09:00:23 2013
@@ -2036,12 +2036,6 @@ Guide.
</msg>
<msg>
- <name>42X83</name>
- <text>The constraints on column '{0}' require that it be both nullable and not nullable.</text>
- <arg>columnName</arg>
- </msg>
-
- <msg>
<name>42X84</name>
<text>Index '{0}' was created to enforce constraint '{1}'. It can only be dropped by dropping the constraint.</text>
<arg>index</arg>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties Thu Mar 14 09:00:23 2013
@@ -597,7 +597,6 @@ XSDG8.D=Nelze kop\u00edrovat adres\u00e1
42877=Kvalifikovan\u00e9 jm\u00e9no sloupce ''{0}'' nen\u00ed povoleno v klauzuli ORDER BY.
42X80=Klauzule VALUES mus\u00ed obsahovat alespo\u0148 jeden prvek. Pr\u00e1zdn\u00e9 prvky nejsou povoleny.
42X82=Klauzule USING vr\u00e1tila v\u00edce ne\u017e jeden \u0159\u00e1dek. P\u0159\u00edpustn\u00e9 jsou pouze jedno\u0159\u00e1dkov\u00e9 mno\u017einy v\u00fdsledk\u016f.
-42X83=Omezen\u00ed sloupce ''{0}'' vy\u017eaduj\u00ed, aby byly p\u0159evediteln\u00e9 i nep\u0159evediteln\u00e9 na hodnotu ''null''.
42X84=Index ''{0}'' byl vytvo\u0159en, aby vynucoval omezen\u00ed ''{1}''. M\u016f\u017ee b\u00fdt uvoln\u011bn pouze uvoln\u011bn\u00edm omezen\u00ed.
42X85=Omezen\u00ed ''{0}'' mus\u00ed b\u00fdt ve stejn\u00e9m sch\u00e9matu jako tabulka ''{1}''.
42X86=Selh\u00e1n\u00ed p\u0159\u00edkazu ALTER TABLE. Neexistuje omezen\u00ed ''{0}'' v tabulce ''{1}''.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties Thu Mar 14 09:00:23 2013
@@ -1556,12 +1556,6 @@
# Arguments:
#
-# {0} = columnName
-#
-42X83=Die Constraints f\u00FCr Spalte ''{0}'' erfordern, dass die Spalte sowohl auf Null setzbar ist als nicht leer sein darf.
-
-# Arguments:
-#
# {0} = index
# {1} = constraintName
#
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties Thu Mar 14 09:00:23 2013
@@ -1556,12 +1556,6 @@
# Arguments:
#
-# {0} = columnName
-#
-42X83=Las restricciones sobre la columna ''{0}'' necesitan que sean nulas y no nulas.
-
-# Arguments:
-#
# {0} = index
# {1} = constraintName
#
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties Thu Mar 14 09:00:23 2013
@@ -1556,12 +1556,6 @@
# Arguments:
#
-# {0} = columnName
-#
-42X83=Les contraintes de la colonne ''{0}'' exigent que cette derni\u00E8re contienne \u00E0 la fois des valeurs NULL et non NULL.
-
-# Arguments:
-#
# {0} = index
# {1} = constraintName
#
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties Thu Mar 14 09:00:23 2013
@@ -596,7 +596,6 @@ XSDG8.D=Vissza\u00e1ll\u00edt\u00e1s sor
42877=''{0}'' k\u00e9pzett oszlopn\u00e9v az ORDER BY r\u00e9szkifejez\u00e9sben nem megengedett.
42X80=A VALUES r\u00e9szkifejez\u00e9snek legal\u00e1bb egy elemet tartalmaznia kell. Az \u00fcres elemek nem megengedettek.
42X82=A USING r\u00e9szkifejez\u00e9s t\u00f6bb sort adott vissza. Csak egy soros ResultSet megengedett.
-42X83=A(z) ''{0}'' oszlop megszor\u00edt\u00e1sai szerint az oszlopnak nullk\u00e9pesnek \u00e9s nem nullk\u00e9pesnek egyar\u00e1nt lennie kell.
42X84=A(z) ''{0}'' l\u00e9trehoz\u00e1sra ker\u00fclt a(z) ''{1}'' megszor\u00edt\u00e1s foganatos\u00edt\u00e1sa \u00e9rdek\u00e9ben. Ez csak a megszor\u00edt\u00e1s megsz\u00fcntet\u00e9s\u00e9vel sz\u00fcntethet\u0151 meg.
42X85=A(z) ''{0}'' megszor\u00edt\u00e1snak ugyanabban a s\u00e9m\u00e1ban kell lennie mint a ''{1}'' t\u00e1bl\u00e1nak.
42X86=Az ALTER TABLE meghi\u00fasult. A(z) ''{1}'' t\u00e1bl\u00e1ra nem vonatkozik ''{0}'' megszor\u00edt\u00e1s.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties Thu Mar 14 09:00:23 2013
@@ -1556,12 +1556,6 @@
# Arguments:
#
-# {0} = columnName
-#
-42X83=I vincoli sulla colonna ''{0}'' richiedono che sia contemporaneamente annullabile e non annullabile.
-
-# Arguments:
-#
# {0} = index
# {1} = constraintName
#
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties Thu Mar 14 09:00:23 2013
@@ -1556,12 +1556,6 @@
# Arguments:
#
-# {0} = columnName
-#
-42X83=\u5217''{0}''\u4E0A\u306E\u5236\u7D04\u306F\u3001NULL\u53EF\u80FD\u3067\u3042\u308A\u3001\u304B\u3064NULL\u53EF\u80FD\u3067\u306A\u3044\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-
-# Arguments:
-#
# {0} = index
# {1} = constraintName
#
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties Thu Mar 14 09:00:23 2013
@@ -1556,12 +1556,6 @@
# Arguments:
#
-# {0} = columnName
-#
-42X83=''{0}'' \uC5F4\uC758 \uC81C\uC57D \uC870\uAC74\uC740 \uB110 \uC785\uB825\uC774 \uAC00\uB2A5\uD55C \uB3D9\uC2DC\uC5D0 \uB110 \uC785\uB825\uC774 \uAC00\uB2A5\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-
-# Arguments:
-#
# {0} = index
# {1} = constraintName
#
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties Thu Mar 14 09:00:23 2013
@@ -596,7 +596,6 @@ XSDG8.D=Nie mo\u017cna skopiowa\u0107 ka
42877=Kwalifikowana nazwa kolumny ''{0}'' nie jest dozwolona w klauzuli ORDER BY.
42X80=Klauzula VALUES musi zawiera\u0107 przynajmniej jeden element. Puste elementy nie s\u0105 dozwolone.
42X82=Klauzula USING zwr\u00f3ci\u0142a wi\u0119cej ni\u017c jeden wiersz. Dozwolone s\u0105 tylko wyniki ResultSets o pojedynczym wierszu.
-42X83=Regu\u0142y ograniczaj\u0105ce kolumny ''{0}'' dopuszczaj\u0105 i jednocze\u015bnie nie dopuszczaj\u0105 warto\u015bci null.
42X84=Indeks ''{0}'' zosta\u0142 utworzony, aby narzuci\u0107 regu\u0142\u0119 ograniczaj\u0105c\u0105 ''{1}''. Mo\u017ce by\u0107 usuni\u0119ty przez usuni\u0119cie regu\u0142y ograniczaj\u0105cej.
42X85=Regu\u0142a ograniczaj\u0105ca ''{0}'' musi by\u0107 w tym samym schemacie, co tabela ''{1}''.
42X86=Wykonanie instrukcji ALTER TABLE nie powiod\u0142o si\u0119. Brak regu\u0142y ograniczaj\u0105cej ''{0}'' dla tabeli ''{1}''.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties Thu Mar 14 09:00:23 2013
@@ -593,7 +593,6 @@ XSDG8.D=N\u00e3o foi poss\u00edvel copia
42877=N\u00e3o \u00e9 permitido o nome qualificado de coluna ''{0}'' na cl\u00e1usula ORDER BY.
42X80=A cl\u00e1usula VALUES deve conter pelo menos um elemento. Elementos vazios n\u00e3o s\u00e3o permitidos.
42X82=A cl\u00e1usula USING retornou mais de uma linha. S\u00e3o permitidos apenas ResultSets de uma \u00fanica linha.
-42X83=As restri\u00e7\u00f5es na coluna ''{0}'' requerem que esta tanto permita quanto n\u00e3o permita valores nulos.
42X84=O \u00edndice ''{0}'' foi criado para impor a restri\u00e7\u00e3o ''{1}''. Este \u00edndice somente pode ser removido atrav\u00e9s da remo\u00e7\u00e3o da restri\u00e7\u00e3o.
42X85=\u00c9 requerido que a restri\u00e7\u00e3o ''{0}'' esteja no mesmo esquema da tabela ''{1}''.
42X86=ALTER TABLE falhou. N\u00e3o existe a restri\u00e7\u00e3o ''{0}'' na tabela ''{1}''.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties Thu Mar 14 09:00:23 2013
@@ -596,7 +596,6 @@ XSDG8.D=\u041d\u0435 \u0443\u0434\u0430\
42877=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f \u0441\u0442\u043e\u043b\u0431\u0446\u0430 ''{0}'' \u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f \u0432 \u043a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u0438 ORDER BY.
42X80=\u041a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f VALUES \u0434\u043e\u043b\u0436\u043d\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c, \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c, \u043e\u0434\u0438\u043d \u044d\u043b\u0435\u043c\u0435\u043d\u0442. \u041f\u0443\u0441\u0442\u044b\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b \u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u043a\u0430\u044e\u0442\u0441\u044f.
42X82=\u041a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f USING \u0432\u043e\u0437\u0432\u0440\u0430\u0442\u0438\u043b\u0430 \u0431\u043e\u043b\u0435\u0435 \u043e\u0434\u043d\u043e\u0439 \u0441\u0442\u0440\u043e\u043a\u0438. \u0420\u0430\u0437\u0440\u0435\u0448\u0430\u044e\u0442\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u043e\u0441\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u043d\u0430\u0431\u043e\u0440\u044b \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432.
-42X83=\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u0441\u0442\u043e\u043b\u0431\u0446\u0430 ''{0}'' \u0442\u0440\u0435\u0431\u0443\u044e\u0442, \u0447\u0442\u043e\u0431\u044b \u043e\u043d \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u044f\u0432\u043b\u044f\u043b\u0441\u044f \u0438 \u043e\u0431\u043d\u0443\u043b\u044f\u0435\u043c\u044b\u043c, \u0438 \u043d\u0435\u043e\u0431\u043d\u0443\u043b\u044f\u0435\u043c\u044b\u043c.
42X84=\u0418\u043d\u0434\u0435\u043a\u0441 ''{0}'' \u0431\u044b\u043b \u0441\u043e\u0437\u0434\u0430\u043d \u0434\u043b\u044f \u043f\u0440\u0438\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f ''{1}''. \u0415\u0433\u043e \u043c\u043e\u0436\u043d\u043e \u043e\u0442\u0431\u0440\u043e\u0441\u0438\u0442\u044c, \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0442\u0431\u0440\u043e\u0441\u0438\u0432 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435.
42X85=\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 ''{0}'' \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0432 \u0442\u043e\u0439 \u0436\u0435 \u0441\u0445\u0435\u043c\u0435, \u0447\u0442\u043e \u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u0430 ''{1}''.
42X86=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435 ALTER TABLE \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u043e\u0441\u044c \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u043e. \u0414\u043b\u044f \u0442\u0430\u0431\u043b\u0438\u0446\u044b ''{1}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f ''{0}''.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties Thu Mar 14 09:00:23 2013
@@ -1556,12 +1556,6 @@
# Arguments:
#
-# {0} = columnName
-#
-42X83=\u5217\u201C{0}\u201D\u4E0A\u7684\u7EA6\u675F\u6761\u4EF6\u8981\u6C42\u5B83\u540C\u65F6\u53EF\u4E3A\u7A7A\u548C\u4E0D\u53EF\u4E3A\u7A7A\u3002
-
-# Arguments:
-#
# {0} = index
# {1} = constraintName
#
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties?rev=1456369&r1=1456368&r2=1456369&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties Thu Mar 14 09:00:23 2013
@@ -1556,12 +1556,6 @@
# Arguments:
#
-# {0} = columnName
-#
-42X83=\u76F4\u6B04 ''{0}'' \u7684\u9650\u5236\u9700\u8981\u5B83\u5FC5\u9808\u53EF\u70BA NULL\uFF0C\u53C8\u4E0D\u53EF\u70BA NULL\u3002
-
-# Arguments:
-#
# {0} = index
# {1} = constraintName
#
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=1456369&r1=1456368&r2=1456369&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 Thu Mar 14 09:00:23 2013
@@ -907,7 +907,6 @@ public interface SQLState {
String LANG_EMPTY_VALUES_CLAUSE = "42X80";
String LANG_EMPTY_COLUMN_LIST = "42X81";
String LANG_USING_CARDINALITY_VIOLATION = "42X82";
- String LANG_ADDING_COLUMN_WITH_NULL_AND_NOT_NULL_CONSTRAINT = "42X83";
String LANG_CANT_DROP_BACKING_INDEX = "42X84";
String LANG_CONSTRAINT_SCHEMA_MISMATCH = "42X85";
String LANG_DROP_NON_EXISTENT_CONSTRAINT = "42X86";