Skip to content

Support for Babelfish v.5.2.0 (17.5) and v.4.6.0 (16.9) #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
R4hul04 merged 6 commits into from
Jun 3, 2025
Merged

Support for Babelfish v.5.2.0 (17.5) and v.4.6.0 (16.9) #145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
17b9c3e
Support for Babelfish v.5.2.0 (17.5) and v.4.6.0 (16.9)
manisha-deshpande May 7, 2025
1bd331a
Fixed pr comment
manisha-deshpande May 16, 2025
bce02db
Added support for Geospatial functions
manisha-deshpande May 20, 2025
1cc09ee
Added support for Alter-view with limitation of dependent trigger
May 21, 2025
f4e364c
Added list item for Alter View in .cfg file to handle unsupported case
May 27, 2025
9346567
Update maven.yml
R4hul04 May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/main/java/compass/CompassAnalyze.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ else if (CompassUtilities.grammarRuleNames[ruleIxParent].equals(parentRuleName))
return findParent(parent.parent, parentRuleName);
}

// covnert a section of a parse tree to text
// convert a section of a parse tree to text
public String parseTreeToString(RuleContext ctx) {
String treeString = "";
TSQLParser parser = new TSQLParser(null);
Expand Down Expand Up @@ -767,6 +767,27 @@ private String lookupProc(String name) {
return resultType;
}

// is there a trigger on this view? this can only be an INSTEAD-OF trigger
private String lookupTrigOnView(String viewName) {
u.appOutput("viewName=["+viewName+"] ");
viewName = u.resolveName(viewName);
u.appOutput("viewName resolved=["+viewName+"] ");
String trigName = "";
for (String trig : CompassUtilities.trigSymTab.keySet()) {
String rawAttributes = CompassUtilities.trigSymTab.get(trig);
List<String> trigAttributes = new ArrayList<String>(Arrays.asList(rawAttributes.split(u.symTabSeparator2)));
String trigType = trigAttributes.get(0);
String baseTable = trigAttributes.get(1);
if (!trigType.equals("INSTEAD OF")) continue;
u.appOutput("trigAttributes=["+trigAttributes+"] baseTable=["+baseTable+"] viewName=["+viewName+"] ");
if (baseTable.equals(viewName)) {
trigName = trig;
break;
}
}
return trigName;
}

// lookup a column; must be called with resolved object name
private String lookupCol(String objName, String colName) {
String resultType = "";
Expand Down Expand Up @@ -1645,6 +1666,15 @@ private void HandleSystemProcPass1(TSQLParser.Func_proc_name_server_database_sch
@Override public String visitCreate_or_alter_dml_trigger(TSQLParser.Create_or_alter_dml_triggerContext ctx) {
if (u.debugging) dbgTraceVisitEntry(CompassUtilities.thisProc());
String trigName = ctx.simple_name().getText();
String trigType = "";
if ((ctx.FOR() != null) || (ctx.AFTER() != null)) {
trigType = "FOR/AFTER";
}
else if (ctx.INSTEAD() != null) {
trigType = "INSTEAD OF";
}
String trigBaseTable = ctx.table_name().getText();
u.addTrigSymTab(trigName, trigType, trigBaseTable);

// set context
u.setContext("TRIGGER", trigName);
Expand Down Expand Up @@ -5723,12 +5753,21 @@ else if (objType.equalsIgnoreCase("TRIGGER")) {

String kwd = "CREATE";
String status = u.Supported;
String hasTrigger = null;
Copy link
Copy Markdown
Collaborator

@robverschoor robverschoor May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use boolean instead of string

if (ctx.ALTER() != null) {
kwd = "ALTER";
if (ctx.CREATE() != null) kwd = "CREATE OR ALTER";
status = featureSupportedInVersion("ALTER VIEW"); // ALTER and CREATE OR ALTER go together

String trigName = lookupTrigOnView(viewName);
if (!trigName.isEmpty()) {
status = u.NotSupported;
Copy link
Copy Markdown
Collaborator

@robverschoor robverschoor May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you have to add an item to the .cfg file and specifically test for that. you cannot just decide here that it is not supported

Copy link
Copy Markdown
Contributor

@R4hul04 R4hul04 May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added list item - View (representing Alter view) and Trigger (representing Alter view with trigger) in .cfg file

hasTrigger = "with trigger";
}
}
if (!hasTrigger) {
captureItem(kwd + " VIEW" + hasTrigger, viewName, ViewsReportGroup, kwd + " VIEW" + hasTrigger, status, ctx.start.getLine(), batchLines.toString());
}
captureItem(kwd + " VIEW", viewName, ViewsReportGroup, "", status, ctx.start.getLine(), batchLines.toString());

// set context
u.setContext("VIEW", viewName);
Expand Down
38 changes: 36 additions & 2 deletions src/main/java/compass/CompassUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@ public class CompassUtilities {
"ALTER SERVER ROLE"+tttSeparator+"ALTER SERVER ROLE for this server-level role is not currently supported",
"CREATE USER"+tttSeparator+"DB users are not currently supported, except 'dbo' and 'guest'",
"ALTER USER"+tttSeparator+"DB users are not currently supported, except 'dbo' and 'guest'",
"ALTER VIEW with trigger"+tttSeparator+"ALTER VIEW on View having trigger is not supported",
"ALTER VIEW"+tttSeparator+"ALTER VIEW is not currently supported; use DROP+CREATE",
"CREATE OR ALTER VIEW"+tttSeparator+"CREATE OR ALTER VIEW is not currently supported; use DROP+CREATE",
"ALTER PROCEDURE"+tttSeparator+"ALTER PROCEDURE is not currently supported; use DROP+CREATE",
Expand Down Expand Up @@ -1056,6 +1057,7 @@ public class CompassUtilities {
public String captureFilePathName;
public BufferedWriter captureFileWriter;
public static final String symTabSeparator = ";";
public static final String symTabSeparator2 = "~~";
public static final char metricsLineChar1 = '*';
public static final char metricsLineChar2 = '=';
public static final String metricsLineTag = "metrics";
Expand Down Expand Up @@ -1161,6 +1163,7 @@ public class CompassUtilities {
public static Map<String, String> SUDFSymTab = new HashMap<>();
public static Map<String, String> TUDFSymTab = new HashMap<>();
public static Map<String, String> procSymTab = new HashMap<>();
public static Map<String, String> trigSymTab = new HashMap<>();
public static Map<String, String> colSymTab = new HashMap<>(); // columns
public static boolean buildColSymTab = false; // false=no columns in symtab in pass 1
public static Map<String, String> parSymTab = new HashMap<>(); // parameters with defaults
Expand Down Expand Up @@ -4411,7 +4414,21 @@ public void addProcSymTab(String procName, String objType, boolean readingSymTab
procName = resolveName(procName);
}
procSymTab.put(procName.toUpperCase(), objType.toUpperCase());
}
}

// add to symbol table
public void addTrigSymTab(String trigName, String trigType, String baseTable) {
addTrigSymTab(trigName, trigType, baseTable, false);
}
public void addTrigSymTab(String trigName, String trigType, String baseTable, boolean readingSymTab)
{
if (!readingSymTab) {
trigName = resolveName(trigName);
baseTable = resolveName(baseTable);
}
String value = trigType.toUpperCase() + symTabSeparator2 + baseTable;
trigSymTab.put(trigName.toUpperCase(), value);
}

// add to symbol table
public String makeColSymTabKey(String tableName, String colName) {
Expand Down Expand Up @@ -4543,6 +4560,10 @@ public void writeSymTab(String reportName, String inputFileName, String appName)
for (String proc : procSymTab.keySet()) {
line = "proc" + symTabSeparator + maskChar(proc, symTabSeparator) + symTabSeparator + maskChar(procSymTab.get(proc), symTabSeparator);
writeSymTabFile(decodeIdentifier(line));
}
for (String trig : trigSymTab.keySet()) {
line = "trig" + symTabSeparator + maskChar(trig, symTabSeparator) + symTabSeparator + maskChar(trigSymTab.get(trig), symTabSeparator);
writeSymTabFile(decodeIdentifier(line));
}
for (String col : colSymTab.keySet()) {
line = "col" + symTabSeparator + col + symTabSeparator + maskChar(colSymTab.get(col), symTabSeparator);
Expand Down Expand Up @@ -4622,7 +4643,7 @@ public void readSymTab(String reportName, String appName) throws IOException
}
inFileReader.close();
}
int nrSymtab = (tableViewSymTab.size()+SUDFSymTab.size()+TUDFSymTab.size()+UDDSymTab.size()+colSymTab.size()+parSymTab.size()+procSymTab.size());
int nrSymtab = (tableViewSymTab.size()+SUDFSymTab.size()+TUDFSymTab.size()+UDDSymTab.size()+colSymTab.size()+parSymTab.size()+procSymTab.size()+trigSymTab.size());
if (debugging) dbgOutput("symtab entries=["+nrSymtab+"] ", debugSymtab);
if (debugSymtab) {
//dumpSymTab("after reading from disk");
Expand Down Expand Up @@ -4667,6 +4688,14 @@ else if (fields.get(0).equals("proc")) {
String objType = unmaskChar(fields.get(2),symTabSeparator);
addProcSymTab(objName, objType, true);
}
else if (fields.get(0).equals("trig")) {
String objName = unmaskChar(fields.get(1),symTabSeparator);
String rawAttributes = unmaskChar(fields.get(2),symTabSeparator);
List<String> trigAttributes = new ArrayList<String>(Arrays.asList(rawAttributes.split(symTabSeparator2)));
String trigType = trigAttributes.get(0);
String baseTable = trigAttributes.get(1);
addTrigSymTab(objName, trigType, baseTable, true);
}
else if (fields.get(0).equals("col")) {
String tableName = unmaskChar(fields.get(1),symTabSeparator);
String colName = unmaskChar(fields.get(2),symTabSeparator);
Expand Down Expand Up @@ -4699,6 +4728,7 @@ public static void clearSymTab()
TUDFSymTab.clear();
UDDSymTab.clear();
procSymTab.clear();
trigSymTab.clear();
colSymTab.clear();
parSymTab.clear();
SUDFNamesLikeXML.clear();
Expand Down Expand Up @@ -4743,6 +4773,10 @@ public void dumpSymTab(String tag)
countSymTab++;
}
appOutput("");
for (String trig: trigSymTab.keySet()) {
appOutput("trig=["+trig+"] => ["+trigSymTab.get(trig)+"]");
countSymTab++;
}
appOutput("SUDFNamesLikeXML: "+SUDFNamesLikeXML.size());
for (String sudf: SUDFNamesLikeXML.keySet()) {
appOutput("sudf=["+sudf+"] => ["+SUDFNamesLikeXML.get(sudf)+"]");
Expand Down
Loading