Changeset 3597 for XerialJ/trunk/sqlite-jdbc/src

Timestamp:

09/17/09 11:10:46 (3 years ago)

Author:

leo

Message:

Applied a patch provided by Flavio Sugimoto

Location:

XerialJ/trunk/sqlite-jdbc/src

Files:

• main/java/org/sqlite/JDBC.java (modified) (2 diffs)
• main/java/org/sqlite/MetaData.java (modified) (1 diff)
• main/java/org/sqlite/SQLiteJDBCLoader.java (modified) (14 diffs)
• test/java/org/sqlite/DBMetaDataTest.java (modified) (4 diffs)
• test/java/org/sqlite/JDBCTest.java (modified) (3 diffs)

XerialJ/trunk/sqlite-jdbc/src/main/java/org/sqlite/JDBC.java

@@ -28 +28 @@
     private static final String PREFIX = "jdbc:sqlite:";
 
-    static
-    {
-        try
-        {
+    static {
+        try {
             DriverManager.registerDriver(new JDBC());
         }
-        catch (SQLException e)
-        {
+        catch (SQLException e) {
             e.printStackTrace();
         }
     }
 
-    public int getMajorVersion()
-    {
-        return 1;
+    public int getMajorVersion() {
+        return SQLiteJDBCLoader.getMajorVersion();
     }
 
-    public int getMinorVersion()
-    {
-        return 1;
+    public int getMinorVersion() {
+        return SQLiteJDBCLoader.getMinorVersion();
     }
 
-    public boolean jdbcCompliant()
-    {
+    public boolean jdbcCompliant() {
         return false;
     }
 
-    public boolean acceptsURL(String url)
-    {
+    public boolean acceptsURL(String url) {
         return url != null && url.toLowerCase().startsWith(PREFIX);
     }
 
-    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException
-    {
+    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
         DriverPropertyInfo sharedCache = new DriverPropertyInfo("shared_cache", "false");
         sharedCache.choices = new String[] { "true", "false" };
@@ -75 +67 @@
     }
 
-    public Connection connect(String url, Properties info) throws SQLException
-    {
+    public Connection connect(String url, Properties info) throws SQLException {
         if (!acceptsURL(url))
             return null;

XerialJ/trunk/sqlite-jdbc/src/main/java/org/sqlite/MetaData.java

@@ -389 +389 @@
             colType = colType == null ? "TEXT" : colType.toUpperCase();
             int colJavaType = -1;
-            if (colType == "INT" || colType == "INTEGER")
+            if (colType.equals("INT") || colType.equals("INTEGER"))
                 colJavaType = Types.INTEGER;
-            else if (colType == "TEXT")
+            else if (colType.equals("TEXT"))
                 colJavaType = Types.VARCHAR;
-            else if (colType == "FLOAT")
+            else if (colType.equals("FLOAT"))
                 colJavaType = Types.FLOAT;
             else

XerialJ/trunk/sqlite-jdbc/src/main/java/org/sqlite/SQLiteJDBCLoader.java

@@ -56 +56 @@
     private static boolean extracted = false;
 
-    public static boolean initialize()
-    {
+    public static boolean initialize() {
         loadSQLiteNativeLibrary();
         return extracted;
     }
 
-    static boolean getPureJavaFlag()
-    {
+    static boolean getPureJavaFlag() {
         return Boolean.parseBoolean(System.getProperty("sqlite.purejava", "false"));
     }
 
-    public static boolean isNativeMode()
-    {
+    public static boolean isNativeMode() {
         if (getPureJavaFlag())
             return false;
@@ -85 +82 @@
      * @throws NoSuchAlgorithmException
      */
-    static String md5sum(InputStream input) throws IOException
-    {
+    static String md5sum(InputStream input) throws IOException {
         BufferedInputStream in = new BufferedInputStream(input);
 
-        try
-        {
+        try {
             MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
             DigestInputStream digestInputStream = new DigestInputStream(in, digest);
-            for (; digestInputStream.read() >= 0;)
-            {
+            for (; digestInputStream.read() >= 0;) {
 
             }
@@ -101 +95 @@
             return md5out.toString();
         }
-        catch (NoSuchAlgorithmException e)
-        {
+        catch (NoSuchAlgorithmException e) {
             throw new IllegalStateException("MD5 algorithm is not available: " + e);
         }
-        finally
-        {
+        finally {
             in.close();
         }
@@ -120 +112 @@
      */
     private static boolean extractAndLoadLibraryFile(String libFolderForCurrentOS, String libraryFileName,
-            String targetFolder)
-    {
+            String targetFolder) {
         String nativeLibraryFilePath = libFolderForCurrentOS + "/" + libraryFileName;
         final String prefix = "sqlite-" + getVersion() + "-";
@@ -128 +119 @@
         File extractedLibFile = new File(targetFolder, extractedLibFileName);
 
-        try
-        {
-            if (extractedLibFile.exists())
-            {
+        try {
+            if (extractedLibFile.exists()) {
                 // test md5sum value
                 String md5sum1 = md5sum(SQLiteJDBCLoader.class.getResourceAsStream(nativeLibraryFilePath));
                 String md5sum2 = md5sum(new FileInputStream(extractedLibFile));
 
-                if (md5sum1.equals(md5sum2))
-                {
+                if (md5sum1.equals(md5sum2)) {
                     return loadNativeLibrary(targetFolder, extractedLibFileName);
                 }
-                else
-                {
+                else {
                     // remove old native library file
                     boolean deletionSucceeded = extractedLibFile.delete();
-                    if (!deletionSucceeded)
-                    {
+                    if (!deletionSucceeded) {
                         throw new IOException("failed to remove existing native library file: "
                                 + extractedLibFile.getAbsolutePath());
@@ -157 +143 @@
             byte[] buffer = new byte[1024];
             int bytesRead = 0;
-            while ((bytesRead = reader.read(buffer)) != -1)
-            {
+            while ((bytesRead = reader.read(buffer)) != -1) {
                 writer.write(buffer, 0, bytesRead);
             }
@@ -165 +150 @@
             reader.close();
 
-            if (!System.getProperty("os.name").contains("Windows"))
-            {
-                try
-                {
+            if (!System.getProperty("os.name").contains("Windows")) {
+                try {
                     Runtime.getRuntime().exec(new String[] { "chmod", "755", extractedLibFile.getAbsolutePath() })
                             .waitFor();
                 }
-                catch (Throwable e)
-                {}
+                catch (Throwable e) {}
             }
 
             return loadNativeLibrary(targetFolder, extractedLibFileName);
         }
-        catch (IOException e)
-        {
+        catch (IOException e) {
             System.err.println(e.getMessage());
             return false;
@@ -186 +167 @@
     }
 
-    private static synchronized boolean loadNativeLibrary(String path, String name)
-    {
+    private static synchronized boolean loadNativeLibrary(String path, String name) {
         File libPath = new File(path, name);
-        if (libPath.exists())
-        {
-            // System.setProperty("org.sqlite.lib.path", path == null ? "./" :
-            // path);
-            // System.setProperty("org.sqlite.lib.name", name);
-
-            try
-            {
+        if (libPath.exists()) {
+
+            try {
                 System.load(new File(path, name).getAbsolutePath());
                 return true;
             }
-            catch (UnsatisfiedLinkError e)
-            {
+            catch (UnsatisfiedLinkError e) {
                 System.err.println(e);
                 return false;
@@ -211 +185 @@
     }
 
-    private static void loadSQLiteNativeLibrary()
-    {
+    private static void loadSQLiteNativeLibrary() {
         if (extracted)
             return;
 
         boolean runInPureJavaMode = getPureJavaFlag();
-        if (runInPureJavaMode)
-        {
+        if (runInPureJavaMode) {
             extracted = false;
             return;
@@ -229 +201 @@
             sqliteNativeLibraryName = System.mapLibraryName("sqlitejdbc");
 
-        if (sqliteNativeLibraryPath != null)
-        {
-            if (loadNativeLibrary(sqliteNativeLibraryPath, sqliteNativeLibraryName))
-            {
+        if (sqliteNativeLibraryPath != null) {
+            if (loadNativeLibrary(sqliteNativeLibraryPath, sqliteNativeLibraryName)) {
                 extracted = true;
                 return;
@@ -241 +211 @@
         sqliteNativeLibraryPath = "/native/" + OSInfo.getNativeLibFolderPathForCurrentOS();
 
-        if (SQLiteJDBCLoader.class.getResource(sqliteNativeLibraryPath + "/" + sqliteNativeLibraryName) == null)
-        {
+        if (SQLiteJDBCLoader.class.getResource(sqliteNativeLibraryPath + "/" + sqliteNativeLibraryName) == null) {
             // use nested VM version
             return;
@@ -250 +219 @@
         String tempFolder = new File(System.getProperty("java.io.tmpdir")).getAbsolutePath();
         /* Try extracting the library from jar */
-        if (extractAndLoadLibraryFile(sqliteNativeLibraryPath, sqliteNativeLibraryName, tempFolder))
-        {
+        if (extractAndLoadLibraryFile(sqliteNativeLibraryPath, sqliteNativeLibraryName, tempFolder)) {
             extracted = true;
             return;
@@ -260 +228 @@
     }
 
-    private static void getNativeLibraryFolderForTheCurrentOS()
-    {
+    private static void getNativeLibraryFolderForTheCurrentOS() {
         String osName = OSInfo.getOSName();
         String archName = OSInfo.getArchName();
@@ -267 +234 @@
     }
 
-    public static String getVersion()
-    {
-        URL versionFile = SQLiteJDBCLoader.class.getResource("/VERSION");
+    public static int getMajorVersion() {
+        String[] c = getVersion().split("\\.");
+        return (c.length > 0) ? Integer.parseInt(c[0]) : 1;
+    }
+
+    public static int getMinorVersion() {
+        String[] c = getVersion().split("\\.");
+        return (c.length > 1) ? Integer.parseInt(c[1]) : 0;
+    }
+
+    public static String getVersion() {
+
+        URL versionFile = SQLiteJDBCLoader.class.getResource("/META-INF/maven/org.xerial/sqlite-jdbc/pom.properties");
+        if (versionFile == null)
+            versionFile = SQLiteJDBCLoader.class.getResource("/META-INF/maven/org.xerial/sqlite-jdbc/VERSION");
 
         String version = "unknown";
-        try
-        {
-            if (versionFile != null)
-            {
+        try {
+            if (versionFile != null) {
                 Properties versionData = new Properties();
                 versionData.load(versionFile.openStream());
-                version = versionData.getProperty("sqlite_version", version);
+                version = versionData.getProperty("version", version);
                 version = version.trim().replaceAll("[^0-9\\.]", "");
             }
         }
-        catch (IOException e)
-        {
+        catch (IOException e) {
             System.err.println(e);
         }

XerialJ/trunk/sqlite-jdbc/src/test/java/org/sqlite/DBMetaDataTest.java

@@ -13 +13 @@
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.Types;
 
 import org.junit.After;
@@ -37 +38 @@
         conn = DriverManager.getConnection("jdbc:sqlite:");
         stat = conn.createStatement();
-        stat.executeUpdate("create table test (id integer primary key, fn, sn);");
+        stat.executeUpdate("create table test (id integer primary key, fn float, sn);");
         stat.executeUpdate("create view testView as select * from test;");
         meta = conn.getMetaData();
@@ -125 +126 @@
         assertEquals(rs.getString("TABLE_NAME"), "test");
         assertEquals(rs.getString("COLUMN_NAME"), "id");
+        assertEquals(rs.getInt("DATA_TYPE"), Types.INTEGER);
         assertFalse(rs.next());
 
@@ -130 +132 @@
         assertTrue(rs.next());
         assertEquals(rs.getString("COLUMN_NAME"), "fn");
+        assertEquals(rs.getInt("DATA_TYPE"), Types.FLOAT);
         assertFalse(rs.next());
 

XerialJ/trunk/sqlite-jdbc/src/test/java/org/sqlite/JDBCTest.java

@@ -21 +21 @@
 {
     @BeforeClass
-    public static void forName() throws Exception
-    {
+    public static void forName() throws Exception {
         Class.forName("org.sqlite.JDBC");
     }
 
     @Test
-    public void enableLoadExtensionTest() throws Exception
-    {
+    public void enableLoadExtensionTest() throws Exception {
         Properties prop = new Properties();
         prop.setProperty("enable_load_extension", "true");
 
         Connection conn = null;
-        try
-        {
+        try {
             conn = DriverManager.getConnection("jdbc:sqlite:", prop);
             Statement stat = conn.createStatement();
@@ -48 +45 @@
 
         }
-        finally
-        {
+        finally {
             if (conn != null)
                 conn.close();
@@ -55 +51 @@
     }
 
+    @Test
+    public void majorVersion() throws Exception {
+        int major = DriverManager.getDriver("jdbc:sqlite:").getMajorVersion();
+        int minor = DriverManager.getDriver("jdbc:sqlite:").getMinorVersion();
+    }
+
 }