Skip to content

Commit 08c134e

Browse files
gcotelligcotelli
authored
Merge branch 'master' into master
2 parents e8bf40f + 0e77c21 commit 08c134e

File tree

8 files changed

+87
-26
lines changed

8 files changed

+87
-26
lines changed

‎.github/workflows/glorp-integration-tests.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
name: GLORP Integration Tests
2-
3-
on: [push,pull_request,workflow_dispatch]
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
46

57
jobs:
68
build:
79
runs-on: ubuntu-latest
810
strategy:
911
fail-fast: false
1012
matrix:
11-
smalltalk: [ Pharo64-9.0, Pharo64-10, Pharo64-11, Pharo64-12 ]
13+
smalltalk:
14+
- Pharo64-9.0
15+
- Pharo64-10
16+
- Pharo64-11
17+
- Pharo64-12
18+
- Pharo64-13
1219
name: ${{ matrix.smalltalk }}
1320
steps:
14-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
1522
- name: Install SQLite3
1623
run: ./scripts/install-SQLite3.sh
1724
- name: Set up Smalltalk CI
@@ -24,7 +31,7 @@ jobs:
2431
env:
2532
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2633
- name: Upload coverage to Codecov
27-
uses: codecov/codecov-action@v3
34+
uses: codecov/codecov-action@v5
2835
with:
2936
name: GLORP-Integration-Tests-${{matrix.smalltalk}}
3037
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/shellcheck.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
name: Shellcheck
2-
3-
on: [push,pull_request,workflow_dispatch]
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
46

57
jobs:
68
shellcheck:
79
runs-on: ubuntu-latest
810
steps:
9-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1012
- name: Run Shellcheck
1113
uses: reviewdog/action-shellcheck@v1
1214
with:

‎.github/workflows/unit-tests.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
name: Unit Tests
2-
3-
on: [push,pull_request,workflow_dispatch]
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
46

