Fix SQL generator's -cc option to be effective with Collection

Author: sekikn

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/sql/databricks/AspectModelDatabricksDenormalizedSqlVisitor.java

@@ -297,8 +297,11 @@ private String processComplexType( final ComplexType entity, final Context conte
 
          if ( type instanceof Scalar ) {
             final String typeDef = type.accept( this, context );
-            columns.append( column( columnPrefix, typeDef, property.isOptional(),
-                        Optional.ofNullable( property.getDescription( config.commentLanguage() ) ) ) )
+            final Optional<String> comment = config.includeColumnComments()
+                    ? Optional.ofNullable( Optional.ofNullable( context.forceDescriptionFromElement() ).orElse( property )
+                    .getDescription( config.commentLanguage() ) )
+                    : Optional.empty();
+            columns.append( column( columnPrefix, typeDef, property.isOptional(), comment) )
                   .append( lineDelimiter );
          } else if ( type instanceof ComplexType ) {
             columns.append( processComplexType( type.as( ComplexType.class ), context, columnPrefix, type.is( DefaultList.class ) ) );

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/sql/AspectModelSqlGeneratorTest.java

@@ -48,4 +48,26 @@ void testDatabricksGeneration( final TestAspect testAspect ) {
          assertThat( result ).doesNotContain( "ARRAY<ARRAY" );
       } ).doesNotThrowAnyException();
    }
+
+   @ParameterizedTest
+   @EnumSource( value = TestAspect.class )
+   void testDatabricksGenerationExcludeComments( final TestAspect testAspect ) {
+      final Aspect aspect = TestResources.load( testAspect ).aspect();
+      assertThatCode( () -> {
+         final DatabricksSqlGenerationConfig dialectSpecificConfig = DatabricksSqlGenerationConfigBuilder.builder()
+                 .includeTableComment( false )
+                 .includeColumnComments( false )
+                 .commentLanguage( Locale.ENGLISH )
+                 .build();
+         final SqlArtifact sqlArtifact = new AspectModelSqlGenerator( aspect, SqlGenerationConfigBuilder.builder()
+                 .dialect( SqlGenerationConfig.Dialect.DATABRICKS )
+                 .dialectSpecificConfig( dialectSpecificConfig )
+                 .build() ).singleResult();
+         final String result = sqlArtifact.getContent();
+
+         assertThat( result ).contains( "TBLPROPERTIES ('x-samm-aspect-model-urn'='" );
+         assertThat( result ).doesNotContain( "ARRAY<ARRAY" );
+         assertThat( result ).doesNotContain( "COMMENT" );
+      } ).doesNotThrowAnyException();
+   }
 }