8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:43:02 +01:00
This commit is contained in:
asfernandes 2010-08-10 15:20:20 +00:00
parent af264f378c
commit 4cb0195ee6
4 changed files with 7 additions and 7 deletions

View File

@ -4077,10 +4077,10 @@ void AlterDomainNode::execute(thread_db* tdbb, jrd_tra* transaction)
dsqlScratch->getBlrData());
}
if (nullFlag.specified)
if (notNullFlag.specified)
{
FLD.RDB$NULL_FLAG.NULL = FALSE;
FLD.RDB$NULL_FLAG = nullFlag.value ? 0 : 1;
FLD.RDB$NULL_FLAG = notNullFlag.value;
}
if (type)

View File

@ -748,7 +748,7 @@ public:
dsql_nod* setDefault;
Firebird::MetaName renameTo;
Firebird::AutoPtr<TypeClause> type;
Nullable<bool> nullFlag; // true = NULL / false = NOT NULL
Nullable<bool> notNullFlag; // true = NOT NULL / false = NULL
};
@ -911,7 +911,7 @@ public:
Firebird::MetaName fieldSource;
Firebird::MetaName identitySequence;
Nullable<USHORT> collationId;
Nullable<bool> notNullFlag;
Nullable<bool> notNullFlag; // true = NOT NULL / false = NULL
Nullable<USHORT> position;
Firebird::string defaultSource;
Firebird::ByteChunk defaultValue;

View File

@ -171,7 +171,7 @@ public:
dsql_nod* dsqlParameters;
NestConst<jrd_nod> messageExpr;
NestConst<jrd_nod> parameters;
PsqlException* exception;
NestConst<PsqlException> exception;
};

View File

@ -3126,9 +3126,9 @@ alter_domain_op($alterDomainNode)
| DROP CONSTRAINT
{ setClause($alterDomainNode->dropConstraint, "DOMAIN DROP CONSTRAINT"); }
| KW_NULL
{ setClause($alterDomainNode->nullFlag, "[NOT] NULL", true); }
{ setClause($alterDomainNode->notNullFlag, "[NOT] NULL", false); }
| NOT KW_NULL
{ setClause($alterDomainNode->nullFlag, "[NOT] NULL", false); }
{ setClause($alterDomainNode->notNullFlag, "[NOT] NULL", true); }
| TO symbol_column_name
{ setClause($alterDomainNode->renameTo, "DOMAIN NAME", toName($2)); }
| KW_TYPE init_data_type non_array_type