57
jobs:
68
build:
79
runs-on: ubuntu-latest
810
strategy:
911
matrix:
10-
smalltalk: [ Pharo64-9.0, Pharo64-10, Pharo64-11, Pharo64-12 ]
12+
smalltalk:
13+
- Pharo64-9.0
14+
- Pharo64-10
15+
- Pharo64-11
16+
- Pharo64-12
17+
- Pharo64-13
1118
name: ${{ matrix.smalltalk }}
1219
steps:
13-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
1421
- name: Install SQLite3
1522
run: ./scripts/install-SQLite3.sh
1623
- name: Set up Smalltalk CI
@@ -23,7 +30,7 @@ jobs:
2330
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2431
timeout-minutes: 15
2532
- name: Upload coverage to Codecov
26-
uses: codecov/codecov-action@v3
33+
uses: codecov/codecov-action@v5
2734
with:
2835
name: Unit-Tests-${{matrix.smalltalk}}
2936
token: ${{ secrets.CODECOV_TOKEN }}

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2008-2022 Pharo RBMS Contributors
3+
Copyright (c) 2008-2025 Pharo RBMS Contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
[![Pharo](https://img.shields.io/static/v1?style=for-the-badge&message=Pharo&color=3297d4&logo=Harbor&logoColor=FFFFFF&label=)](https://www.pharo.org)
33
[![SQLite3](https://img.shields.io/static/v1?style=for-the-badge&message=SQLite3&color=044a64&logo=SQLite&logoColor=FFFFFF&label=)](https://www.sqlite.org)
44

5-
[![Unit Tests](https://github.com/pharo-rdbms/Pharo-SQLite3/workflows/Unit%20Tests/badge.svg?branch=master)](https://github.com/pharo-rdbms/Pharo-SQLite3/actions?query=workflow%3AUnit%20Tests)
6-
[![GLORP Integration Tests](https://github.com/pharo-rdbms/Pharo-SQLite3/workflows/GLORP%20Integration%20Tests/badge.svg?branch=master)](https://github.com/pharo-rdbms/Pharo-SQLite3/actions?query=workflow%3AGLORP%20Integration%20Tests)
5+
[![Unit Tests](https://github.com/pharo-rdbms/Pharo-SQLite3/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/pharo-rdbms/Pharo-SQLite3/actions/workflows/unit-tests.yml)
6+
[![GLORP Integration Tests](https://github.com/pharo-rdbms/Pharo-SQLite3/actions/workflows/glorp-integration-tests.yml/badge.svg)](https://github.com/pharo-rdbms/Pharo-SQLite3/actions/workflows/glorp-integration-tests.yml)
77
[![Coverage Status](https://codecov.io/github/pharo-rdbms/Pharo-SQLite3/coverage.svg?branch=master)](https://codecov.io/gh/pharo-rdbms/Pharo-SQLite3/branch/master)
88

99
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
@@ -43,6 +43,8 @@ a binary of SQlite for Windows is included in the **bin** folder
4343

4444
See the [getting started](doc/getting_started.md) document.
4545

46+
If you want to use [glorp](https://github.com/pharo-rdbms/glorp) see the [starting glorp](doc/starting_glorp.md) document.
47+
4648
## Project Infos
4749

4850
## History

‎doc/starting_glorp.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Starting with Glorp
2+
3+
Load into Pharo using
4+
5+
```
6+
Metacello new
7+
repository: 'github://pharo-rdbms/Pharo-SQLite3/src';
8+
baseline: 'SQLite3';
9+
load: #('glorp')
10+
```
11+
12+
Set SQLite3 as the DefaultDriver
13+
14+
```
15+
PharoDatabaseAccessor DefaultDriver: SQLite3Driver.
16+
```
17+
18+
Create the database
19+
20+
```
21+
connection := SQLite3Connection on: (Smalltalk imageDirectory / 'mydatabase.db') fullName.
22+
connection open.
23+
connection close.
24+
```
25+
26+
Login to the database
27+
28+
```
29+
login := Login new
30+
database: UDBCSQLite3Platform new;
31+
host: Smalltalk imageDirectory fullName;
32+
password:'';
33+
databaseName: 'mydatabase.db';
34+
yourself.
35+
36+
accessor := DatabaseAccessor forLogin: login.
37+
accessor login.
38+
```
39+
40+
Test that its logged in
41+
42+
```
43+
accessor isLoggedIn
44+
```

‎src/BaselineOfSQLite3/BaselineOfSQLite3.class.st‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,20 @@ BaselineOfSQLite3 >> projectClass [
5050
BaselineOfSQLite3 >> setUpDependencies: spec [
5151

5252
spec
53-
baseline: 'Glorp' with: [ spec repository: 'github://pharo-rdbms/glorp:v9.0.6/' ];
53+
baseline: 'Glorp' with: [ spec repository: 'github://pharo-rdbms/glorp/' ];
5454
project: 'Glorp-Core' copyFrom: 'Glorp' with: [ spec loads: 'Core' ];
5555
project: 'Glorp-Tests' copyFrom: 'Glorp' with: [ spec loads: 'Glorp-Integration-Tests' ]
5656
]
5757

5858
{ #category : 'baselines' }
5959
BaselineOfSQLite3 >> versionSpecificBaseline: spec [
60+
"Add version specific packages to the spec"
6061

61-
"Add version specific packages to the spec"
62-
63-
spec for: #( #'pharo7.x' #'pharo8.x' ) do: [
64-
spec
65-
package: 'SQLite3-Pharo8';
66-
group: 'Core' with: 'SQLite3-Pharo8'
67-
].
62+
spec for: #( #'pharo7.x' #'pharo8.x' ) do: [
63+
spec
64+
package: 'SQLite3-Pharo8';
65+
group: 'Core' with: 'SQLite3-Pharo8'
66+
].
6867

6968
spec for: #( #'pharo9.x' #'pharo10.x' #'pharo11.x' #'pharo12.x' #'pharo13.x' ) do: [
7069
spec

‎src/SQLite3-Core/SQLite3Library.class.st‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ SQLite3Library >> unix32LibraryName [
753753

754754
{ #category : #'private - accessing' }
755755
SQLite3Library >> unix64LibraryName [
756-
(#('/usr/lib/x86_64-linux-gnu' '/lib/x86_64-linux-gnu' '/usr/lib'),
756+
(#('/usr/lib/x86_64-linux-gnu' '/lib/x86_64-linux-gnu' '/usr/lib64' '/usr/lib'),
757757
((OSEnvironment current at: 'LD_LIBRARY_PATH' ifAbsent: [ '' ]) substrings: ':'))
758758
do: [ :path |
759759
#('libsqlite3.so.0' 'libsqlite3.so') do: [ :libraryName |
@@ -766,7 +766,7 @@ SQLite3Library >> unix64LibraryName [
766766

767767
{ #category : #'private - accessing' }
768768
SQLite3Library >> win32LibraryName [
769-
^ 'sqlite3'
769+
^ FFIWindowsLibraryFinder findLibrary: 'sqlite3.dll'
770770
]
771771

772772
{ #category : #operating }

0 commit comments

Comments
 (0)