part 2 of #5. closes #5

PhilippSalvisberg · PhilippSalvisberg · commit b61512fb0be9 · 2018-01-31T12:47:16.000+01:00
enable/disable "Run utPLSQL test" in PL/SQL editor
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend
@@ -57,7 +57,15 @@ class UtplsqlController implements Controller {
 			if (view instanceof Editor) {
 				val component = view.defaultFocusComponent
 				if (component instanceof JEditorPane) {
-					val parser = new UtplsqlParser(component.text)
+					val node = context.node
+					var String connectionName = null;
+					if (node instanceof DatabaseSourceNode) {
+						connectionName = node.connectionName
+					} else if (view instanceof Worksheet) {
+						connectionName = view.connectionName
+					}
+					logger.fine('''connectionName: «connectionName»''')
+					val parser = new UtplsqlParser(component.text, Connections.instance.getConnection(connectionName))
 					if (!parser.getPathAt(component.caretPosition).empty) {
 						action.enabled = true
 					}
@@ -127,16 +135,16 @@ class UtplsqlController implements Controller {
 		if (view instanceof Editor) {
 			val component = view.defaultFocusComponent
 			if (component instanceof JEditorPane) {
-				val parser = new UtplsqlParser(component.text)
-				val position = component.caretPosition
-				val path = parser.getPathAt(position)
-				var String connectionName = null;				
+				var String connectionName = null;
 				if (node instanceof DatabaseSourceNode) {
 					connectionName = node.connectionName
 				} else if (view instanceof Worksheet) {
 					connectionName = view.connectionName
 				}
 				logger.fine('''connectionName: «connectionName»''')
+				val parser = new UtplsqlParser(component.text, Connections.instance.getConnection(connectionName))
+				val position = component.caretPosition
+				val path = parser.getPathAt(position)
 				val utPlsqlWorksheet = new UtplsqlWorksheet(path, connectionName)
 				utPlsqlWorksheet.runTestAsync
 			}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.xtend
@@ -15,11 +15,14 @@
  */
 package org.utplsql.sqldev.model.parser
 
+import java.util.List
 import org.eclipse.xtend.lib.annotations.Accessors
 import org.utplsql.sqldev.model.AbstractModel
+import org.utplsql.sqldev.model.ut.Annotation
 
 @Accessors
 class PlsqlObject extends AbstractModel {
 	String name
 	Integer position
+	List<Annotation> annotations
 }
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend b/sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend
@@ -14,9 +14,12 @@
  */
 package org.utplsql.sqldev.parser
 
+import java.sql.Connection
 import java.util.ArrayList
+import java.util.Arrays
 import java.util.regex.Pattern
 import javax.swing.text.JTextComponent
+import org.utplsql.sqldev.dal.UtplsqlDao
 import org.utplsql.sqldev.model.parser.PlsqlObject
 import org.utplsql.sqldev.model.parser.Unit
 
@@ -26,11 +29,16 @@ class UtplsqlParser {
 	private ArrayList<PlsqlObject> objects = new ArrayList<PlsqlObject>
 	private ArrayList<Unit> units = new ArrayList<Unit>
 	
-	new(String plsql) {
+	new(String plsql, Connection conn) {
 		setPlsql(plsql)
 		setPlsqlReduced
 		populateObjects
 		populateUnits
+		processAnnotations(conn)
+	}
+	
+	new(String plsql) {
+		this(plsql, null)
 	}
 	
 	/**
@@ -104,14 +112,51 @@ class UtplsqlParser {
 		}
 	}
 	
-	private def getObjectNameAt(int position) {
-		var name = ""
+	private def processAnnotations(Connection conn) {
+		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)
+					if (annotations.findFirst[it.name == "suite"] !== null) {
+						o.annotations = annotations
+					}
+				}
+				val fixedUnits = new ArrayList<Unit>
+				for (u : units) {
+					val o = getObjectAt(u.position)
+					if (o?.annotations !== null && o.annotations.findFirst [
+						it.name == "test" && it.subobjectName.equalsIgnoreCase(u.name.fixName)
+					] !== null) {
+						fixedUnits.add(u)
+					}
+				}
+				units = fixedUnits
+				val fixedObjects = new ArrayList<PlsqlObject>
+				for (o : objects) {
+					if (o.annotations !== null) {
+						fixedObjects.add(o)
+					}
+				}
+				objects = fixedObjects
+			}
+		}
+	}
+	
+	private def getObjectAt(int position) {
+		var PlsqlObject obj
 		for (o : objects) {
 			if (o.position <= position) {
-				name = o.name
+				obj = o
 			}
 		}
-		return name
+		return obj
+	}	
+	
+	private def getObjectNameAt(int position) {
+		val o = getObjectAt(position)
+		return if (o !== null) {o.name} else {""}
 	}
 	
 	private def getUnitNameAt(int position) {
diff --git a/sqldev/src/test/java/org/utplsql/sqldev/tests/AbstractJdbcTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/tests/AbstractJdbcTest.xtend
@@ -15,7 +15,11 @@
  */
 package org.utplsql.sqldev.tests
 
+import java.io.StringReader
+import java.util.ArrayList
 import java.util.Properties
+import oracle.dbtools.raptor.newscriptrunner.SQLCommand.StmtType
+import oracle.dbtools.worksheet.scriptparser.sqlplus.SQLPlusScriptParser
 import org.springframework.jdbc.core.JdbcTemplate
 import org.springframework.jdbc.datasource.SingleConnectionDataSource
 
@@ -43,4 +47,17 @@ abstract class AbstractJdbcTest {
 		sysDataSource.password = p.getProperty("sys_password")
 		sysJdbcTemplate = new JdbcTemplate(AbstractJdbcTest.sysDataSource)
 	}
+
+	def static getStatements(String sqlplusScript) {
+		var SQLPlusScriptParser p = new SQLPlusScriptParser(new StringReader(sqlplusScript))
+		val stmts = new ArrayList<String>
+		while (p.hasNext) {
+			val stmt = p.next
+			if ((stmt.executable || stmt.runnable) && stmt.stmtType != StmtType.G_C_COMMENT &&
+				stmt.stmtType != StmtType.G_C_MULTILINECOMMENT && stmt.stmtType != StmtType.G_C_SQLPLUS) {
+				stmts.add(stmt.sql)
+			}
+		}
+		return stmts;
+	}
 }
diff --git a/sqldev/src/test/java/org/utplsql/sqldev/tests/UtplsqlParserTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/tests/UtplsqlParserTest.xtend
@@ -15,52 +15,66 @@
  */
 package org.utplsql.sqldev.tests
 
+import org.junit.AfterClass
 import org.junit.Assert
+import org.junit.BeforeClass
 import org.junit.Test
+import org.springframework.jdbc.BadSqlGrammarException
 import org.utplsql.sqldev.parser.UtplsqlParser
 
-class UtplsqlParserTest {
+class UtplsqlParserTest extends AbstractJdbcTest {
+	
+	private static val sqlScript = '''
+		PROMPT
+		PROMPT Install utPLSQL test package
+		PROMPT
+		
+		/*
+		 * some comment
+		 */
+		CREATE OR REPLACE PACKAGE pkg IS
+		   -- %suite
+		   -- %rollback(manual)
+		   -- %test
+		   PROCEDURE p (in_p1 INTEGER);
+		   FUNCTION f (in_p1 INTEGER) RETURN INTEGER;
+		END pkg;
+		/
+		SHOW ERRORS
+		
+		CREATE OR REPLACE PACKAGE BODY "SCOTT"."PKG" IS
+		   PROCEDURE "P" (in_p1 INTEGER) IS
+		   BEGIN
+		      NULL;
+		   END p;
+		
+		   /* comment 1 */
+		   -- comment 2
+		   /* comment 3 */
+		   -- comment 4
+		
+		   FUNCTION "F" (in_p1 INTEGER) RETURN INTEGER IS
+		   BEGIN
+		      RETURN 1;
+		   END f;
+		END pkg;
+		/
+		SHOW ERRORS
+	'''
+
+	@BeforeClass
+	@AfterClass
+	def static void setupAndTeardown() {
+		try {
+			jdbcTemplate.execute("DROP PACKAGE pkg")
+		} catch (BadSqlGrammarException e) {
+			// ignore
+		}
+	} 
 
 	@Test
 	def testPackage() {
-		val plsql = '''
-			PROMPT
-			PROMPT Install utPLSQL test package
-			PROMPT
-			
-			/*
-			 * some comment
-			 */
-			-- %suite
-			-- %rollback(manual)
-			CREATE OR REPLACE PACKAGE pkg IS
-			   -- %test
-			   PROCEDURE p (in_p1 INTEGER);
-			   FUNCTION f (in_p1 INTEGER) RETURN INTEGER;
-			END pkg;
-			/
-			SHOW ERRORS
-			
-			CREATE OR REPLACE PACKAGE BODY "SCOTT"."PKG" IS
-			   PROCEDURE "P" (in_p1 INTEGER) IS
-			   BEGIN
-			      NULL;
-			   END p;
-			
-			   /* comment 1 */
-			   -- comment 2
-			   /* comment 3 */
-			   -- comment 4
-			
-			   FUNCTION "F" (in_p1 INTEGER) RETURN INTEGER IS
-			   BEGIN
-			      RETURN 1;
-			   END f;
-			END pkg;
-			/
-			SHOW ERRORS
-		'''
-		val parser = new UtplsqlParser(plsql)
+		val parser = new UtplsqlParser(sqlScript)
 		val objects = parser.getObjects
 		Assert.assertEquals(2, objects.size)
 		Assert.assertEquals("pkg", objects.get(0).name)
@@ -81,6 +95,39 @@ class UtplsqlParserTest {
 		Assert.assertEquals("SCOTT.PKG.P", parser.getPathAt(22,10))
 		Assert.assertEquals("SCOTT.PKG.P", parser.getPathAt(29,1))
 	}
+
+	@Test
+	def testPackageWithConnection() {
+		val plsql = '''
+			/*
+			 * some comment
+			 */
+			CREATE OR REPLACE PACKAGE pkg IS
+			   -- %suite
+			   -- %rollback(manual)
+
+			   -- %test
+			   PROCEDURE p (in_p1 INTEGER);
+			   FUNCTION f (in_p1 INTEGER) RETURN INTEGER;
+			END pkg;
+		'''
+		var parser = new UtplsqlParser(plsql, dataSource.connection)
+		Assert.assertEquals(0, parser.getObjects.size)
+		Assert.assertEquals(0, parser.getUnits.size)
+		jdbcTemplate.execute(plsql)
+		parser = new UtplsqlParser(plsql, dataSource.connection)
+		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)
+		Assert.assertEquals(2, parser.getObjects.size)
+		Assert.assertEquals(2, parser.getUnits.size)
+		Assert.assertEquals("pkg.p", parser.getPathAt(13,1))
+		Assert.assertEquals("SCOTT.PKG.P", parser.getPathAt(19,1))
+		setupAndTeardown
+	}
 	
 	@Test
 	def issue_1() {
@@ -171,5 +218,4 @@ class UtplsqlParserTest {
 		Assert.assertEquals("test_expect_not_to_be_null.blob_not_null", parser.getPathAt(13,26))
 	}
 
-
 }
