Added PL/SQL methods for getting FM version.

1. Fixed issue #18.
2. Changed using `getColumnName` method to `getColumnLabel` in result set processing.

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>ftldb</groupId>
     <artifactId>ftldb</artifactId>
-    <version>1.4.0-rc1</version>
+    <version>1.4.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/ftldb/CommandLine.java

@@ -45,7 +45,7 @@ public static void main(String[] args) throws IOException, TemplateException {
 
         if (args.length < 1) {
             exitWithUsageExample("FTLDB v" + Configurator.getVersion() + ","
-                    + " based on FreeMarker v" + Configuration.getVersion() + ".");
+                    + " based on FreeMarker v" + Configurator.getFreeMarkerVersion() + ".");
         }
 
         Configuration cfg;

src/main/java/ftldb/Configurator.java

@@ -171,4 +171,14 @@ private static Version readVersion() {
     }
 
 
+    /**
+     * Returns FreeMarker version as a {@link Version} instance.
+     *
+     * @return FreeMarker version
+     */
+    public static Version getFreeMarkerVersion() {
+        return Configuration.getVersion();
+    }
+
+
 }

src/main/java/ftldb/ext/sql/FetchedResultSet.java

@@ -34,7 +34,7 @@ public class FetchedResultSet {
 
 
     public final ResultSetMetaData metaData;
-    public final String[] columnNames;
+    public final String[] columnLabels;
     public final Map columnIndices;
     public final Object[][] data;
 
@@ -49,14 +49,14 @@ public FetchedResultSet(ResultSet rs) throws SQLException {
         metaData = rs.getMetaData();
         int columnCount = metaData.getColumnCount();
 
-        columnNames = new String[columnCount];
-        columnIndices = new HashMap(columnNames.length, 1);
+        columnLabels = new String[columnCount];
+        columnIndices = new HashMap(columnLabels.length, 1);
 
         for (int i = 0; i < columnCount; i++) {
-            columnNames[i] = metaData.getColumnName(i + 1);
-            // if two columns have same names, save only the 1st one
-            if (columnIndices.get(columnNames[i]) == null) {
-                columnIndices.put(columnNames[i], new Integer(i));
+            columnLabels[i] = metaData.getColumnLabel(i + 1);
+            // if two columns have same labels, save only the 1st one
+            if (columnIndices.get(columnLabels[i]) == null) {
+                columnIndices.put(columnLabels[i], new Integer(i));
             }
         }
 
@@ -91,24 +91,25 @@ public ResultSetMetaData getMetaData() {
 
 
     /**
-     * Returns the specified column's index starting from 0.
+     * Returns the specified column's index starting from 0. This index is used to access FTL sequences.
      *
-     * @param name the column's name
-     * @return the column's index or {@code null} if no column with such name exists
+     * @param label the column's label
+     * @return the column's index or {@code null} if no column with such label exists
      */
-    public Integer getColumnIndex(String name) {
-        return (Integer) columnIndices.get(name);
+    public Integer getColumnIndex(String label) {
+        return (Integer) columnIndices.get(label);
     }
 
 
     /**
-     * Returns the specified column's position starting from 1.
+     * Returns the specified column's position starting from 1 as {@link ResultSet#findColumn(String)} does. This
+     * index is used in {@link ResultSetMetaData} methods.
      *
-     * @param name the column's name
-     * @return the column's position or {@code null} if no column with such name exists
+     * @param label the column's label
+     * @return the column's position or {@code null} if no column with such label exists
      */
-    public Integer getColumnPosition(String name) {
-        Integer index = getColumnIndex(name);
+    public Integer findColumn(String label) {
+        Integer index = getColumnIndex(label);
         if (index == null) return null;
         return new Integer(index.intValue() + 1);
     }

src/main/java/ftldb/ext/sql/FetchedResultSetModel.java

@@ -126,12 +126,12 @@ public TemplateCollectionModel values() {
      */
     public String getAsString() {
         StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < frs.columnNames.length; i++) {
-            sb.append(frs.columnNames[i]).append('\t');
+        for (int i = 0; i < frs.columnLabels.length; i++) {
+            sb.append(frs.columnLabels[i]).append('\t');
         }
         sb.append('\n');
         for (int ri = 0; ri < frs.data.length; ri++) {
-            for (int ci = 0; ci < frs.columnNames.length; ci++) {
+            for (int ci = 0; ci < frs.columnLabels.length; ci++) {
                 sb.append(frs.data[ri][ci]).append('\t');
             }
             sb.append('\n');

src/main/java/ftldb/ext/sql/FetchedResultSetRowModel.java

@@ -77,7 +77,7 @@ public int size() {
      * @return a list of column names ordered by position
      */
     public TemplateCollectionModel keys() throws TemplateModelException {
-        return new SimpleCollection(Arrays.asList(resultSet.columnNames), getObjectWrapper());
+        return new SimpleCollection(Arrays.asList(resultSet.columnLabels), getObjectWrapper());
     }
 
 

src/main/java/ftldb/ext/sql/FetchedResultSetTransposed.java

@@ -30,9 +30,9 @@ public FetchedResultSetTransposed(FetchedResultSet frs) {
 
         this.resultSet = frs;
 
-        transposedData = new Object[resultSet.columnNames.length][];
+        transposedData = new Object[resultSet.columnLabels.length][];
         for (int ri = 0; ri < resultSet.data.length; ri++) {
-            for (int ci = 0; ci < resultSet.columnNames.length; ci++) {
+            for (int ci = 0; ci < resultSet.columnLabels.length; ci++) {
                 if (transposedData[ci] == null) transposedData[ci] = new Object[resultSet.data.length];
                 transposedData[ci][ri] = resultSet.data[ri][ci];
             }

src/main/java/ftldb/ext/sql/FetchedResultSetTransposedModel.java

@@ -73,7 +73,7 @@ public int size() {
      * @return a list of column names ordered by position
      */
     public TemplateCollectionModel keys() throws TemplateModelException {
-        return new SimpleCollection(java.util.Arrays.asList(frst.resultSet.columnNames), getObjectWrapper());
+        return new SimpleCollection(java.util.Arrays.asList(frst.resultSet.columnLabels), getObjectWrapper());
     }
 
 

src/main/java/ftldb/oracle/Configurator.java

@@ -58,4 +58,24 @@ public static int getVersionNumber() {
     }
 
 
+    /**
+     * Returns FreeMarker version as a string.
+     *
+     * @return FreeMarker version
+     */
+    public static String getFreeMarkerVersionString() {
+        return getFreeMarkerVersion().toString();
+    }
+
+
+    /**
+     * Returns FreeMarker version as a comparable integer.
+     *
+     * @return FreeMarker version
+     */
+    public static int getFreeMarkerVersionNumber() {
+        return getFreeMarkerVersion().intValue();
+    }
+
+
 }

src/main/plsql/ftldb_api.pkb

@@ -179,8 +179,10 @@ procedure init(in_config_func_name in varchar2)
 is
   l_config_xml xmltype;
 begin
-  execute immediate 'call ' || in_config_func_name || '() into :1'
-    using out l_config_xml;
+  execute immediate
+    'call ' || dbms_assert.sql_object_name(in_config_func_name) || '() into :1'
+  using out l_config_xml;
+
   init(l_config_xml);
 end init;
 
@@ -262,6 +264,20 @@ begin
 end get_version_number;
 
 
+function get_freemarker_version return varchar2
+is
+begin
+  return ftldb_wrapper.get_freemarker_version();
+end get_freemarker_version;
+
+
+function get_freemarker_version_number return integer
+is
+begin
+  return ftldb_wrapper.get_freemarker_version_number();
+end get_freemarker_version_number;
+
+
 begin
   init();
 exception

src/main/plsql/ftldb_api.pks

@@ -196,5 +196,21 @@ function get_version return varchar2;
 function get_version_number return integer;
 
 
+/**
+ * Returns the FreeMarker version as a string.
+ *
+ * @return FreeMarker version
+ */
+function get_freemarker_version return varchar2;
+
+
+/**
+ * Returns the FreeMarker version as a comparable integer.
+ *
+ * @return FreeMarker version
+ */
+function get_freemarker_version_number return integer;
+
+
 end ftldb_api;
 /

src/main/plsql/ftldb_wrapper.pks

@@ -49,6 +49,16 @@ is
 language java name 'ftldb.oracle.Configurator.getVersionNumber() return int';
 
 
+function get_freemarker_version return varchar2
+is
+language java name 'ftldb.oracle.Configurator.getFreeMarkerVersionString() return java.lang.String';
+
+
+function get_freemarker_version_number return number
+is
+language java name 'ftldb.oracle.Configurator.getFreeMarkerVersionNumber() return int';
+
+
 procedure process(in_templ_name in varchar2, io_result in out clob)
 is
 language java name 'ftldb.oracle.TemplateProcessor.process(java.lang.String, java.sql.Clob[])';

src/test/java/ftldb/VersionTest.java

@@ -24,6 +24,7 @@ public class VersionTest {
     @Test
     public void printVersion() throws Exception {
         System.out.println("FTLDB version: " + Configurator.getVersion());
+        System.out.println("FeeMarker version: " + Configurator.getFreeMarkerVersion());
     }
 
 }