code changes for v.2024-10 (#124)

* code changes for v.2024-09

* code changes for v.2024-09

* changing version to 2024-10

* add additional @@error codes supported

* code changes

* code changes

Author: robverschoor

BabelfishCompassUser.Optimistic.cfg

@@ -217,7 +217,7 @@ default_classification-Ignored=SET LOCK_ESCALATION
 
 
 [Partitioning]
-default_classification=Ignored
+
 
 [FOR REPLICATION]
 

BabelfishCompass_UserGuide.docx

@@ -15,10 +15,10 @@
 # this must always be the first section:
 [Babelfish for T-SQL]
 # only Babelfish version numbers listed here can be referenced the rules below:
-valid_versions=1.0.0, 1.1.0, 1.2.0, 1.3.0, 1.4.0, 1.5.0, 1.6.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0, 3.1.0, 3.2.0, 3.3.0, 3.4.0, 3.5.0, 4.0.0, 4.1.0, 4.2.0
+valid_versions=1.0.0, 1.1.0, 1.2.0, 1.3.0, 1.4.0, 1.5.0, 1.6.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0, 3.1.0, 3.2.0, 3.3.0, 3.4.0, 3.5.0, 4.0.0, 4.1.0, 4.2.0, 4.3.0
 # x.y.1/2/3 etc are bugfix releases for x.y.0 (no new T-SQL features supported), and are typically based on a newer PG release
 file_format=2                           # version number for format of this .cfg file. This is not expected to change much 
-file_timestamp=Jul-2024                 # identifies the version of this file, together with the latest Babelfish version supported
+file_timestamp=Oct-2024                 # identifies the version of this file, together with the latest Babelfish version supported
                                         # format: dd-MON-yyyy or MON-yyyy                                                                                                                                                                                                                   
 
 # Basic principle: 
@@ -126,7 +126,8 @@ supported-1.2.0=201,206,2733,8144,8145,8146
 supported-2.1.0=213
 supported-2.2.0=911
 supported-3.3.0=15003
-supported-3.4.0=330,6615
+supported-3.4.0=330,535,6615,9810
+supported-4.0.0=13600
 report_group=@@ERROR codes
 
 [Regular variable named @@v]
@@ -137,7 +138,7 @@ complexity_score=LOW
 
 [Datatypes]
 rule=id
-list=HIERARCHYID,GEOGRAPHY,GEOMETRY,TIMESTAMP,ROWVERSION,CURSOR,XML,XML(xmlschema),CHARACTER VARYING,NATIONAL CHARACTER,NATIONAL CHARACTER VARYING,NCHARACTER,NCHARACTER VARYING,XML COLUMN_SET FOR ALL_SPARSE_COLUMNS
+list=HIERARCHYID,GEOGRAPHY,GEOMETRY,TIMESTAMP,ROWVERSION,CURSOR,XML,XML(xmlschema),CHARACTER VARYING,NATIONAL CHARACTER,NATIONAL CHARACTER VARYING,NCHARACTER,NCHARACTER VARYING,XML COLUMN_SET FOR ALL_SPARSE_COLUMNS,EXTERNAL NAME
 # all other datatypes (not mentioned here) are supported
 supported-1.0.0=XML,CURSOR
 supported-1.2.0=TIMESTAMP,ROWVERSION
@@ -220,6 +221,7 @@ complexity_score=HIGH
 rule=function_call
 supported-3.5.0-3.*=STX,STY,LAT,LONG,STASTEXT,STASBINARY,STDISTANCE,STPOINTFROMTEXT,STGEOMFROMTEXT,POINT
 supported-4.1.0=STX,STY,LAT,LONG,STASTEXT,STASBINARY,STDISTANCE,STPOINTFROMTEXT,STGEOMFROMTEXT,POINT
+supported-4.3.0=STCONTAINS,STEQUALS,STAREA
 report_group=Geospatial
 complexity_score=HIGH
 
@@ -261,8 +263,7 @@ supported-3.1.0=OPENQUERY
 supported-3.2.0=CONTEXT_INFO,ROWCOUNT_BIG,DATABASE_PRINCIPAL_ID,TIMEFROMPARTS,DATETIME2FROMPARTS
 supported-3.3.0=PARSENAME,EOMONTH,HOST_ID,SMALLDATETIMEFROMPARTS
 supported-3.4.0=SWITCHOFFSET,TODATETIMEOFFSET,COL_NAME,COL_LENGTH,DATETRUNC,IDENTITY,TYPE_ID,TYPE_NAME
-reviewmanually-3.5.0-3.*=CONTAINS
-reviewmanually-4.0.0=CONTAINS
+reviewmanually-3.5.0=CONTAINS
 default_classification-ReviewSemantics=NEWSEQUENTIALID
 report_group-Filestream=FILETABLEROOTPATH,GETFILENAMESPACEPATH,GETPATHLOCATOR,PATHNAME
 report_group-Fulltext Search=CONTAINS,CONTAINSTABLE,FREETEXT,FREETEXTTABLE,SEMANTICKEYPHRASETABLE,SEMANTICSIMILARITYDETAILSTABLE,SEMANTICSIMILARITYTABLE,FULLTEXTCATALOGPROPERTY,FULLTEXTSERVICEPROPERTY
@@ -320,6 +321,7 @@ report_group=Built-in functions
 
 [STRING_AGG() WITHIN GROUP]
 rule=function_call
+supported-4.3.0=*
 report_group=Built-in functions
 
 [FORMAT() culture]
@@ -449,8 +451,8 @@ complexity_score=HIGH
 
 [Index options]
 rule=index_option
-list=FILLFACTOR,ALLOW_PAGE_LOCKS,ALLOW_ROW_LOCKS,PAD_INDEX,STATISTICS_NORECOMPUTE,OPTIMIZE_FOR_SEQUENTIAL_KEY,SORT_IN_TEMPDB,DROP_EXISTING,ONLINE,COMPRESSION_DELAY,MAXDOP,DATA_COMPRESSION,BUCKET_COUNT,SORTED_DATA,RESUMABLE,MAX_DURATION,XML_COMPRESSION
-default_classification=Ignored
+list=FILLFACTOR,ALLOW_PAGE_LOCKS,ALLOW_ROW_LOCKS,PAD_INDEX,STATISTICS_NORECOMPUTE,OPTIMIZE_FOR_SEQUENTIAL_KEY,SORT_IN_TEMPDB,DROP_EXISTING,ONLINE,COMPRESSION_DELAY,MAXDOP,DATA_COMPRESSION,BUCKET_COUNT,SORTED_DATA,RESUMABLE,MAX_DURATION,XML_COMPRESSION,ALLOW_DUP_ROW,IGNORE_DUP_ROW
+default_classification-Ignored=FILLFACTOR,ALLOW_PAGE_LOCKS,ALLOW_ROW_LOCKS,PAD_INDEX,STATISTICS_NORECOMPUTE,OPTIMIZE_FOR_SEQUENTIAL_KEY,SORT_IN_TEMPDB,DROP_EXISTING,ONLINE,COMPRESSION_DELAY,MAXDOP,DATA_COMPRESSION,BUCKET_COUNT,SORTED_DATA,RESUMABLE,MAX_DURATION,XML_COMPRESSION
 report_group=DDL
 
 [Index attribute]
@@ -473,7 +475,8 @@ default_classification=ReviewSemantics
 
 [Partitioning]
 rule=create_table,alter_table,create_index,alter_index,truncate_table
-list=CREATE TABLE,ALTER TABLE SWITCH,ALTER TABLE REBUILD,ALTER TABLE SPLIT,ALTER TABLE MERGE,ALTER INDEX REBUILD,CREATE INDEX,TRUNCATE TABLE,$PARTITION,CREATE PARTITION SCHEME,ALTER PARTITION SCHEME,CREATE PARTITION FUNCTION,ALTER PARTITION FUNCTION,DROP PARTITION SCHEME,DROP PARTITION SCHEME
+list=CREATE TABLE,ALTER TABLE SWITCH,ALTER TABLE REBUILD,ALTER TABLE SPLIT,ALTER TABLE MERGE,ALTER INDEX REBUILD,CREATE INDEX,TRUNCATE TABLE,$PARTITION,CREATE PARTITION SCHEME,ALTER PARTITION SCHEME,CREATE PARTITION FUNCTION RANGE LEFT,CREATE PARTITION FUNCTION RANGE RIGHT,ALTER PARTITION FUNCTION,DROP PARTITION FUNCTION,DROP PARTITION SCHEME,SQL_VARIANT
+supported-4.3.0=CREATE PARTITION FUNCTION RANGE RIGHT,CREATE PARTITION SCHEME,DROP PARTITION FUNCTION,DROP PARTITION SCHEME,$PARTITION,CREATE TABLE,CREATE INDEX
 report_group=DDL
 complexity_score=HIGH
 
@@ -632,8 +635,7 @@ complexity_score=HIGH
 rule=create_or_alter_dml_trigger
 list=TABLE,VIEW
 supported-1.2.0=TABLE
-supported-3.5.0-3.*=VIEW
-supported-4.0.0=VIEW
+supported-3.5.0=VIEW
 report_group=Triggers
 complexity_score=HIGH
 
@@ -676,6 +678,7 @@ rule=create_or_alter_procedure
 list=EXTERNAL,ATOMIC NATIVELY COMPILED,ENCRYPTION,RECOMPILE,SCHEMABINDING,WITHOUT SCHEMABINDING,EXECUTE AS OWNER,EXECUTE AS CALLER,EXECUTE AS SELF,EXECUTE AS USER
 supported-1.0.0=WITHOUT SCHEMABINDING
 supported-2.4.0=EXECUTE AS CALLER
+supported-4.3.0=RECOMPILE
 default_classification-ReviewSemantics=EXECUTE AS OWNER,EXECUTE AS CALLER
 default_classification-ReviewPerformance=RECOMPILE
 report_group=Procedures
@@ -685,7 +688,8 @@ complexity_score-LOW=RECOMPILE
 [Execute procedure options]
 rule=execute_body
 list=RECOMPILE,RESULT SETS,RESULT SETS NONE,RESULT SETS UNDEFINED
-supported-1.0.0=RESULT SETS,RESULT SETS NONE,RESULT SETS UNDEFINED
+ignored-1.0.0=RESULT SETS,RESULT SETS NONE,RESULT SETS UNDEFINED
+supported-4.3.0=RECOMPILE
 default_classification-ReviewPerformance=RECOMPILE
 complexity_score-LOW=RECOMPILE
 report_group=Procedures
@@ -772,9 +776,11 @@ report_group=Procedures
 
 [CREATE DATABASE options]
 rule=create_database
-list=COLLATE,CATALOG_COLLATION,CATALOG_COLLATION DATABASE_DEFAULT,ALLOW_SNAPSHOT_ISOLATION,ANSI_NULLS,ANSI_NULL_DEFAULT,ANSI_PADDING,ANSI_WARNINGS,ARITHABORT,AUTO_CLOSE,AUTO_SHRINK,AUTO_UPDATE_STATISTICS,AUTO_UPDATE_STATISTICS_ASYNC,DB_CHAINING,COMPATIBILITY_LEVEL,CONCAT_NULL_YIELDS_NULL,CONTAINMENT=PARTIAL,CONTAINMENT=NONE,CURSOR_CLOSE_ON_COMMIT,CURSOR_DEFAULT,DATE_CORRELATION_OPTIMIZATION,DELAYED_DURABILITY,DISABLE_BROKER,FILESTREAM,HONOR_BROKER_PRIORITY,MULTI_USER,NUMERIC_ROUNDABORT,PAGE_VERIFY,PARAMETERIZATION,QUERY_STORE,QUOTED_IDENTIFIER,READ_COMMITTED_SNAPSHOT,RECOVERY,RECURSIVE_TRIGGERS,TARGET_RECOVERY_TIME,TRUSTWORTHY
+list=COLLATE,COLLATE SQL_LATIN1_GENERAL_CP1_CI_AS,COLLATE ANY,CATALOG_COLLATION,CATALOG_COLLATION DATABASE_DEFAULT,ALLOW_SNAPSHOT_ISOLATION,ANSI_NULLS,ANSI_NULL_DEFAULT,ANSI_PADDING,ANSI_WARNINGS,ARITHABORT,AUTO_CLOSE,AUTO_SHRINK,AUTO_UPDATE_STATISTICS,AUTO_UPDATE_STATISTICS_ASYNC,DB_CHAINING,COMPATIBILITY_LEVEL,CONCAT_NULL_YIELDS_NULL,CONTAINMENT=PARTIAL,CONTAINMENT=NONE,CURSOR_CLOSE_ON_COMMIT,CURSOR_DEFAULT,DATE_CORRELATION_OPTIMIZATION,DELAYED_DURABILITY,DISABLE_BROKER,FILESTREAM,HONOR_BROKER_PRIORITY,MULTI_USER,NUMERIC_ROUNDABORT,PAGE_VERIFY,PARAMETERIZATION,QUERY_STORE,QUOTED_IDENTIFIER,READ_COMMITTED_SNAPSHOT,RECOVERY,RECURSIVE_TRIGGERS,TARGET_RECOVERY_TIME,TRUSTWORTHY
 supported-1.0.0=CONTAINMENT=NONE
-ignored-2.4.0=COLLATE,CATALOG_COLLATION DATABASE_DEFAULT
+ignored-2.4.0=CATALOG_COLLATION DATABASE_DEFAULT
+ignored-2.4.0=COLLATE
+supported-3.1.0=COLLATE SQL_LATIN1_GENERAL_CP1_CI_AS
 report_group=Databases
 
 [ALTER DATABASE]
@@ -1045,6 +1051,8 @@ supported-3.3.0=extended_properties
 supported-3.4.0=database_permissions,server_role_members
 supported-3.5.0-3.*=availability_groups,availability_replicas
 supported-4.1.0=availability_groups,availability_replicas
+supported-4.2.0=login_token,user_token
+supported-4.3.0=sequences,partition_functions,partition_schemes,partition_parameters,partition_range_values,destination_data_spaces
 
 [INFORMATION_SCHEMA]
 rule=full_object_name
@@ -1567,8 +1575,7 @@ list=SEQUENCE,SYNONYM,QUEUE,ASSEMBLY,AGGREGATE,APPLICATION ROLE,ASYMMETRIC KEY,C
 supported-1.0.0=SEQUENCE,LOGIN
 supported-1.2.0=USER
 supported-2.1.0=ROLE
-supported-3.5.0-3.*=FULLTEXT INDEX
-supported-4.0.0=FULLTEXT INDEX
+supported-3.5.0=FULLTEXT INDEX
 report_group-DDL=SEQUENCE,SYNONYM,DEFAULT,RULE
 report_group-Users=LOGIN,SERVER ROLE,ROLE
 report_group-Fulltext Search=FULLTEXT CATALOG,FULLTEXT INDEX,FULLTEXT STOPLIST
@@ -1634,14 +1641,13 @@ default_classification=ReviewManually
 [FULLTEXT INDEX]
 rule=ddl_statement
 list=CREATE,DROP,ALTER
-supported-3.5.0-3.*=CREATE,DROP
-supported-4.0.0=CREATE,DROP
+supported-3.5.0=CREATE,DROP
 
 [FULLTEXT CONTAINS]
 rule=function_call
 list=FORMSOF,ISABOUT,NEAR,INFLECTIONAL,THESAURUS
 complexity_score=HIGH
 
 #-----------------------------------------------------------------------------------
-#file checksum=1dc5386f
+#file checksum=641eb587
 #--- end ---------------------------------------------------------------------------

BabelfishCompass_UserGuide.pdf

@@ -1,3 +1,6 @@
+# 2024-10
+- Added support for Babelfish v.4.3.0.
+- Various small fixes.
 
 # 2024-07
 - Added support for Babelfish v.4.2.0.

BabelfishFeatures.cfg

@@ -1863,8 +1863,13 @@ private static boolean optionsValid() throws Exception {
 				return false;					
 			}			
 			if (u.rewrite) {
-				u.appOutput("Cannot specify -rewrite when not performing analysis"+noInputFilesMsg);
-				return false;				
+				if (optimisticFlag) {
+					// -rewrite is implied by -optimistic , which can also be used with non-analysis cases so no need to warn 
+				}
+				else {
+					// -rewrite only applies to analysis, but it's harmless when specified otherwise
+					u.appOutput("Ignoring -rewrite when not performing analysis"+noInputFilesMsg);
+				}			
 			}			
 		}
 

