Repository: incubator-trafodion
Updated Branches:
refs/heads/master 741e52a28 -> 4ba8d7d33
JIRA 1899, Various fixes. Details below.
-- time datatype with no fraction precision was not getting converted
correctly and was putting out null characters.
-- dateformat usa was not displaying AM/PM with time datatype
-- update of primary key that got transformed into delete/insert
would incorrectly delete the row if insert ran into an error
-- rename cascade option is not supported. An error is now returned.
-- rename table with check constraint is not supported.
An error is now returned.
-- add/drop of primary key constraint now gives consistent behavior.
Primary key columns are used as clustering key if primary key constraint
is specified during create table.
Primary key constraint creates a unique index if it is specified
after create table and no user specified primary or store by clause
was specified during create.
Drop of primary key constraint succeeds only if that primary key
is not the clustering key.
-- invalid ddl with salt clause no longer crashes and returns an error instead.
-- parser now gives a syntax error on MV and Triggers queries since
these features are not externalized.
-- regress/seabase/TEST031 has been added for misc fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7c7ca5f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7c7ca5f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7c7ca5f3
Branch: refs/heads/master
Commit: 7c7ca5f3941f6a6d2141b1b91dac5c70e81d210f
Parents: 2a9e9f2
Author: Cloud User <ce...@ansharma-2.novalocal>
Authored: Thu Mar 17 19:59:28 2016 +0000
Committer: Cloud User <ce...@ansharma-2.novalocal>
Committed: Thu Mar 17 19:59:28 2016 +0000
----------------------------------------------------------------------
core/sql/bin/SqlciErrors.txt | 4 +-
core/sql/exp/exp_conv.cpp | 1 +
core/sql/exp/exp_datetime.cpp | 11 +-
core/sql/exp/exp_datetime.h | 1 +
core/sql/generator/GenPreCode.cpp | 5 +-
core/sql/optimizer/SynthType.cpp | 14 +-
core/sql/parser/sqlparser.y | 31 +++-
core/sql/regress/compGeneral/EXPECTED006.SB | 17 +-
core/sql/regress/seabase/EXPECTED030 | 49 ++++++
core/sql/regress/seabase/EXPECTED031 | 214 +++++++++++++++++++++++
core/sql/regress/seabase/TEST030 | 7 +
core/sql/regress/seabase/TEST031 | 108 ++++++++++++
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 63 ++++++-
13 files changed, 503 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index 084a4fd..851dbae 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -247,8 +247,8 @@
1252 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The existing index $0~TableName to be used by a unique or primary constraint has not been populated. Please populate the index and then try to add the constraint again.
1253 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- Msg text will be merged in. ------
1254 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Duplicate unique constraints are not allowed with same set of columns.
-1255 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- Msg text will be merged in ------
-1256 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- Msg text will be merged in ------
+1255 ZZZZZ 99999 BEGINNER MINOR DBADMIN Constraint $0~String0 is the clustering key constraint for table $1~String1 and cannot be dropped.
+1256 ZZZZZ 99999 BEGINNER MINOR DBADMIN PRIMARY KEY constraint cannot be added since table $0~String0 already has a user specified clustering key.
1257 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- Msg text will be merged in ------
1258 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- Msg text will be merged in ------
1259 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- Msg text will be merged in ------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_conv.cpp b/core/sql/exp/exp_conv.cpp
index ad671c6..2ed1033 100644
--- a/core/sql/exp/exp_conv.cpp
+++ b/core/sql/exp/exp_conv.cpp
@@ -1467,6 +1467,7 @@ ex_expr::exp_return_type convDatetimeDatetime(char * target,
dstEndField,
(short)targetScale,
target,
+ targetLen,
validateFlag,
&roundedDown) != 0) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/exp/exp_datetime.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_datetime.cpp b/core/sql/exp/exp_datetime.cpp
index e1f00bb..456f539 100644
--- a/core/sql/exp/exp_datetime.cpp
+++ b/core/sql/exp/exp_datetime.cpp
@@ -89,6 +89,7 @@ copyDatetimeFields(rec_datetime_field startField,
short dstFractPrec,
char *srcData,
char *dstData,
+ Lng32 dstLen,
NABoolean *roundedDownFlag);
//////////////////////////////////////////////
@@ -955,6 +956,7 @@ ExpDatetime::arithDatetimeInterval(arithOps operation,
datetimeOpType->getScale(),
datetimeOpData,
dateTimeValue,
+ MAX_DATETIME_SIZE,
NULL) != 0) {
ExRaiseSqlError(heap, diagsArea, EXE_INTERNAL_ERROR);
return -1;
@@ -1370,6 +1372,7 @@ copyDatetimeFields(rec_datetime_field startField,
short dstFractPrec,
char *srcData,
char *dstData,
+ Lng32 dstLen,
NABoolean *roundedDownFlag)
{
@@ -1404,7 +1407,9 @@ copyDatetimeFields(rec_datetime_field startField,
dstFractPrec,
roundedDownFlag);
}
- str_cpy_all(dstData, (char *) &fraction, sizeof(fraction));
+ // if destination has space for fraction, copy it.
+ if ((dstLen > 0) && (dstLen >= (size + sizeof(fraction))))
+ str_cpy_all(dstData, (char *) &fraction, sizeof(fraction));
}
return 0;
}
@@ -1483,6 +1488,7 @@ ExpDatetime::convDatetimeDatetime(char *srcData,
rec_datetime_field dstEndField,
short dstFractPrec,
char *dstData,
+ Lng32 dstLen,
short validateFlag,
NABoolean *roundedDownFlag)
{
@@ -1531,6 +1537,7 @@ ExpDatetime::convDatetimeDatetime(char *srcData,
dstFractPrec,
srcData,
dstData,
+ dstLen,
roundedDownFlag) != 0) {
return -1;
}
@@ -1596,13 +1603,13 @@ ExpDatetime::extractDatetime(rec_datetime_field srcStartField,
(rec_datetime_field)(dstStartField - 1),
srcFractPrec);
-
if (copyDatetimeFields(dstStartField,
dstEndField,
srcFractPrec,
getScale(),
srcData,
dstData,
+ getLength(),
NULL) != 0) {
return -1;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/exp/exp_datetime.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_datetime.h b/core/sql/exp/exp_datetime.h
index ba110d0..8f6fa1b 100644
--- a/core/sql/exp/exp_datetime.h
+++ b/core/sql/exp/exp_datetime.h
@@ -222,6 +222,7 @@ NA_EIDPROC
rec_datetime_field dstEndField,
short dstFractPrec,
char *dstData,
+ Lng32 dstLen,
short validateFlag,
NABoolean *roundedDownFlag = NULL);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index f57ade2..2752e61 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -4956,10 +4956,13 @@ RelExpr * HbaseDelete::preCodeGen(Generator * generator,
}
}
}
- else if (producesOutputs())
+
+ if ((producesOutputs()) &&
+ ((NOT isUnique) || (getUpdateCKorUniqueIndexKey())))
{
// Cannot do olt msg opt if:
// -- values are to be returned and unique operation is not being used.
+ // -- or this delete was transformed from an update of pkey/index key
// set an indication that multiple rows will be returned.
generator->oltOptInfo()->setMultipleRowsReturned(TRUE);
generator->oltOptInfo()->setOltCliOpt(FALSE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/optimizer/SynthType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SynthType.cpp b/core/sql/optimizer/SynthType.cpp
index dbb2459..16880e1 100644
--- a/core/sql/optimizer/SynthType.cpp
+++ b/core/sql/optimizer/SynthType.cpp
@@ -2828,8 +2828,20 @@ const NAType *DateFormat::synthesizeType()
if (vid.getType().getTypeQualifier() == NA_DATETIME_TYPE)
{
+ const DatetimeType& operand = (DatetimeType &)vid.getType();
Lng32 frmt = ExpDatetime::getDatetimeFormat(formatStr_.data());
- length = ExpDatetime::getDatetimeFormatMaxLen(frmt);
+
+ if (wasDateformat_)
+ {
+ length = operand.getDisplayLength();
+ if(operand.containsField(REC_DATE_HOUR) &&
+ (frmt == ExpDatetime::DATETIME_FORMAT_USA))
+ length += 3; // add 3 for a blank and "am" or "pm"
+ }
+ else
+ {
+ length = ExpDatetime::getDatetimeFormatMaxLen(frmt);
+ }
}
else if (vid.getType().getTypeQualifier() == NA_CHARACTER_TYPE)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 3f61169..770facd 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -28743,6 +28743,8 @@ before_trigger_prefix: create_trigger_keywords ddl_qualified_name
TOK_BEFORE iud_event optional_update_column_list TOK_ON
ddl_qualified_name referencing_clause before_action_orientation
{
+ *SqlParser_Diags << DgSqlCode(-3131);
+ YYERROR;
InsideTriggerDefinition = TRUE;
@@ -28817,6 +28819,9 @@ after_trigger_prefix: create_trigger_keywords ddl_qualified_name
TOK_AFTER iud_event optional_update_column_list TOK_ON
ddl_qualified_name referencing_clause after_action_orientation
{
+ *SqlParser_Diags << DgSqlCode(-3131);
+ YYERROR;
+
InsideTriggerDefinition = TRUE;
// if (NonISO88591LiteralEncountered) {
@@ -29097,6 +29102,9 @@ mv_definition: create_mv_keywords ddl_qualified_name
optional_in_memory_clause
as_token query_expression
{
+ *SqlParser_Diags << DgSqlCode(-3131);
+ YYERROR;
+
RelRoot *top = finalize($11);
ForUpdateSpec spec(FALSE);
spec.finalizeUpdatability(top);
@@ -29226,6 +29234,9 @@ create_mv_keywords: TOK_CREATE optional_ghost mv_token
// type pStmtDDL
create_mvrgroup_statement : TOK_CREATE TOK_MVGROUP ddl_qualified_name
{
+ *SqlParser_Diags << DgSqlCode(-3131);
+ YYERROR;
+
$$ = new (PARSERHEAP())StmtDDLCreateMvRGroup(*$3);
delete $3;
}
@@ -30640,10 +30651,13 @@ alter_view_statement : TOK_ALTER TOK_VIEW ddl_qualified_name
// type pStmtDDL
alter_mv_statement : TOK_ALTER optional_ghost mv_token alter_mv_body
{
- $4->castToStmtDDLAlterMV()->synthesize();
- $$ = $4 /*alter_mv_body*/;
- if ($2) /*optional_ghost*/
- $$->setIsGhostObject(TRUE);
+ *SqlParser_Diags << DgSqlCode(-3131);
+ YYERROR;
+
+ $4->castToStmtDDLAlterMV()->synthesize();
+ $$ = $4 /*alter_mv_body*/;
+ if ($2) /*optional_ghost*/
+ $$->setIsGhostObject(TRUE);
}
@@ -31845,6 +31859,9 @@ drop_table_start_tokens : TOK_DROP TOK_TABLE
// MV - RG
drop_mvrgroup_statement : TOK_DROP TOK_MVGROUP ddl_qualified_name
{
+ *SqlParser_Diags << DgSqlCode(-3131);
+ YYERROR;
+
$$ = new (PARSERHEAP())StmtDDLDropMvRGroup(*$3);
delete $3;
}
@@ -31853,6 +31870,9 @@ drop_mvrgroup_statement : TOK_DROP TOK_MVGROUP ddl_qualified_name
drop_trigger_statement : TOK_DROP TOK_TRIGGER ddl_qualified_name
optional_cleanup optional_validate optional_logfile
{
+ *SqlParser_Diags << DgSqlCode(-3131);
+ YYERROR;
+
/* If VALIDATE, or LOG option specified, */
/* ALLOW_SPECIALTABLETYPE must also be specified */
if (($5 || $6) &&
@@ -31881,6 +31901,9 @@ drop_trigger_statement : TOK_DROP TOK_TRIGGER ddl_qualified_name
drop_mv_statement : TOK_DROP optional_ghost mv_token ddl_qualified_name optional_cleanup
optional_drop_behavior optional_validate optional_logfile
{
+ *SqlParser_Diags << DgSqlCode(-3131);
+ YYERROR;
+
/* If VALIDATE, or LOG option specified, */
/* ALLOW_SPECIALTABLETYPE must also be specified */
if (($7 || $8) &&
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/regress/compGeneral/EXPECTED006.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED006.SB b/core/sql/regress/compGeneral/EXPECTED006.SB
index cbb07f6..9bb4400 100644
--- a/core/sql/regress/compGeneral/EXPECTED006.SB
+++ b/core/sql/regress/compGeneral/EXPECTED006.SB
@@ -60,9 +60,10 @@
>>create mv mvx refresh on request initialize on create as select a,sum(b) s_b
+>from x1 group by a;
-*** ERROR[1002] Catalog SEABASE does not exist or has not been registered on node \NSK.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
---- SQL operation failed with errors.
>>
>>update statistics for table x1 on every column;
@@ -138,7 +139,7 @@
--- SQL operation complete.
>>prepare s1 from insert into t006t3 select * from t006t3 where a in (select a from t006t3);
-*** ERROR[4026] Reading from and inserting into, or updating in, or deleting from the same table, SEABASE.SCH.T006T3, is not currently supported.
+*** ERROR[4026] Reading from and inserting into, or updating in, or deleting from the same table, TRAFODION.SCH.T006T3, is not currently supported.
*** ERROR[8822] The statement was not prepared.
@@ -612,7 +613,7 @@
>>-- Error 4073
>>prepare xx from select * from t006t1 where a = (select a from t006t3) collate default;
-*** ERROR[4034] The operation (SCALAR_AGGR(SCAN SEABASE.SCH.T006T3) COLLATE DEFAULT) is not allowed.
+*** ERROR[4034] The operation (SCALAR_AGGR(SCAN TRAFODION.SCH.T006T3) COLLATE DEFAULT) is not allowed.
*** ERROR[4073] The COLLATE clause may appear only after an expression of character data type, not INTEGER.
@@ -638,7 +639,7 @@
>>-- Error 4122
>>prepare xx from insert into t006t3 values (NULL);
-*** ERROR[4122] NULL cannot be assigned to NOT NULL column SEABASE.SCH.T006T3.A.
+*** ERROR[4122] NULL cannot be assigned to NOT NULL column TRAFODION.SCH.T006T3.A.
*** ERROR[8822] The statement was not prepared.
@@ -670,7 +671,7 @@
*** ERROR[4310] USER(x) is currently supported only in the outermost SELECT list. For example, it cannot be a part of the subquery.
-*** ERROR[4062] The preceding error actually occurred in function USER(SEABASE.SCH.T006T1.A).
+*** ERROR[4062] The preceding error actually occurred in function USER(TRAFODION.SCH.T006T1.A).
*** ERROR[8822] The statement was not prepared.
@@ -678,7 +679,7 @@
*** ERROR[4310] USER(x) is currently supported only in the outermost SELECT list. For example, it cannot be a part of the subquery.
-*** ERROR[4062] The preceding error actually occurred in function USER(SEABASE.SCH.T006T2.A).
+*** ERROR[4062] The preceding error actually occurred in function USER(TRAFODION.SCH.T006T2.A).
*** ERROR[8822] The statement was not prepared.
@@ -686,7 +687,7 @@
>>-- Error 4312
>>prepare xx from update HP_SYSTEM_CATALOG.mxcs_schema.ASSOC2DS set assoc_id = 100;
-*** ERROR[4312] HP_SYSTEM_CATALOG.MXCS_SCHEMA.ASSOC2DS is an MXCS metadata table and cannot be directly updated.
+*** ERROR[1002] Catalog HP_SYSTEM_CATALOG does not exist or has not been registered on node .
*** ERROR[8822] The statement was not prepared.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/regress/seabase/EXPECTED030
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED030 b/core/sql/regress/seabase/EXPECTED030
index b065ee3..3d85727 100644
--- a/core/sql/regress/seabase/EXPECTED030
+++ b/core/sql/regress/seabase/EXPECTED030
@@ -410,6 +410,55 @@ March 01, 2016, 10:11:12
--- 1 row(s) selected.
>>
+>>select dateformat(time '10:11:12.1', default) from (values(1)) x(a);
+
+(EXPR)
+----------
+
+10:11:12.1
+
+--- 1 row(s) selected.
+>>select dateformat(time '10:11:12.123', usa) from (values(1)) x(a);
+
+(EXPR)
+---------------
+
+10:11:12.123 AM
+
+--- 1 row(s) selected.
+>>select dateformat(time '10:11:12', european) from (values(1)) x(a);
+
+(EXPR)
+--------
+
+10.11.12
+
+--- 1 row(s) selected.
+>>select dateformat(timestamp '2016-03-01 10:11:12.1', default) from (values(1)) x(a);
+
+(EXPR)
+----------
+
+2016-03-01
+
+--- 1 row(s) selected.
+>>select dateformat(timestamp '2016-03-01 10:11:12', usa) from (values(1)) x(a);
+
+(EXPR)
+----------
+
+03/01/2016
+
+--- 1 row(s) selected.
+>>select dateformat(timestamp '2016-03-01 10:11:12.123', european) from (values(1)) x(a);
+
+(EXPR)
+----------
+
+01.03.2016
+
+--- 1 row(s) selected.
+>>
>>drop table if exists t030t1;
--- SQL operation complete.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/regress/seabase/EXPECTED031
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED031 b/core/sql/regress/seabase/EXPECTED031
new file mode 100644
index 0000000..5d0ea78
--- /dev/null
+++ b/core/sql/regress/seabase/EXPECTED031
@@ -0,0 +1,214 @@
+>>
+>>-- tests for PRIMARY KEY constraint usage
+>>drop table if exists t031t1;
+
+--- SQL operation complete.
+>>create table t031t1 (a int not null, b int not null, constraint ppk primary key(a));
+
+--- SQL operation complete.
+>>alter table t031t1 add constraint ppk primary key(b);
+
+*** ERROR[1043] Constraint TRAFODION.SCH.PPK already exists.
+
+--- SQL operation failed with errors.
+>>alter table t031t1 add constraint ppk2 primary key(b);
+
+*** ERROR[1256] PRIMARY KEY constraint cannot be added since table TRAFODION.SCH.T031T1 already has a user specified clustering key.
+
+--- SQL operation failed with errors.
+>>alter table t031t1 add constraint ppk unique(b);
+
+*** ERROR[1043] Constraint TRAFODION.SCH.PPK already exists.
+
+--- SQL operation failed with errors.
+>>alter table t031t1 drop constraint ppk;
+
+*** ERROR[1255] Constraint TRAFODION.SCH.PPK is the clustering key constraint for table TRAFODION.SCH.T031T1 and cannot be dropped.
+
+--- SQL operation failed with errors.
+>>
+>>drop table if exists t031t1;
+
+--- SQL operation complete.
+>>create table t031t1 (a int not null, b int not null);
+
+--- SQL operation complete.
+>>alter table t031t1 add constraint ppk primary key(a);
+
+--- SQL operation complete.
+>>alter table t031t1 add constraint ppk primary key(b);
+
+*** ERROR[1043] Constraint TRAFODION.SCH.PPK already exists.
+
+--- SQL operation failed with errors.
+>>alter table t031t1 add constraint ppk2 primary key(b);
+
+--- SQL operation complete.
+>>alter table t031t1 add constraint ppk unique(b);
+
+*** ERROR[1043] Constraint TRAFODION.SCH.PPK already exists.
+
+--- SQL operation failed with errors.
+>>alter table t031t1 drop constraint ppk;
+
+--- SQL operation complete.
+>>
+>>drop table if exists t031t1;
+
+--- SQL operation complete.
+>>create table t031t1 (a int not null, b int not null) store by (a);
+
+--- SQL operation complete.
+>>alter table t031t1 add constraint ppk primary key(a);
+
+*** ERROR[1256] PRIMARY KEY constraint cannot be added since table TRAFODION.SCH.T031T1 already has a user specified clustering key.
+
+--- SQL operation failed with errors.
+>>alter table t031t1 add constraint ppk unique(b);
+
+--- SQL operation complete.
+>>alter table t031t1 drop constraint ppk;
+
+--- SQL operation complete.
+>>
+>>drop table if exists t031t1;
+
+--- SQL operation complete.
+>>create table t031t1 (a int not null primary key, b int not null);
+
+--- SQL operation complete.
+>>alter table t031t1 add constraint ppk primary key(a);
+
+*** ERROR[1254] Duplicate unique constraints are not allowed with same set of columns.
+
+--- SQL operation failed with errors.
+>>alter table t031t1 add constraint ppk primary key(b);
+
+*** ERROR[1256] PRIMARY KEY constraint cannot be added since table TRAFODION.SCH.T031T1 already has a user specified clustering key.
+
+--- SQL operation failed with errors.
+>>
+>>-- primary key update transformed into delete/insert incorrectly
+>>-- deletes row after conflict
+>>create table if not exists t031t1 (a int not null primary key, b int not null);
+
+--- SQL operation complete.
+>>delete from t031t1;
+
+--- 0 row(s) deleted.
+>>insert into t031t1 values (1,1), (2,2), (3,3), (4,4);
+
+--- 4 row(s) inserted.
+>>update t031t1 set a = 4 where a = 2;
+
+*** ERROR[8102] The operation is prevented by a unique constraint.
+
+--- 0 row(s) updated.
+>>select * from t031t1;
+
+A B
+----------- -----------
+
+ 1 1
+ 2 2
+ 3 3
+ 4 4
+
+--- 4 row(s) selected.
+>>
+>>-- incorrect ddl with salt clause should not crash
+>>drop table if exists t031t1;
+
+--- SQL operation complete.
+>>create table t031t1 (
++>T2C1 int not null not droppable,
++>T2C1 int not null not droppable,
++>T2C1 int)
++>salt using 2 partitions on (T2C1, T2C2)
++>store by (T2C1, T2C2);
+
+*** ERROR[1009] Column T2C2 does not exist in the specified table.
+
+--- SQL operation failed with errors.
+>>
+>>-- cannot rename table with check constraints.
+>>-- cascade option with rename not supported.
+>>drop table if exists t031t1;
+
+--- SQL operation complete.
+>>create table t031t1 (a int);
+
+--- SQL operation complete.
+>>alter table t031t1 add constraint t031t1_c1 check (a > 0);
+
+--- SQL operation complete.
+>>alter table t031t1 rename to t031t1_ren cascade;
+
+*** ERROR[1427] Table cannot be renamed. Reason: Cascade option not supported.
+
+--- SQL operation failed with errors.
+>>alter table t031t1 rename to t031t1_ren;
+
+*** ERROR[1427] Table cannot be renamed. Reason: Operation not allowed if check constraints are present. Drop the constraints and recreate them after rename.
+
+--- SQL operation failed with errors.
+>>
+>>-- time datatype conversion was returning incorrect results
+>>drop table if exists t031t1;
+
+--- SQL operation complete.
+>>create table t031t1
++>(id int not null,
++>time1 time default null,
++>time2 time default null,
++>type1 time default null,
++>type2 char(5) default null,
++>diff char(6) default null,
++>primary key (id));
+
+--- SQL operation complete.
+>>insert into t031t1 (id, time1, time2, diff) values (1, time '00:00:30.758788', time '00:00:29.615308', 'MATCH');
+
+--- 1 row(s) inserted.
+>>select * from t031t1 order by 1;
+
+ID TIME1 TIME2 TYPE1 TYPE2 DIFF
+----------- -------- -------- -------- ----- ------
+
+ 1 00:00:30 00:00:29 ? ? MATCH
+
+--- 1 row(s) selected.
+>>update t031t1
++>set type1 =
++>case when (time1 + interval '1' second) < time2 then time1 else time2
++>end,
++>type2 =
++>case when (time1 + interval '1' second) < time2 then 'T1' else 'T2'
++>end
++>where id = 1;
+
+--- 1 row(s) updated.
+>>select
++>type2, diff, type1,
++>case
++>when diff = 'MATCH' then 'PASS' else 'FAIL'
++>end
++>from t031t1
++>where id = 1;
+
+TYPE2 DIFF TYPE1 (EXPR)
+----- ------ -------- ------
+
+T2 MATCH 00:00:29 PASS
+
+--- 1 row(s) selected.
+>>select * from t031t1;
+
+ID TIME1 TIME2 TYPE1 TYPE2 DIFF
+----------- -------- -------- -------- ----- ------
+
+ 1 00:00:30 00:00:29 00:00:29 T2 MATCH
+
+--- 1 row(s) selected.
+>>
+>>log;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/regress/seabase/TEST030
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST030 b/core/sql/regress/seabase/TEST030
index e75d96f..62d5a0b 100644
--- a/core/sql/regress/seabase/TEST030
+++ b/core/sql/regress/seabase/TEST030
@@ -78,6 +78,13 @@ select to_char (time '10:23:34', 'HH:MI:SS') from (values(1)) x(a);
select to_char(TIMESTAMP '2016-03-01 10:11:12', 'YYYY-MM-DD') from (values(1)) x(a);
select to_char(TIMESTAMP '2016-03-01 10:11:12', 'HH:MI:SS') from (values(1)) x(a);
+select dateformat(time '10:11:12.1', default) from (values(1)) x(a);
+select dateformat(time '10:11:12.123', usa) from (values(1)) x(a);
+select dateformat(time '10:11:12', european) from (values(1)) x(a);
+select dateformat(timestamp '2016-03-01 10:11:12.1', default) from (values(1)) x(a);
+select dateformat(timestamp '2016-03-01 10:11:12', usa) from (values(1)) x(a);
+select dateformat(timestamp '2016-03-01 10:11:12.123', european) from (values(1)) x(a);
+
drop table if exists t030t1;
create table t030t1 (a date, b char(30), c varchar(30));
insert into t030t1 values (date '2016-03-01', '2016-03-01', '2016-03-01');
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/regress/seabase/TEST031
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST031 b/core/sql/regress/seabase/TEST031
new file mode 100644
index 0000000..5265339
--- /dev/null
+++ b/core/sql/regress/seabase/TEST031
@@ -0,0 +1,108 @@
+-- @@@ START COPYRIGHT @@@
+--
+-- 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.
+--
+-- @@@ END COPYRIGHT @@@
+--
+
+-- tests for various misc fixes
+
+log LOG031 clear;
+
+-- tests for PRIMARY KEY constraint usage
+drop table if exists t031t1;
+create table t031t1 (a int not null, b int not null, constraint ppk primary key(a));
+alter table t031t1 add constraint ppk primary key(b);
+alter table t031t1 add constraint ppk2 primary key(b);
+alter table t031t1 add constraint ppk unique(b);
+alter table t031t1 drop constraint ppk;
+
+drop table if exists t031t1;
+create table t031t1 (a int not null, b int not null);
+alter table t031t1 add constraint ppk primary key(a);
+alter table t031t1 add constraint ppk primary key(b);
+alter table t031t1 add constraint ppk2 primary key(b);
+alter table t031t1 add constraint ppk unique(b);
+alter table t031t1 drop constraint ppk;
+
+drop table if exists t031t1;
+create table t031t1 (a int not null, b int not null) store by (a);
+alter table t031t1 add constraint ppk primary key(a);
+alter table t031t1 add constraint ppk unique(b);
+alter table t031t1 drop constraint ppk;
+
+drop table if exists t031t1;
+create table t031t1 (a int not null primary key, b int not null);
+alter table t031t1 add constraint ppk primary key(a);
+alter table t031t1 add constraint ppk primary key(b);
+
+-- primary key update transformed into delete/insert incorrectly
+-- deletes row after conflict
+create table if not exists t031t1 (a int not null primary key, b int not null);
+delete from t031t1;
+insert into t031t1 values (1,1), (2,2), (3,3), (4,4);
+update t031t1 set a = 4 where a = 2;
+select * from t031t1;
+
+-- incorrect ddl with salt clause should not crash
+drop table if exists t031t1;
+create table t031t1 (
+T2C1 int not null not droppable,
+T2C1 int not null not droppable,
+T2C1 int)
+salt using 2 partitions on (T2C1, T2C2)
+store by (T2C1, T2C2);
+
+-- cannot rename table with check constraints.
+-- cascade option with rename not supported.
+drop table if exists t031t1;
+create table t031t1 (a int);
+alter table t031t1 add constraint t031t1_c1 check (a > 0);
+alter table t031t1 rename to t031t1_ren cascade;
+alter table t031t1 rename to t031t1_ren;
+
+-- time datatype conversion was returning incorrect results
+drop table if exists t031t1;
+create table t031t1
+(id int not null,
+time1 time default null,
+time2 time default null,
+type1 time default null,
+type2 char(5) default null,
+diff char(6) default null,
+primary key (id));
+insert into t031t1 (id, time1, time2, diff) values (1, time '00:00:30.758788', time '00:00:29.615308', 'MATCH');
+select * from t031t1 order by 1;
+update t031t1
+set type1 =
+case when (time1 + interval '1' second) < time2 then time1 else time2
+end,
+type2 =
+case when (time1 + interval '1' second) < time2 then 'T1' else 'T2'
+end
+where id = 1;
+select
+type2, diff, type1,
+case
+when diff = 'MATCH' then 'PASS' else 'FAIL'
+end
+from t031t1
+where id = 1;
+select * from t031t1;
+
+log;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7ca5f3/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 8d20873..762c90b 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -1615,7 +1615,17 @@ short CmpSeabaseDDL::createSeabaseTable2(
{
const NAString &colName = (*saltArray)[i]->getColumnName();
ComAnsiNamePart cnp(colName, ComAnsiNamePart::INTERNAL_FORMAT);
- CollIndex colIx = colArray.getColumnIndex(colName);
+ Lng32 colIx = colArray.getColumnIndex(colName);
+ if (colIx < 0)
+ {
+ *CmpCommon::diags() << DgSqlCode(-1009)
+ << DgColumnName(colName);
+
+ deallocEHI(ehi);
+ processReturn();
+ return -1;
+ }
+
NAType *colType = colArray[colIx]->getColumnDataType();
NAString typeText;
short rc = colType->getMyTypeAsText(&typeText, FALSE);
@@ -3898,7 +3908,29 @@ void CmpSeabaseDDL::renameSeabaseTable(
return;
}
- Int64 objUID = getObjectUID(&cliInterface,
+ // cascade option not supported
+ if (renameTableNode->isCascade())
+ {
+ *CmpCommon::diags() << DgSqlCode(-1427)
+ << DgString0("Reason: Cascade option not supported.");
+
+ processReturn();
+ return;
+ }
+
+ const CheckConstraintList &checkList = naTable->getCheckConstraints();
+ if (checkList.entries() > 0)
+ {
+ *CmpCommon::diags()
+ << DgSqlCode(-1427)
+ << DgString0("Reason: Operation not allowed if check constraints are present. Drop the constraints and recreate them after rename.");
+
+ processReturn();
+
+ return;
+ }
+
+ Int64 objUID = getObjectUID(&cliInterface,
catalogNamePart.data(), schemaNamePart.data(),
objectNamePart.data(),
COM_BASE_TABLE_OBJECT_LIT);
@@ -3923,7 +3955,7 @@ void CmpSeabaseDDL::renameSeabaseTable(
if (usingViewsQueue->numEntries() > 0)
{
*CmpCommon::diags() << DgSqlCode(-1427)
- << DgString0("Reason: Dependent views exist.");
+ << DgString0("Reason: Operation not allowed if dependent views exist. Drop the views and recreate them after rename.");
processReturn();
return;
@@ -6143,7 +6175,6 @@ void CmpSeabaseDDL::alterSeabaseTableAddPKeyConstraint(
return;
}
-
BindWA bindWA(ActiveSchemaDB(), CmpCommon::context(), FALSE/*inDDL*/);
CorrName cn(tableName.getObjectNamePart().getInternalName(),
STMTHEAP,
@@ -6202,6 +6233,19 @@ void CmpSeabaseDDL::alterSeabaseTableAddPKeyConstraint(
return;
}
+ // if table already has a primary key, return error.
+ if ((naTable->getClusteringIndex()) &&
+ (NOT naTable->getClusteringIndex()->hasOnlySyskey()))
+ {
+ *CmpCommon::diags()
+ << DgSqlCode(-1256)
+ << DgString0(extTableName);
+
+ processReturn();
+
+ return;
+ }
+
// update unique key constraint info
NAString uniqueStr;
if (genUniqueName(alterAddConstraint, uniqueStr))
@@ -7728,6 +7772,17 @@ void CmpSeabaseDDL::alterSeabaseTableDropConstraint(
return;
}
+
+ if (isPkeyConstr)
+ {
+ *CmpCommon::diags() << DgSqlCode(-1255)
+ << DgString0(dropConstrName)
+ << DgString1(extTableName);
+
+ processReturn();
+
+ return;
+ }
}
NATable *otherNaTable = NULL;
regressions expected files updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6ec8e779
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6ec8e779
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6ec8e779
Branch: refs/heads/master
Commit: 6ec8e7791c6aa08c62ca34bd30a44e0248291c99
Parents: 046863e
Author: Cloud User <ce...@ansharma-2.novalocal>
Authored: Sun Mar 20 16:29:37 2016 +0000
Committer: Cloud User <ce...@ansharma-2.novalocal>
Committed: Sun Mar 20 16:29:37 2016 +0000
----------------------------------------------------------------------
core/sql/regress/charsets/EXPECTED002 | 6 +-
core/sql/regress/charsets/EXPECTED310 | 198 ++++++++++--------
core/sql/regress/charsets/EXPECTED312 | 198 ++++++++++--------
core/sql/regress/charsets/EXPECTED313 | 286 ++++++++++++++------------
core/sql/regress/compGeneral/EXPECTED005 | 10 +-
core/sql/regress/compGeneral/EXPECTED042 | 8 +-
core/sql/regress/tools/runregr_udr.ksh | 6 +-
7 files changed, 384 insertions(+), 328 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ec8e779/core/sql/regress/charsets/EXPECTED002
----------------------------------------------------------------------
diff --git a/core/sql/regress/charsets/EXPECTED002 b/core/sql/regress/charsets/EXPECTED002
index c9c8173..18f1eed 100755
--- a/core/sql/regress/charsets/EXPECTED002
+++ b/core/sql/regress/charsets/EXPECTED002
@@ -108,7 +108,7 @@
>>create trigger t013t1 after insert on nt008
+> update nt008 set i = 7 where i = 9;
-*** ERROR[4222] The DDL feature is not supported in this software version.
+*** ERROR[3131] The statement just entered is currently not supported.
*** ERROR[8822] The statement was not prepared.
@@ -116,7 +116,7 @@
>>create trigger t013t2 after insert on nt008
+> update nt007 set d = _UCS2'qwer' where d = _UCS2'aaaa';
-*** ERROR[4222] The DDL feature is not supported in this software version.
+*** ERROR[3131] The statement just entered is currently not supported.
*** ERROR[8822] The statement was not prepared.
@@ -144,7 +144,7 @@
>>invoke t013;
-- Definition of Trafodion table TRAFODION.SCH.T013
--- Definition current Thu Feb 25 10:20:47 2016
+-- Definition current Sun Mar 20 15:28:28 2016
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ec8e779/core/sql/regress/charsets/EXPECTED310
----------------------------------------------------------------------
diff --git a/core/sql/regress/charsets/EXPECTED310 b/core/sql/regress/charsets/EXPECTED310
index 90eb60a..853faca 100644
--- a/core/sql/regress/charsets/EXPECTED310
+++ b/core/sql/regress/charsets/EXPECTED310
@@ -4905,7 +4905,10 @@ u1u1 u1u1
>>create TRIGGER TRG1_cs310t90 before UPDATE on cs310t90 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.UCS2_col2 = _ISO88591'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs310t90 values('Test1','Test1','Test1','Test1'), ('test111','test1111','test111','test1111');
@@ -4918,7 +4921,7 @@ u1u1 u1u1
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
+Test1 Test1 Test1 Iso1
test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -4931,7 +4934,7 @@ test111 test11
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
+Test1 Test1 Test1 Iso1
test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -4947,8 +4950,8 @@ test111 test11
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
test111 test1111 test111 test1111
test222 test2222 test222 test2222
@@ -4962,8 +4965,8 @@ test222 test22
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
test111 test1111 test111 test1111
test222 test2222 test222 test2222
@@ -4980,9 +4983,9 @@ test222 test22
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -4997,9 +5000,9 @@ test333 test33
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5008,11 +5011,17 @@ test333 test33
>>--
>>DROP TRIGGER TRG1_cs310t90;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>create TRIGGER TRG1_cs310t90 before UPDATE on cs310t90 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.ISO_col2 = _ucs2'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs310t90 values('Test4','Test4','Test4','Test4'), ('test444','test4444','test444','test4444');
@@ -5025,10 +5034,10 @@ test333 test33
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5044,10 +5053,10 @@ test444 test44
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5066,11 +5075,11 @@ test444 test44
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5087,11 +5096,11 @@ test555 test55
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5111,12 +5120,12 @@ test555 test55
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Iso6 Test6 Test6 abc
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Iso6 Test6 Test6 Test6
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5134,12 +5143,12 @@ test666 test66
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Iso6 Test6 Test6 abc
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Iso6 Test6 Test6 Test6
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5165,7 +5174,10 @@ test666 test66
>>create TRIGGER TRG1_cs310t91 before UPDATE on cs310t91 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.UCS2_col2 = _ISO88591'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs310t91 values(1,'Test1','Test1','Test1','Test1'), (2,'test111','test1111','test111','test1111');
@@ -5178,7 +5190,7 @@ test666 test66
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -5191,7 +5203,7 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -5207,9 +5219,9 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
--- 4 row(s) selected.
@@ -5222,9 +5234,9 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
--- 4 row(s) selected.
@@ -5240,11 +5252,11 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
--- 6 row(s) selected.
@@ -5257,22 +5269,28 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
--- 6 row(s) selected.
>>--
>>DROP TRIGGER TRG1_cs310t91;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>create TRIGGER TRG1_cs310t91 before UPDATE on cs310t91 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.ISO_col2 = _ucs2'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs310t91 values(7,'Test4','Test4','Test4','Test4'), (8,'test444','test4444','test444','test4444');
@@ -5285,13 +5303,13 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
--- 8 row(s) selected.
@@ -5304,13 +5322,13 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
--- 8 row(s) selected.
@@ -5326,15 +5344,15 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
--- 10 row(s) selected.
@@ -5347,15 +5365,15 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
--- 10 row(s) selected.
@@ -5371,17 +5389,17 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
- 11 Iso6 Test6 Test6 abc
+ 11 Iso6 Test6 Test6 Test6
12 test666 test6666 test666 test6666
--- 12 row(s) selected.
@@ -5394,17 +5412,17 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
- 11 Iso6 Test6 Test6 abc
+ 11 Iso6 Test6 Test6 Test6
12 test666 test6666 test666 test6666
--- 12 row(s) selected.
Merge [TRAFODION-1899] PR-391 Various fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4ba8d7d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4ba8d7d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4ba8d7d3 Branch: refs/heads/master Commit: 4ba8d7d3342d8295adaea4ee62164fa661be1d17 Parents: 741e52a 6ec8e77 Author: Anoop Sharma <an...@edev06.esgyn.local> Authored: Sun Mar 20 18:35:07 2016 +0000 Committer: Anoop Sharma <an...@edev06.esgyn.local> Committed: Sun Mar 20 18:35:07 2016 +0000 ---------------------------------------------------------------------- core/sql/bin/SqlciErrors.txt | 4 +- core/sql/exp/exp_conv.cpp | 1 + core/sql/exp/exp_datetime.cpp | 11 +- core/sql/exp/exp_datetime.h | 1 + core/sql/generator/GenPreCode.cpp | 5 +- core/sql/optimizer/SynthType.cpp | 14 +- core/sql/parser/sqlparser.y | 31 ++- core/sql/regress/charsets/EXPECTED002 | 6 +- core/sql/regress/charsets/EXPECTED310 | 198 +++++++++------- core/sql/regress/charsets/EXPECTED312 | 198 +++++++++------- core/sql/regress/charsets/EXPECTED313 | 286 ++++++++++++----------- core/sql/regress/compGeneral/EXPECTED005 | 10 +- core/sql/regress/compGeneral/EXPECTED006.SB | 17 +- core/sql/regress/compGeneral/EXPECTED042 | 8 +- core/sql/regress/seabase/EXPECTED030 | 49 ++++ core/sql/regress/seabase/EXPECTED031 | 214 +++++++++++++++++ core/sql/regress/seabase/TEST030 | 7 + core/sql/regress/seabase/TEST031 | 108 +++++++++ core/sql/regress/tools/runregr_udr.ksh | 6 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 63 ++++- 20 files changed, 887 insertions(+), 350 deletions(-) ----------------------------------------------------------------------
Merge remote branch 'origin/master' into ansharma_fixes_br Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/046863e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/046863e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/046863e4 Branch: refs/heads/master Commit: 046863e49c4a5ae39e755d67232dd952b004640d Parents: 7c7ca5f 741e52a Author: Cloud User <ce...@ansharma-2.novalocal> Authored: Fri Mar 18 15:28:29 2016 +0000 Committer: Cloud User <ce...@ansharma-2.novalocal> Committed: Fri Mar 18 15:28:29 2016 +0000 ---------------------------------------------------------------------- core/sqf/monitor/linux/cluster.cxx | 11 + core/sqf/monitor/linux/cmsh.cxx | 29 +- core/sqf/monitor/linux/internal.h | 9 + core/sqf/monitor/linux/makefile | 2 + core/sqf/monitor/linux/mlio.cxx | 6 +- core/sqf/monitor/linux/msgdef.h | 17 + core/sqf/monitor/linux/phnode.h | 2 + core/sqf/monitor/linux/pnode.cxx | 10 + core/sqf/monitor/linux/pnode.h | 1 + core/sqf/monitor/linux/pnodeconfig.cxx | 6 + core/sqf/monitor/linux/pnodeconfig.h | 2 +- core/sqf/monitor/linux/replicate.cxx | 56 +- core/sqf/monitor/linux/replicate.h | 14 + core/sqf/monitor/linux/reqnodename.cxx | 114 ++ core/sqf/monitor/linux/reqqueue.cxx | 60 +- core/sqf/monitor/linux/reqqueue.h | 32 +- core/sqf/monitor/linux/shell.cxx | 177 +- core/sqf/monitor/linux/testpoint.h | 2 +- core/sql/bin/SqlciErrors.txt | 3 +- core/sql/cli/Cli.cpp | 3 +- core/sql/comexe/ComQueue.h | 2 +- core/sql/comexe/ComTdb.h | 1 + core/sql/common/ComMisc.cpp | 13 + core/sql/common/ComMisc.h | 8 + core/sql/common/ComSmallDefs.h | 5 + core/sql/common/NAString.cpp | 23 + core/sql/common/NAString.h | 3 + core/sql/common/OperTypeEnum.h | 1 + core/sql/generator/Generator.cpp | 10 +- core/sql/optimizer/BindItemExpr.cpp | 16 +- core/sql/optimizer/NAFileSet.cpp | 2 + core/sql/optimizer/NAFileSet.h | 7 + core/sql/optimizer/NATable.cpp | 24 +- core/sql/optimizer/NATable.h | 3 +- core/sql/optimizer/RelExeUtil.cpp | 7 +- core/sql/parser/ElemDDLNode.cpp | 6 + core/sql/parser/ElemDDLNode.h | 3 + .../sql/parser/StmtDDLAlterTableAlterColumn.cpp | 39 +- core/sql/parser/StmtDDLAlterTableAlterColumn.h | 40 +- core/sql/parser/sqlparser.y | 19 +- core/sql/regress/charsets/DIFF012.KNOWN.SB | 2 +- core/sql/regress/charsets/EXPECTED002 | 9 +- core/sql/regress/charsets/EXPECTED003 | 11 +- core/sql/regress/charsets/EXPECTED012 | 19 +- .../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +- core/sql/regress/compGeneral/EXPECTED006.SB | 5 +- core/sql/regress/core/EXPECTED001.SB | 6 +- core/sql/regress/core/EXPECTED037.SB | 14 +- core/sql/regress/core/EXPECTED061.SB | 13 +- core/sql/regress/core/EXPECTED116 | 149 +- core/sql/regress/core/TEST116 | 11 +- core/sql/regress/executor/EXPECTED001 | 80 +- core/sql/regress/executor/EXPECTED013.SB | 59 +- core/sql/regress/executor/EXPECTED014.SB | 73 +- core/sql/regress/executor/EXPECTED016.SB | 10 +- core/sql/regress/executor/EXPECTED122 | 20 +- core/sql/regress/hive/EXPECTED009 | 7 + core/sql/regress/hive/EXPECTED017 | 3 + core/sql/regress/privs1/EXPECTED132 | 96 +- core/sql/regress/seabase/EXPECTED010 | 394 ++-- core/sql/regress/seabase/EXPECTED011 | 16 +- core/sql/regress/seabase/EXPECTED012 | 5 +- core/sql/regress/seabase/EXPECTED020 | 32 +- core/sql/regress/seabase/EXPECTED022 | 12 +- core/sql/regress/seabase/EXPECTED025 | 7 +- core/sql/regress/seabase/EXPECTED027 | 499 ++++- core/sql/regress/seabase/TEST020 | 8 +- core/sql/regress/seabase/TEST027 | 85 +- core/sql/sqlcat/desc.h | 1 + core/sql/sqlcomp/CmpDescribe.cpp | 30 +- core/sql/sqlcomp/CmpDescribe.h | 2 - core/sql/sqlcomp/CmpSeabaseDDL.h | 70 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 72 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1932 ++++++++++++------ core/sql/sqlcomp/DefaultConstants.h | 8 +- core/sql/sqlcomp/nadefaults.cpp | 28 +- 76 files changed, 3422 insertions(+), 1156 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/046863e4/core/sql/bin/SqlciErrors.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/046863e4/core/sql/parser/sqlparser.y ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/046863e4/core/sql/regress/compGeneral/EXPECTED006.SB ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/046863e4/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp ----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ec8e779/core/sql/regress/charsets/EXPECTED313
----------------------------------------------------------------------
diff --git a/core/sql/regress/charsets/EXPECTED313 b/core/sql/regress/charsets/EXPECTED313
index c9eecb5..521e3bc 100644
--- a/core/sql/regress/charsets/EXPECTED313
+++ b/core/sql/regress/charsets/EXPECTED313
@@ -628,28 +628,28 @@ u1u1 8
--- 4 row(s) selected.
>>select * from cs313t3 union (select * from cs313t4) order by 1;
-A1
-----------------
+A1
+----------------------------------------------------------------
-a1a1
-u1u1
-���
-???
+a1a1
+u1u1
+���
+???
--- 4 row(s) selected.
>>select * from cs313t3 union all (select * from cs313t4) order by 1;
-A1
-----------------
+A1
+----------------------------------------------------------------
-a1a1
-a1a1
-u1u1
-u1u1
-���
-���
-???
-???
+a1a1
+a1a1
+u1u1
+u1u1
+���
+���
+???
+???
--- 8 row(s) selected.
>>--
@@ -5092,28 +5092,28 @@ def def
--- 4 row(s) selected.
>>select * from cs313t70 union (select * from cs313t71) order by 1,2;
-A1 U1
----------------- ----------------
+A1 U1
+---------------------------------------------------------------- ----------------------------------------------------------------
-abc abc
-def def
-��� ���
-??? ???
+abc abc
+def def
+��� ���
+??? ???
--- 4 row(s) selected.
>>select * from cs313t70 union all (select * from cs313t71) order by 1,2;
-A1 U1
----------------- ----------------
+A1 U1
+---------------------------------------------------------------- ----------------------------------------------------------------
-abc abc
-abc abc
-def def
-def def
-��� ���
-��� ���
-??? ???
-??? ???
+abc abc
+abc abc
+def def
+def def
+��� ���
+��� ���
+??? ???
+??? ???
--- 8 row(s) selected.
>>--
@@ -5188,24 +5188,24 @@ def def def def
>>--
>>select * from cs313t70 union (select * from cs313t70 union (select * from cs313t71)) order by 1,2;
-A1 U1
----------------- ----------------
+A1 U1
+---------------------------------------------------------------- ----------------------------------------------------------------
-abc abc
-def def
-��� ���
-??? ???
+abc abc
+def def
+��� ���
+??? ???
--- 4 row(s) selected.
>>select * from cs313t70 union (select * from cs313t71 union (select * from cs313t70)) order by 1,2;
-A1 U1
----------------- ----------------
+A1 U1
+---------------------------------------------------------------- ----------------------------------------------------------------
-abc abc
-def def
-��� ���
-??? ???
+abc abc
+def def
+��� ���
+??? ???
--- 4 row(s) selected.
>>--
@@ -5724,7 +5724,10 @@ u1u1 u1u1
>>create TRIGGER TRG1_cs313t90 before UPDATE on cs313t90 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.UCS2_col2 = _UTF8'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs313t90 values('Test1','Test1','Test1','Test1'), ('test111','test1111','test111','test1111');
@@ -5737,7 +5740,7 @@ u1u1 u1u1
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
+Test1 Test1 Test1 Iso1
test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -5750,7 +5753,7 @@ test111 test11
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
+Test1 Test1 Test1 Iso1
test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -5766,8 +5769,8 @@ test111 test11
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
test111 test1111 test111 test1111
test222 test2222 test222 test2222
@@ -5781,8 +5784,8 @@ test222 test22
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
test111 test1111 test111 test1111
test222 test2222 test222 test2222
@@ -5799,9 +5802,9 @@ test222 test22
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5816,9 +5819,9 @@ test333 test33
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5827,11 +5830,17 @@ test333 test33
>>--
>>DROP TRIGGER TRG1_cs313t90;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>create TRIGGER TRG1_cs313t90 before UPDATE on cs313t90 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.ISO_col2 = _ucs2'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs313t90 values('Test4','Test4','Test4','Test4'), ('test444','test4444','test444','test4444');
@@ -5844,10 +5853,10 @@ test333 test33
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5863,10 +5872,10 @@ test444 test44
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5885,11 +5894,11 @@ test444 test44
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5906,11 +5915,11 @@ test555 test55
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5930,12 +5939,12 @@ test555 test55
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Iso6 Test6 Test6 abc
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Iso6 Test6 Test6 Test6
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5953,12 +5962,12 @@ test666 test66
UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Iso6 Test6 Test6 abc
-Test1 abc Test1 Iso1
-Test2 abc Test2 UCS2
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Iso6 Test6 Test6 Test6
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UCS2
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5984,7 +5993,10 @@ test666 test66
>>create TRIGGER TRG1_cs313t91 before UPDATE on cs313t91 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.UCS2_col2 = _UTF8'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs313t91 values(1,'Test1','Test1','Test1','Test1'), (2,'test111','test1111','test111','test1111');
@@ -5997,7 +6009,7 @@ test666 test66
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -6010,7 +6022,7 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -6026,9 +6038,9 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
--- 4 row(s) selected.
@@ -6041,9 +6053,9 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
--- 4 row(s) selected.
@@ -6059,11 +6071,11 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
--- 6 row(s) selected.
@@ -6076,22 +6088,28 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
--- 6 row(s) selected.
>>--
>>DROP TRIGGER TRG1_cs313t91;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>create TRIGGER TRG1_cs313t91 before UPDATE on cs313t91 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.ISO_col2 = _ucs2'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs313t91 values(7,'Test4','Test4','Test4','Test4'), (8,'test444','test4444','test444','test4444');
@@ -6104,13 +6122,13 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
--- 8 row(s) selected.
@@ -6123,13 +6141,13 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
--- 8 row(s) selected.
@@ -6145,15 +6163,15 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
--- 10 row(s) selected.
@@ -6166,15 +6184,15 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
--- 10 row(s) selected.
@@ -6190,17 +6208,17 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
- 11 Iso6 Test6 Test6 abc
+ 11 Iso6 Test6 Test6 Test6
12 test666 test6666 test666 test6666
--- 12 row(s) selected.
@@ -6213,17 +6231,17 @@ PRKY UCS2_COL1
PRKY UCS2_COL1 UCS2_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UCS2
+ 3 Test2 Test2 Test2 UCS2
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
- 11 Iso6 Test6 Test6 abc
+ 11 Iso6 Test6 Test6 Test6
12 test666 test6666 test666 test6666
--- 12 row(s) selected.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ec8e779/core/sql/regress/compGeneral/EXPECTED005
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED005 b/core/sql/regress/compGeneral/EXPECTED005
index f3a87e9..e9b12ce 100755
--- a/core/sql/regress/compGeneral/EXPECTED005
+++ b/core/sql/regress/compGeneral/EXPECTED005
@@ -1001,9 +1001,10 @@ DNO DNAME ENO DNO
+> select A.dno,B.eno
+> from t005t02 A full outer join t005t01 B on A.dno = B.dno;
-*** ERROR[12001] Creation failed. The materialized view cannot be maintained incrementally.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
---- SQL operation failed with errors.
>>
>>create materialized view T_MV1
+> Refresh on statement
@@ -1012,9 +1013,10 @@ DNO DNAME ENO DNO
+> select A.dno,B.eno
+> from t005t02 A full outer join t005t01 B on A.dno = B.dno;
-*** ERROR[12001] Creation failed. The materialized view cannot be maintained incrementally.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
---- SQL operation failed with errors.
>>
>>
>>?section cleanup
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ec8e779/core/sql/regress/compGeneral/EXPECTED042
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED042 b/core/sql/regress/compGeneral/EXPECTED042
index 74bb06b..55fb89e 100644
--- a/core/sql/regress/compGeneral/EXPECTED042
+++ b/core/sql/regress/compGeneral/EXPECTED042
@@ -2235,8 +2235,8 @@ NUM_HKEYS NUM_SKEYS NUM_MAX_VALUES_PER_KEY NUM_HASH_TABLE_BUCKETS
314 0 3 1
314 2 1 0
422 2 1 1
- 471 0 2 3
- 471 1 2 3
+ 487 0 2 3
+ 487 1 2 3
492 0 2 1
492 1 2 1
619 0 1 14
@@ -2329,8 +2329,8 @@ NUM_HKEYS NUM_SKEYS NUM_MAX_VALUES_PER_KEY NUM_HASH_TABLE_BUCKETS
314 0 3 1
314 2 1 0
422 2 1 1
- 471 0 2 3
- 471 1 2 3
+ 487 0 2 3
+ 487 1 2 3
492 0 2 1
492 1 2 1
619 0 1 14
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ec8e779/core/sql/regress/tools/runregr_udr.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_udr.ksh b/core/sql/regress/tools/runregr_udr.ksh
index 2906026..9fe4994 100755
--- a/core/sql/regress/tools/runregr_udr.ksh
+++ b/core/sql/regress/tools/runregr_udr.ksh
@@ -578,7 +578,7 @@ function DO_DIFF
if [ $OK -eq 0 ]; then
RESULT="### FAIL (missing files) ###"
printf "\n$RESULT\n"
- printf "$(date '+%m/%d/%Y %R') $T\t $RESULT\n" >> $rgrlog
+ printf "$(date '+%m/%d/%Y %R') $T $RESULT\n" >> $rgrlog
return
fi
@@ -709,7 +709,7 @@ function DO_DIFF
# printf "$RESULT\n"
# printf "$(date '+%m/%d/%Y %R') $T\t $RESULT\n" >> $rgrlog
modtime=`stat --printf=%y $LOG | cut -d'.' -f1`
- printf "$modtime $T\t $RESULT\n" >> $rgrlog
+ printf "$modtime $T $RESULT\n" >> $rgrlog
}
function DO_TEST
@@ -828,7 +828,7 @@ do
TEST_CAN_BE_RUN=0
RESULT="### FAIL (!! Test SKIPPED because NDCS SETUP is NOT RIGHT !! ) ###"
printf "\n$RESULT\n"
- printf "$(date '+%m/%d/%Y %R') $T\t $RESULT\n" >> $rgrlog
+ printf "$(date '+%m/%d/%Y %R') $T $RESULT\n" >> $rgrlog
break;
fi
done
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ec8e779/core/sql/regress/charsets/EXPECTED312
----------------------------------------------------------------------
diff --git a/core/sql/regress/charsets/EXPECTED312 b/core/sql/regress/charsets/EXPECTED312
index 29f1911..50ece35 100644
--- a/core/sql/regress/charsets/EXPECTED312
+++ b/core/sql/regress/charsets/EXPECTED312
@@ -5615,7 +5615,10 @@ u1u1 u1u1
>>create TRIGGER TRG1_cs312t90 before UPDATE on cs312t90 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.UTF8_col2 = _ISO88591'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs312t90 values('Test1','Test1','Test1','Test1'), ('test111','test1111','test111','test1111');
@@ -5628,7 +5631,7 @@ u1u1 u1u1
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
+Test1 Test1 Test1 Iso1
test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -5641,7 +5644,7 @@ test111 test1111 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
+Test1 Test1 Test1 Iso1
test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -5657,8 +5660,8 @@ test111 test1111 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
test111 test1111 test111 test1111
test222 test2222 test222 test2222
@@ -5672,8 +5675,8 @@ test222 test2222 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
test111 test1111 test111 test1111
test222 test2222 test222 test2222
@@ -5690,9 +5693,9 @@ test222 test2222 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5707,9 +5710,9 @@ test333 test3333 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5718,11 +5721,17 @@ test333 test3333 test
>>--
>>DROP TRIGGER TRG1_cs312t90;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>create TRIGGER TRG1_cs312t90 before UPDATE on cs312t90 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.ISO_col2 = _utf8'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs312t90 values('Test4','Test4','Test4','Test4'), ('test444','test4444','test444','test4444');
@@ -5735,10 +5744,10 @@ test333 test3333 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
-Test4 Test4 Iso4 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
+Test4 Test4 Iso4 Test4
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5754,10 +5763,10 @@ test444 test4444 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
-Test4 Test4 Iso4 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
+Test4 Test4 Iso4 Test4
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5776,11 +5785,11 @@ test444 test4444 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5797,11 +5806,11 @@ test555 test5555 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5821,12 +5830,12 @@ test555 test5555 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Iso6 Test6 Test6 abc
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Iso6 Test6 Test6 Test6
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5844,12 +5853,12 @@ test666 test6666 test
UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
-Iso3 abc Test3 Test3
-Iso6 Test6 Test6 abc
-Test1 abc Test1 Iso1
-Test2 abc Test2 UTF8
-Test4 Test4 Iso4 abc
-Test5 Test5 UCS5 abc
+Iso3 Test3 Test3 Test3
+Iso6 Test6 Test6 Test6
+Test1 Test1 Test1 Iso1
+Test2 Test2 Test2 UTF8
+Test4 Test4 Iso4 Test4
+Test5 Test5 UCS5 Test5
test111 test1111 test111 test1111
test222 test2222 test222 test2222
test333 test3333 test333 test3333
@@ -5875,7 +5884,10 @@ test666 test6666 test
>>create TRIGGER TRG1_cs312t91 before UPDATE on cs312t91 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.UTF8_col2 = _ISO88591'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs312t91 values(1,'Test1','Test1','Test1','Test1'), (2,'test111','test1111','test111','test1111');
@@ -5888,7 +5900,7 @@ test666 test6666 test
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -5901,7 +5913,7 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
--- 2 row(s) selected.
@@ -5917,9 +5929,9 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
--- 4 row(s) selected.
@@ -5932,9 +5944,9 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
--- 4 row(s) selected.
@@ -5950,11 +5962,11 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
--- 6 row(s) selected.
@@ -5967,22 +5979,28 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
--- 6 row(s) selected.
>>--
>>DROP TRIGGER TRG1_cs312t91;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>create TRIGGER TRG1_cs312t91 before UPDATE on cs312t91 REFERENCING NEW as TRG FOR EACH ROW
+> set TRG.ISO_col2 = _utf8'abc' ;
---- SQL operation complete.
+*** ERROR[3131] The statement just entered is currently not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
>>--
>>insert into cs312t91 values(7,'Test4','Test4','Test4','Test4'), (8,'test444','test4444','test444','test4444');
@@ -5995,13 +6013,13 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
--- 8 row(s) selected.
@@ -6014,13 +6032,13 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
--- 8 row(s) selected.
@@ -6036,15 +6054,15 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
--- 10 row(s) selected.
@@ -6057,15 +6075,15 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
--- 10 row(s) selected.
@@ -6081,17 +6099,17 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
- 11 Iso6 Test6 Test6 abc
+ 11 Iso6 Test6 Test6 Test6
12 test666 test6666 test666 test6666
--- 12 row(s) selected.
@@ -6104,17 +6122,17 @@ PRKY UTF8_COL1 UTF8_COL2
PRKY UTF8_COL1 UTF8_COL2 ISO_COL1 ISO_COL2
----------- ------------------------------------ ------------------------------------ ------------------------------------ ------------------------------------
- 1 Test1 abc Test1 Iso1
+ 1 Test1 Test1 Test1 Iso1
2 test111 test1111 test111 test1111
- 3 Test2 abc Test2 UTF8
+ 3 Test2 Test2 Test2 UTF8
4 test222 test2222 test222 test2222
- 5 Iso3 abc Test3 Test3
+ 5 Iso3 Test3 Test3 Test3
6 test333 test3333 test333 test3333
- 7 Test4 Test4 Iso4 abc
+ 7 Test4 Test4 Iso4 Test4
8 test444 test4444 test444 test4444
- 9 Test5 Test5 UCS5 abc
+ 9 Test5 Test5 UCS5 Test5
10 test555 test5555 test555 test5555
- 11 Iso6 Test6 Test6 abc
+ 11 Iso6 Test6 Test6 Test6
12 test666 test6666 test666 test6666
--- 12 row(s) selected.