fixes #22 - cannot run tests from "Other Users" node

Author: PhilippSalvisberg

sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend

@@ -63,13 +63,15 @@ class UtplsqlController implements Controller {
 					if (preferences.checkRunUtplsqlTest) {
 						val node = context.node
 						var String connectionName = null;
+						var String owner = null;
 						if (node instanceof DatabaseSourceNode) {
 							connectionName = node.connectionName
+							owner = node.owner
 						} else if (view instanceof Worksheet) {
 							connectionName = view.connectionName
 						}
 						logger.fine('''connectionName: «connectionName»''')
-						val parser = new UtplsqlParser(component.text, Connections.instance.getConnection(connectionName))
+						val parser = new UtplsqlParser(component.text, Connections.instance.getConnection(connectionName), owner)
 						if (!parser.getPathAt(component.caretPosition).empty) {
 							action.enabled = true
 						}
@@ -145,14 +147,16 @@ class UtplsqlController implements Controller {
 			val component = view.defaultFocusComponent
 			if (component instanceof JEditorPane) {
 				var String connectionName = null;
+				var String owner = null;
 				if (node instanceof DatabaseSourceNode) {
 					connectionName = node.connectionName
+					owner = node.owner
 				} else if (view instanceof Worksheet) {
 					connectionName = view.connectionName
 				}
 				logger.fine('''connectionName: «connectionName»''')
 				val preferences = PreferenceModel.getInstance(Preferences.preferences)
-				val parser = new UtplsqlParser(component.text, if (preferences.checkRunUtplsqlTest) {Connections.instance.getConnection(connectionName)} else {null})
+				val parser = new UtplsqlParser(component.text, if (preferences.checkRunUtplsqlTest) {Connections.instance.getConnection(connectionName)} else {null}, owner)
 				val position = component.caretPosition
 				val path = parser.getPathAt(position)
 				val utPlsqlWorksheet = new UtplsqlWorksheet(path, connectionName)

sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend

@@ -24,21 +24,22 @@ import org.utplsql.sqldev.model.parser.PlsqlObject
 import org.utplsql.sqldev.model.parser.Unit
 
 class UtplsqlParser {
+	private String owner
 	private String plsql
 	private String plsqlReduced
 	private ArrayList<PlsqlObject> objects = new ArrayList<PlsqlObject>
 	private ArrayList<Unit> units = new ArrayList<Unit>
 
-	new(String plsql, Connection conn) {
+	new(String plsql, Connection conn, String owner) {
 		setPlsql(plsql)
 		setPlsqlReduced
 		populateObjects
 		populateUnits
-		processAnnotations(conn)
+		processAnnotations(conn, owner)
 	}
 
 	new(String plsql) {
-		this(plsql, null)
+		this(plsql, null, null)
 	}
 
 	/**
@@ -112,13 +113,14 @@ class UtplsqlParser {
 		}
 	}
 
-	private def processAnnotations(Connection conn) {
+	private def processAnnotations(Connection conn, String owner) {
+		this.owner = owner
 		if (conn !== null) {
 			val dao = new UtplsqlDao(conn)
 			if (dao.utAnnotationManagerInstalled) {
 				for (o : objects) {
-					val segments = Arrays.asList(o.name.fixName.split("\\."))			
-					val annotations = dao.annotations(conn.schema, segments.last.toUpperCase)
+					val segments = Arrays.asList(o.name.fixName.split("\\."))	
+					val annotations = dao.annotations(if (owner !== null) {owner} else {conn.schema}, segments.last.toUpperCase)
 					if (annotations.findFirst[it.name == "suite"] !== null) {
 						o.annotations = annotations
 					}
@@ -191,11 +193,8 @@ class UtplsqlParser {
 		var objectName = getObjectNameAt(position)
 		if (!objectName.empty) {
 			var unitName = getUnitNameAt(position)
-			if (unitName.empty) {
-				return objectName.fixName
-			} else {
-				return '''«objectName.fixName».«unitName.fixName»'''
-			}
+			val path = '''«IF owner !== null»«owner».«ENDIF»«objectName.fixName»«IF !unitName.empty».«unitName.fixName»«ENDIF»'''
+			return path
 		}
 		return ""
 	}

sqldev/src/test/java/org/utplsql/sqldev/tests/UtplsqlParserTest.xtend

@@ -111,17 +111,17 @@ class UtplsqlParserTest extends AbstractJdbcTest {
 			   FUNCTION f (in_p1 INTEGER) RETURN INTEGER;
 			END pkg;
 		'''
-		var parser = new UtplsqlParser(plsql, dataSource.connection)
+		var parser = new UtplsqlParser(plsql, dataSource.connection, null)
 		Assert.assertEquals(0, parser.getObjects.size)
 		Assert.assertEquals(0, parser.getUnits.size)
 		jdbcTemplate.execute(plsql)
-		parser = new UtplsqlParser(plsql, dataSource.connection)
+		parser = new UtplsqlParser(plsql, dataSource.connection, null)
 		Assert.assertEquals(1, parser.getObjects.size)
 		Assert.assertEquals(1, parser.getUnits.size)
 		for (stmt : getStatements(sqlScript)) {
 			jdbcTemplate.execute(stmt)
 		}
-		parser = new UtplsqlParser(sqlScript, dataSource.connection)
+		parser = new UtplsqlParser(sqlScript, dataSource.connection, null)
 		Assert.assertEquals(2, parser.getObjects.size)
 		Assert.assertEquals(2, parser.getUnits.size)
 		Assert.assertEquals("pkg.p", parser.getPathAt(13,1))