added DAO for units (subprograms) and testables (objects for unit tests)

units to be used for #10 - to generate units for a single object (package, type, procedure, function)
testables to be used for #11 - to populate nodes in oddgen view

Author: PhilippSalvisberg

sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend

@@ -17,6 +17,7 @@
 
 import java.sql.Connection
 import java.util.List
+import org.oddgen.sqldev.generators.model.Node
 import org.springframework.dao.DataAccessException
 import org.springframework.dao.EmptyResultDataAccessException
 import org.springframework.jdbc.core.BeanPropertyRowMapper
@@ -175,5 +176,90 @@ class UtplsqlDao {
 		val result = jdbcTemplate.query(sql, new BeanPropertyRowMapper<Annotation>(Annotation), #[owner, objectName])
 		return result
 	}
+
+	/**
+	 * Gets a list of public units in the object type 
+	 * 
+	 * @param objectType expected object types are PACKAGE, TYPE, FUNCTION, PROCEDURE
+	 * @param objectName name of the object
+	 * @return list of the public units in the object type
+	 * @throws DataAccessException if there is a problem
+	 */
+	def List<String> units(String objectType, String objectName) {
+		if (objectType == "PACKAGE" || objectType == "TYPE") {
+			val sql = '''
+				SELECT procedure_name
+				  FROM user_procedures
+				 WHERE object_type = ?
+				   AND object_name = ?
+				   AND procedure_name IS NOT NULL
+				 GROUP BY procedure_name
+				 ORDER BY min(subprogram_id)
+			'''
+			val result = jdbcTemplate.queryForList(sql, String, #[objectType, objectName])
+			return result
+		} else {
+			return #[objectName]
+		}
+	}
 
+	/**
+	 * Gets a list of oddgen's nodes as candidates to create utPLSQL test packages.
+	 * Candidates are packages, types, functions and procedures in the current user.
+	 * 
+	 * This functions must be called from an oddgen generator only, since the Node is not
+	 * defined in the utPLSQL extension.
+	 * 
+	 * @param objectType expected object types are PACKAGE, TYPE, FUNCTION, PROCEDURE
+	 * @return list of the oddgen nodes for the requested object type
+	 * @throws DataAccessException if there is a problem
+	 */
+	def List<Node> testables(String objectType) {
+		var String sql;
+		if (objectType == "PACKAGE") {
+			sql = '''
+				SELECT DISTINCT 
+				       object_type || '.' || object_name AS id,
+				       object_type AS parent_id,
+				       1 AS leaf,
+				       1 AS generatable,
+				       1 AS multiselectable
+				  FROM user_procedures
+				 WHERE object_type = ?
+				   AND procedure_name IS NOT NULL
+				   AND object_name NOT IN (
+				          SELECT object_name
+					        FROM TABLE(«utplsqlSchema».ut_annotation_manager.get_annotated_objects(USER, 'PACKAGE'))
+				       )
+			'''
+		}
+		else if (objectType == "TYPE") {
+			sql = '''
+				SELECT DISTINCT 
+				       object_type || '.' || object_name AS id,
+				       object_type AS parent_id,
+				       1 AS leaf,
+				       1 AS generatable,
+				       1 AS multiselectable
+				  FROM user_procedures
+				 WHERE object_type = ?
+				   AND procedure_name IS NOT NULL
+			'''
+		}
+		else  {
+			sql = '''
+				SELECT object_type || '.' || object_name AS id,
+				       object_type AS parent_id,
+				       1 AS leaf,
+				       1 AS generatable,
+				       1 AS multiselectable
+				  FROM user_objects
+				 WHERE object_type = ?
+				   AND generated = 'N'
+			'''
+		}
+		val jdbcTemplate = new JdbcTemplate(new SingleConnectionDataSource(conn, true))
+		val nodes = jdbcTemplate.query(sql, new BeanPropertyRowMapper<Node>(Node), #[objectType])
+		return nodes		
+	}
 }

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

@@ -35,6 +35,31 @@ class DalTest extends AbstractJdbcTest {
 		} catch (BadSqlGrammarException e) {
 			// ignore
 		}
+		try {
+			jdbcTemplate.execute("DROP PACKAGE junit_no_test_pkg")
+		} catch (BadSqlGrammarException e) {
+			// ignore
+		}
+		try {
+			jdbcTemplate.execute("DROP TYPE junit_tab1_ot")
+		} catch (BadSqlGrammarException e) {
+			// ignore
+		}
+		try {
+			jdbcTemplate.execute("DROP TYPE junit_tab2_ot")
+		} catch (BadSqlGrammarException e) {
+			// ignore
+		}
+		try {
+			jdbcTemplate.execute("DROP FUNCTION junit_f")
+		} catch (BadSqlGrammarException e) {
+			// ignore
+		}
+		try {
+			jdbcTemplate.execute("DROP PROCEDURE junit_p")
+		} catch (BadSqlGrammarException e) {
+			// ignore
+		}
 	}
 
 	@Test 
@@ -63,7 +88,6 @@ class DalTest extends AbstractJdbcTest {
 	@Test
 	def void containsUtplsqlTest() {
 		val dao = new UtplsqlDao(dataSource.connection)
-		Assert.assertFalse(dao.containsUtplsqlTest("scott"))
 		jdbcTemplate.execute('''
 			CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS
 			   -- %suite
@@ -104,7 +128,6 @@ class DalTest extends AbstractJdbcTest {
 	@Test
 	def void annotations() {
 		val dao = new UtplsqlDao(dataSource.connection)
-		Assert.assertEquals(new ArrayList<Annotation>, dao.annotations("scott", "junit_utplsql_test_pkg"))
 		jdbcTemplate.execute('''
 			CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS
 			   -- %suite
@@ -143,4 +166,82 @@ class DalTest extends AbstractJdbcTest {
 		Assert.assertEquals(expected.toString, effective.toString)
 		jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg")
 	}
+	
+	@Test
+	def void testablesPackages() {
+		val dao = new UtplsqlDao(dataSource.connection)
+		jdbcTemplate.execute('''
+			CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS
+			   -- %suite
+
+			   -- %test
+			   PROCEDURE t1;
+
+			   -- %Test
+			   PROCEDURE t2;
+
+			   PROCEDURE t3;
+			END junit_utplsql_test_pkg;
+		''')
+		jdbcTemplate.execute('''
+			CREATE OR REPLACE PACKAGE junit_no_test_pkg IS
+			   PROCEDURE p1;
+
+			   PROCEDURE p2;
+			END junit_no_test_pkg;
+		''')
+		val effective = dao.testables('PACKAGE')
+		Assert.assertEquals(1, effective.size)
+		Assert.assertEquals("PACKAGE.JUNIT_NO_TEST_PKG", effective.get(0).id)
+	}
+
+	@Test
+	def void testablesTypes() {
+		val dao = new UtplsqlDao(dataSource.connection)
+		jdbcTemplate.execute('''
+			CREATE OR REPLACE TYPE junit_tab1_ot IS object (a integer, b integer);
+		''')
+		jdbcTemplate.execute('''
+			CREATE OR REPLACE TYPE junit_tab2_ot IS object (
+			   a integer, 
+			   b integer, 
+			   member procedure c(
+			      self in out nocopy junit_tab2_ot, 
+			      p integer
+			   )
+			);
+		''')
+		val effective = dao.testables('TYPE')
+		Assert.assertEquals(1, effective.size)
+		Assert.assertEquals("TYPE.JUNIT_TAB2_OT", effective.get(0).id)
+	}
+
+	@Test
+	def void testablesFunctions() {
+		val dao = new UtplsqlDao(dataSource.connection)
+		jdbcTemplate.execute('''
+			CREATE OR REPLACE FUNCTION junit_f RETURN INTEGER IS 
+			BEGIN
+			   RETURN 1;
+			END;
+		''')
+		val effective = dao.testables('FUNCTION')
+		Assert.assertEquals(1, effective.size)
+		Assert.assertEquals("FUNCTION.JUNIT_F", effective.get(0).id)
+	}
+
+	@Test
+	def void testablesProcedures() {
+		val dao = new UtplsqlDao(dataSource.connection)
+		jdbcTemplate.execute('''
+			CREATE OR REPLACE PROCEDURE junit_p RETURN INTEGER IS 
+			BEGIN
+			   NULL;
+			END;
+		''')
+		val effective = dao.testables('PROCEDURE')
+		Assert.assertEquals(1, effective.size)
+		Assert.assertEquals("PROCEDURE.JUNIT_P", effective.get(0).id)
+	}
+
 }