Skip to content

Commit 2976ce4

Browse files
authored
upgrade javase sqlite library to support arm m1 (#3823)
also added unit test for sqlite
1 parent d116bb5 commit 2976ce4

File tree

4 files changed

+52
-4
lines changed

4 files changed

+52
-4
lines changed

Ports/JavaSE/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<copy file="../../../codenameone-skins/iphone5_os7.skin" tofile="src/iphone5.skin" />
159159
<copy file="../../../codenameone-skins/xoom.skin" todir="src" / -->
160160
<copydir src="${project.CodenameOne}/build/classes" dest="build/classes" />
161-
<unjar src="../../../cn1-binaries/javase/sqlite-jdbc-3.7.15-M1.jar" dest="build/classes" />
161+
<unjar src="../../../cn1-binaries/javase/sqlite-jdbc-3.46.0.1.jar" dest="build/classes" />
162162
<unjar src="../../../cn1-binaries/javase/Filters.jar" dest="build/classes" />
163163
</target>
164164

Ports/JavaSE/nbproject/project.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ file.reference.Filters.jar=../../../cn1-binaries/javase/Filters.jar
3535
file.reference.jcef.jar=../../../cn1-binaries/javase/jcef.jar
3636
file.reference.jmf-2.1.1e.jar=../../../cn1-binaries/javase/jmf-2.1.1e.jar
3737
file.reference.jfxrt.jar=../../../cn1-binaries/jfxrt.jar
38-
file.reference.sqlite-jdbc-3.7.15-M1.jar=../../../cn1-binaries/javase/sqlite-jdbc-3.7.15-M1.jar
38+
file.reference.sqlite-jdbc-3.46.0.1.jar=../../../cn1-binaries/javase/sqlite-jdbc-3.46.0.1.jar
3939
includes=**
4040
jar.compress=false
4141
javafx.path=../../../cn1-binaries/javafx/lib
4242
javac.classpath=\
4343
${reference.CodenameOne.jar}:\
44-
${file.reference.sqlite-jdbc-3.7.15-M1.jar}:\
44+
${file.reference.sqlite-jdbc-3.46.0.1.jar}:\
4545
${file.reference.Filters.jar}:\
4646
${file.reference.jcef.jar}:\
4747
${file.reference.jmf-2.1.1e.jar}:\

maven/javase/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>org.xerial</groupId>
2323
<artifactId>sqlite-jdbc</artifactId>
24-
<version>3.7.15-M1</version>
24+
<version>3.46.0.1</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>com.jhlabs</groupId>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package com.codename1.db;
2+
3+
import com.codename1.testing.AbstractTest;
4+
import com.codename1.ui.Display;
5+
6+
public class SQLiteTest extends AbstractTest {
7+
8+
@Override
9+
public boolean runTest() throws Exception {
10+
Database db = null;
11+
Cursor cur = null;
12+
try {
13+
db = Display.getInstance().openOrCreate("MyDB.db");
14+
15+
db.execute("create table people (name TEXT, ssn TEXT, age INTEGER)");
16+
db.execute("insert into people (name, ssn, age) values ('John Doe', '123-45-6789', 25)");
17+
db.execute("insert into people (name, ssn, age) values ('Jane Doe', '987-65-4321', 30)");
18+
cur = db.executeQuery("select * from people");
19+
this.assertEqual(3, cur.getColumnCount(), "Column count mismatch");
20+
this.assertEqual("name", cur.getColumnName(0), "Column name mismatch");
21+
this.assertEqual("ssn", cur.getColumnName(1), "Column name mismatch");
22+
this.assertEqual("age", cur.getColumnName(2), "Column name mismatch");
23+
this.assertTrue(cur.next(), "No rows returned");
24+
this.assertEqual("John Doe", cur.getRow().getString(0), "Row data mismatch");
25+
this.assertEqual("123-45-6789", cur.getRow().getString(1), "Row data mismatch");
26+
this.assertEqual(25, cur.getRow().getInteger(2), "Row data mismatch");
27+
this.assertTrue(cur.next(), "No rows returned");
28+
this.assertEqual("Jane Doe", cur.getRow().getString(0), "Row data mismatch");
29+
this.assertEqual("987-65-4321", cur.getRow().getString(1), "Row data mismatch");
30+
this.assertEqual(30, cur.getRow().getInteger(2), "Row data mismatch");
31+
this.assertFalse(cur.next(), "Too many rows returned");
32+
} finally {
33+
if(cur != null) {
34+
cur.close();
35+
}
36+
if(db != null) {
37+
db.close();
38+
}
39+
}
40+
41+
return true;
42+
}
43+
44+
@Override
45+
public boolean shouldExecuteOnEDT() {
46+
return false;
47+
}
48+
}

0 commit comments

Comments
 (0)