#626 reserved keywords update

CapsicoHealth · Aug 20, 2021 · fe85d70 · fe85d70
1 parent b32062b
commit fe85d70
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/tilda/parsing/parts/Base.java b/src/tilda/parsing/parts/Base.java
@@ -169,10 +169,12 @@ protected boolean Validate(ParserSession PS, Schema ParentSchema)
           PS.AddError("Schema '" + _ParentSchema.getFullName() + "' is declaring " + _TildaType.name() + " '" + getBaseName() + "' with a name that's too long: max allowed by your database is " + PS._CGSql.getMaxColumnNameSize() + " vs " + _Name.length() + " for this identifier.");
         if (_Name.equals(TextUtil.sanitizeName(_Name)) == false)
           PS.AddError("Schema '" + _ParentSchema.getFullName() + "' is declaring " + _TildaType.name() + " '" + getBaseName() + "' with a name containing invalid characters (must all be alphanumeric or underscore).");
+
         if (ValidationHelper.isValidIdentifier(_Name) == false)
           PS.AddError("Schema '" + _ParentSchema.getFullName() + "' is declaring " + _TildaType.name() + " '" + getBaseName() + "' with a name '" + _Name + "' which is not valid. " + ValidationHelper._ValidIdentifierMessage);
         if (ValidationHelper.isReservedIdentifier(_Name) == true)
           PS.AddError("Schema '" + _ParentSchema.getFullName() + "' is declaring " + _TildaType.name() + " '" + getBaseName() + "' with a name '" + _Name + "' which is a reserved identifier.");
+
         if (TextUtil.isNullOrEmpty(_Description) == true)
           PS.AddError("Schema '" + _ParentSchema.getFullName() + "' is declaring " + _TildaType.name() + " '" + getBaseName() + "' without a description.");
 

diff --git a/src/tilda/parsing/parts/Column.java b/src/tilda/parsing/parts/Column.java
@@ -214,12 +214,16 @@ private void ValidateBase(ParserSession PS, Object ParentObject)
             PS.AddError("Column '" + getFullName() + "' didn't define a 'name'. It is mandatory.");
             return;
           }
+
         if (N.length() > PS._CGSql.getMaxColumnNameSize())
           PS.AddError("Column '" + getFullName() + "' has a name that's too long: max allowed by your database is " + PS._CGSql.getMaxColumnNameSize() + " vs " + N.length() + " for this identifier.");
 
         if (ValidationHelper.isValidIdentifier(N) == false)
           PS.AddError("Column '" + getFullName() + "' has a name '" + N + "' which is not valid. " + ValidationHelper._ValidIdentifierMessage);
 
+        if (ValidationHelper.isReservedIdentifier(_Name) == true)
+          PS.AddError("Column '" + getFullName() + "' has a name '" + N + "' which is a reserved identifier.");
+
         if (ValidateSameAs(PS) == false)
           return;
 

diff --git a/src/tilda/parsing/parts/ViewColumn.java b/src/tilda/parsing/parts/ViewColumn.java
@@ -189,13 +189,15 @@ else if (_FCT != FrameworkColumnType.TS)
           {
             _Name = _SameAsObj.getName();
           }
-
+        
         if (_Name.length() > PS._CGSql.getMaxColumnNameSize())
           PS.AddError("View Column '" + getFullName() + "' has a name that's too long: max allowed by your database is " + PS._CGSql.getMaxColumnNameSize() + " vs " + _Name.length() + " for this identifier.");
         if (_Name.equals(TextUtil.sanitizeName(_Name)) == false)
           PS.AddError("View Column '" + getFullName() + "' has a name containing invalid characters (must all be alphanumeric or underscore).");
         if (ValidationHelper.isValidIdentifier(_Name) == false)
           PS.AddError("View Column '" + getFullName() + "' has a name '" + _Name + "' which is not valid. " + ValidationHelper._ValidIdentifierMessage);
+        if (ValidationHelper.isReservedIdentifier(_Name) == true)
+          PS.AddError("View Column '" + getFullName() + "' has a name '" + _Name + "' which is a reserved identifier.");
 
 
         if (_JoinStr != null)

diff --git a/src/tilda/parsing/parts/helpers/ValidationHelper.java b/src/tilda/parsing/parts/helpers/ValidationHelper.java
@@ -81,12 +81,13 @@ public static boolean isValidIdentifier(String Name)
         for (int i = 1; i < chars.length; ++i)
           if (Character.isJavaIdentifierPart(chars[i]) == false)
             return false;
+
         return true;
       }
 
     public static boolean isReservedIdentifier(String name)
       {
-        if (name.equalsIgnoreCase("class") == true)
+        if (name != null && name.equalsIgnoreCase("class") == true)
           return true;
 
         return false;