pass owner when calculating dependencies

PhilippSalvisberg · PhilippSalvisberg · commit 467a4bd60778 · 2019-07-14T13:29:39.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend
@@ -313,12 +313,21 @@ class UtplsqlController implements Controller {
 			}
 		}
 	}
-	
+
 	def List<String> dependencies(String name, String connectionName) {
+		var List<String> ret = null
+		if (connectionName !== null) {
+			val owner = Connections.instance.getConnection(connectionName).schema
+			ret = dependencies(owner, name, connectionName)
+		}
+		return ret
+	}
+	
+	def List<String> dependencies(String owner, String name, String connectionName) {
 		var List<String> ret = null
 		if (connectionName !== null) {
 			val dao = new UtplsqlDao(Connections.instance.getConnection(connectionName))
-			ret = dao.includes(name)
+			ret = dao.includes(owner, name)
 		}
 		return ret
 	}
@@ -328,12 +337,12 @@ class UtplsqlController implements Controller {
 		for (i : 0 ..< context.selection.length) {
 			val element = context.selection.get(i)
 			if (element instanceof PlSqlNode) {
-				val dep = dependencies(element.objectName, connectionName)
+				val dep = dependencies(element.owner, element.objectName, connectionName)
 				for (d : dep) {
 					ret.add(d)
 				}
 			} else if (element instanceof ChildObjectElement) {
-				val dep = dependencies(element.URL.memberObject, connectionName)
+				val dep = dependencies(element.URL.schema, element.URL.memberObject, connectionName)
 				for (d : dep) {
 					ret.add(d)
 				}

Original file line number	Diff line number	Diff line change
`@@ -313,12 +313,21 @@ class UtplsqlController implements Controller {`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`	`}`
`316`		`-`
	`316`	`+`
`317`	`317`	`def List<String> dependencies(String name, String connectionName) {`
	`318`	`+ var List<String> ret = null`
	`319`	`+ if (connectionName !== null) {`
	`320`	`+ val owner = Connections.instance.getConnection(connectionName).schema`
	`321`	`+ ret = dependencies(owner, name, connectionName)`
	`322`	`+ }`
	`323`	`+ return ret`
	`324`	`+ }`
	`325`	`+`
	`326`	`+ def List<String> dependencies(String owner, String name, String connectionName) {`
`318`	`327`	`var List<String> ret = null`
`319`	`328`	`if (connectionName !== null) {`
`320`	`329`	`val dao = new UtplsqlDao(Connections.instance.getConnection(connectionName))`
`321`		`- ret = dao.includes(name)`
	`330`	`+ ret = dao.includes(owner, name)`
`322`	`331`	`}`
`323`	`332`	`return ret`
`324`	`333`	`}`
`@@ -328,12 +337,12 @@ class UtplsqlController implements Controller {`
`328`	`337`	`for (i : 0 ..< context.selection.length) {`
`329`	`338`	`val element = context.selection.get(i)`
`330`	`339`	`if (element instanceof PlSqlNode) {`
`331`		`- val dep = dependencies(element.objectName, connectionName)`
	`340`	`+ val dep = dependencies(element.owner, element.objectName, connectionName)`
`332`	`341`	`for (d : dep) {`
`333`	`342`	`ret.add(d)`
`334`	`343`	`}`
`335`	`344`	`} else if (element instanceof ChildObjectElement) {`
`336`		`- val dep = dependencies(element.URL.memberObject, connectionName)`
	`345`	`+ val dep = dependencies(element.URL.schema, element.URL.memberObject, connectionName)`
`337`	`346`	`for (d : dep) {`
`338`	`347`	`ret.add(d)`
`339`	`348`	`}`