CHANGELOG.md

@@ -3052,6 +3052,15 @@ else if (chk1.endsWith("FORXMLPATH(''),TYPE)") && !chk2.isEmpty()) {
 											if (chk2.contains(".VALUE")) xType = ", with .VALUE()";
 										}
 									}
+									
+									// do not try to rewrite a case 'SELECT *', instead of 'SELECT column'
+									if (selectListElem == 1) {
+										String col = ctx.select_statement().query_expression().query_specification().select_list().select_list_elem().get(0).getText();
+										if (col.startsWith("*")) {
+											isOK = false;											
+										}
+									}
+									
 									//u.appOutput(u.thisProc()+"f ("+(u.lineNrInFile + ctx.start.getLine() - 1)+")=["+getTextSpaced(f)+"] selectListElem=["+selectListElem+"] ");
 									if (isOK) {
 										String xStatus = u.NotSupported;
@@ -3335,9 +3344,7 @@ private void captureAtAtErrorValue(Integer exprInt, String via, String op, int l
 				String usrDefined = "";
 				if (exprInt >= 50000) {
 					usrDefined = " (user-defined)";
-					if (!via.isEmpty()) {
-						status = u.Supported;
-					}
+					status = u.Supported;
 				}
 				captureItem(AtAtErrorValueRef+ " " +String.format("%6d",exprInt)+usrDefined+via, via, AtAtErrorValueRef, exprInt.toString(), status, lineNr);
 			}
@@ -3632,7 +3639,12 @@ else if (hasParent(ctx.parent,"func_body_returns_select")) {
 				String UDDdatatype = "";
 				String section = UDDatatypes;
 				String statusDataType = u.Supported;
-				if (ctx.FROM() != null) {
+				if (ctx.external_type() != null) {
+					// EXTERNAL NAME
+					statusDataType = featureSupportedInVersion(Datatypes, "EXTERNAL NAME");
+					UDDdatatype = "EXTERNAL NAME";
+				}
+				else if (ctx.FROM() != null) {
 					// scalar UDD
 					UDDdatatype = u.normalizeName(ctx.data_type().getText().toUpperCase(), "datatype");
 					if (featureExists(Datatypes, getBaseDataType(UDDdatatype))) {
@@ -6900,12 +6912,14 @@ else if (inCommaJoin) {
 							break;
 						}
 						String quote = u.getPatternGroup(a, "(['\"])", 1);
-						a = u.stripStringQuotes(a);
+						a = u.stripStringQuotes(a);						
 						a = u.applyPatternAll(a, quote+quote, quote);
 						stringArg += a;
-					}
-					if (u.debugging) u.dbgOutput("capturing dynamic SQL query: EXECUTE(): stringArgFound=["+stringArgFound+"]  stringArg=["+stringArg+"] ", u.debugDynamicSQL);
-					if (stringArgFound && (!stringArg.trim().isEmpty())) {
+					}			
+					// Don't process exec-imm strings that have '?' placeholders -- test can be improved by first removing any strings, but this is less obvious than it looks
+					String hasPlaceholder = u.getPatternGroup(stringArg, "(\\?)", 1);						
+					if (u.debugging) u.dbgOutput("capturing dynamic SQL query: EXECUTE(): stringArgFound=["+stringArgFound+"]  stringArg=["+stringArg+"] hasPlaceholder=["+hasPlaceholder+"] ", u.debugDynamicSQL);					
+					if (stringArgFound && (!stringArg.trim().isEmpty()) && (hasPlaceholder.isEmpty())) {
 						u.dynamicSQLBuffer.add(u.dynamicSQLBatchLine+arg.get(0).start.getLine()+","+u.batchNrInFile+","+u.lineNrInFile+","+(u.currentObjectType + " " + u.currentObjectName).trim()+",EXECUTE()");
 						u.dynamicSQLBuffer.add(stringArg);
 						u.dynamicSQLBuffer.add("go");
@@ -7909,7 +7923,7 @@ else if (hasParent(ctx.parent,"column_definition")) {
 				}
 				else if (hasParent(ctx.parent,"create_database")) {
 					context = "in CREATE DATABASE";
-					contextCS = "DATABASE";
+					contextCS = "DATABASE";	
 				}
 				else if (hasParent(ctx.parent,"alter_database")) {
 					context = "in ALTER DATABASE";
@@ -7927,7 +7941,48 @@ else if (hasParent(ctx.parent,"alter_database")) {
 						}
 					}
 				}
-				captureItem(CSmsg+collationName+", "+context, columnName, Collations, "", status, ctx.COLLATE().getSymbol().getLine());
+				
+				String msg = CSmsg+collationName+", "+context;
+				
+				if (hasParent(ctx.parent,"create_database")) {
+					// Sort out the status of COLLATE - this is a bit messy due to how support in Babelfish developed over time
+					//u.appOutput(u.thisProc()+"collationName=["+collationName+"]");
+					
+					String statusCrdb = featureSupportedInVersion(CreateDatabaseOptions, "COLLATE");
+					String statusCrdbV24 = "";
+					if (statusCrdb.equals(u.NotSupported)) {
+						msg = "CREATE DATABASE...COLLATE";
+						status = statusCrdb;						
+					}			
+					else {
+						status = statusCrdbV24 = statusCrdb;  // CREATE DATABASE...COLLATE is IGNORED
+						
+						statusCrdb= featureSupportedInVersion(CreateDatabaseOptions, "COLLATE ANY");
+						if (statusCrdb.equals(u.Supported)) {
+							msg = CSmsg+collationName+", "+context;
+							status = statusCrdb;							
+						}
+						else {
+							statusCrdb = featureSupportedInVersion(CreateDatabaseOptions, "COLLATE " + collationName);
+							String statusv31 = featureSupportedInVersion(CreateDatabaseOptions,"COLLATE SQL_LATIN1_GENERAL_CP1_CI_AS");							
+							if (statusCrdb.equals(u.Supported)) {
+								msg = CSmsg+collationName+", "+context;
+								status = statusCrdb;							
+							}	
+							else {
+								if (statusv31.equals(u.Supported)) {
+									status = u.NotSupported;
+								}
+								else {
+									status = statusCrdbV24;
+								}
+							}								
+						} 						
+															
+					}
+				}
+				
+				captureItem(msg, columnName, Collations, "", status, ctx.COLLATE().getSymbol().getLine());
 				visitChildren(ctx);
 				if (u.debugging) dbgTraceVisitExit(CompassUtilities.thisProc());
 				return null;
@@ -7956,6 +8011,7 @@ else if (hasParent(ctx.parent,"alter_database")) {
 							}
 						}
 					}
+			
 					if (status.equals(u.uninitialized) && !captured) {
 						status = featureSupportedInVersion(CreateDatabaseOptions,optionChk);
 					}
@@ -9261,15 +9317,34 @@ public Integer rewriteMerge(TSQLParser.Merge_statementContext ctx) {
 			}
 
 			private void capturePartitioning(String stmt, String tableName, int lineNr) {
+				capturePartitioning(stmt, stmt, tableName, lineNr, "");
+			}
+			private void capturePartitioning(String stmt, String stmtFmt, String tableName, int lineNr) {
+				capturePartitioning(stmt, stmtFmt, tableName, lineNr, "");
+			}
+			
+			private void capturePartitioning(String stmt, String stmtFmt, String tableName, int lineNr, String dataType) {
 				String status = featureSupportedInVersion(Partitioning,stmt);
-				String fmt = "Partitioning, "+stmt;
-				if (stmt.startsWith("CREATE PARTITION") || stmt.startsWith("ALTER PARTITION") || stmt.startsWith("DROP PARTITION")) fmt = stmt;
+				String fmt = "Partitioning, "+stmtFmt;
+				if (stmt.startsWith("CREATE PARTITION") || stmt.startsWith("ALTER PARTITION") || stmt.startsWith("DROP PARTITION")) fmt = stmtFmt;
 				else if (stmt.equals("$PARTITION")) fmt = "$PARTITION.function()";
 				else if (stmt.endsWith("SPLIT")) fmt = "ALTER TABLE..SPLIT partition";
 				else if (stmt.endsWith("MERGE")) fmt = "ALTER TABLE..MERGE partition";
 				else if (stmt.endsWith("SWITCH")) fmt = "ALTER TABLE..SWITCH partition";
 				else if (stmt.endsWith("TABLE REBUILD")) fmt = "ALTER TABLE..REBUILD partition";
 				else if (stmt.endsWith("INDEX REBUILD")) fmt = "ALTER INDEX..REBUILD partition";
+				
+				if (status.equals(u.Supported)) {
+					if (stmt.startsWith("CREATE PARTITION FUNCTION")) {
+						if (dataType.equalsIgnoreCase("SQL_VARIANT")) {
+							String statusSV = featureSupportedInVersion(Partitioning,"SQL_VARIANT");
+							if (! statusSV.equals(u.Supported)) {
+								status = statusSV;
+								fmt = "CREATE PARTITION FUNCTION, on SQL_VARIANT datatype";
+							}
+						}					
+					}
+				}
 				captureItem(fmt, tableName, Partitioning, stmt, status, lineNr);
 			}
 
@@ -9299,9 +9374,9 @@ private void capturePartitioning(String stmt, String tableName, int lineNr) {
 				if (ctx.expression_list() != null) {  // should never be null, but seen it been empty in customer scripts
 					nrPfValues = argListCount(ctx.expression_list());
 				}
-				String pfValues = ", for " + nrPfValues + " " + dt + " values";
+				String pfValues = ", for " + nrPfValues + " " + dt + " values";				
 
-				capturePartitioning("CREATE PARTITION FUNCTION, RANGE "+rl+pfValues, u.normalizeName(ctx.partition_function_name.getText()), ctx.start.getLine());
+				capturePartitioning("CREATE PARTITION FUNCTION RANGE "+rl, "CREATE PARTITION FUNCTION, RANGE "+rl+pfValues, u.normalizeName(ctx.partition_function_name.getText()), ctx.start.getLine(), dt);
 				visitChildren(ctx);	return null;
 			}