Merge pull request #1581 from hausi78/bugfix/hausi78/Issue_446

Fix for issue #446: make FILE_READ from classpath working.

h2/src/main/org/h2/store/fs/FilePathDisk.java

@@ -18,6 +18,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.channels.NonWritableChannelException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,6 +45,23 @@ public class FilePathDisk extends FilePath {
 
     @Override
     public long size() {
+        if (name.startsWith(CLASSPATH_PREFIX)) {
+            try {
+                String fileName = name.substring(CLASSPATH_PREFIX.length());
+                // Force absolute resolution in Class.getResource
+                if (!fileName.startsWith("/")) {
+                    fileName = "/" + fileName;
+                }
+                URL resource = this.getClass().getResource(fileName);
+                if (resource != null) {
+                    return Files.size(Paths.get(resource.toURI()));
+                } else {
+                    return 0;
+                }
+            } catch (Exception e) {
+                return 0;
+            }
+        }
         return new File(name).length();
     }
 

h2/src/test/org/h2/test/db/TestFunctions.java

@@ -648,8 +648,14 @@ public class TestFunctions extends TestDb implements AggregateFunction {
         InputStreamReader r = new InputStreamReader(FileUtils.newInputStream(fileName));
         String ps2 = IOUtils.readStringAndClose(r, -1);
         assertEquals(ps, ps2);
-        conn.close();
         FileUtils.delete(fileName);
+        // Test classpath prefix using this test class as input
+        fileName = "/" + this.getClass().getName().replaceAll("\\.", "/") + ".class";
+        rs = stat.executeQuery("SELECT LENGTH(FILE_READ('classpath:" + fileName + "')) LEN");
+        rs.next();
+        int fileSize = rs.getInt(1);
+        assertTrue(fileSize > 0);
+        conn.close();
     }