Merge pull request #49 from pharo-rdbms/pharo_10

Add Pharo 10 support
pharo-rdbms · Apr 18, 2022 · 9318ee4 · 9318ee4
2 parents 4d5ebe4 + fdfb3ef
commit 9318ee4
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 25 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,3 @@
 *.st linguist-language=Smalltalk
+*.st eol=lf
+*.st text diff
diff --git a/.github/workflows/postgreSQL-integration-tests.yml b/.github/workflows/postgreSQL-integration-tests.yml
@@ -8,8 +8,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-8.0, Pharo64-9.0 ]
-        rdbms: [ PostgreSQLv10, PostgreSQLv11, PostgreSQLv12, PostgreSQLv13 ]
+        smalltalk: [ Pharo64-8.0, Pharo64-9.0, Pharo64-10 ]
+        rdbms: [ PostgreSQLv10, PostgreSQLv11, PostgreSQLv12, PostgreSQLv13, PostgreSQLv14 ]
     name: ${{ matrix.smalltalk }} + ${{ matrix.rdbms }}
     steps:
       - uses: actions/checkout@v2
@@ -22,7 +22,7 @@ jobs:
         with:
           smalltalk-image: ${{ matrix.smalltalk }}
       - name: Load Image and Run Integration Tests
-        run: smalltalkci -s ${{ matrix.smalltalk }} .PostgreSQL.ston
+        run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalkci/.PostgreSQL.ston
         timeout-minutes: 15
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/sqlite3-integration-tests.yml b/.github/workflows/sqlite3-integration-tests.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-8.0, Pharo64-9.0 ]
+        smalltalk: [ Pharo64-8.0, Pharo64-9.0, Pharo64-10 ]
     name: ${{ matrix.smalltalk }}
     steps:
       - uses: actions/checkout@v2
@@ -19,7 +19,7 @@ jobs:
         with:
           smalltalk-image: ${{ matrix.smalltalk }}
       - name: Load Image and Run Integration Tests
-        run: smalltalkci -s ${{ matrix.smalltalk }} .SQLite3.ston
+        run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalkci/.SQLite3.ston
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         timeout-minutes: 15

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-8.0, Pharo64-9.0 ]
+        smalltalk: [ Pharo64-8.0, Pharo64-9.0, Pharo64-10 ]
     name: ${{ matrix.smalltalk }}
     steps:
       - uses: actions/checkout@v2
@@ -17,7 +17,7 @@ jobs:
         with:
           smalltalk-image: ${{ matrix.smalltalk }}
       - name: Load Image and Run Unit Tests
-        run: smalltalkci -s ${{ matrix.smalltalk }} $GITHUB_WORKSPACE/.unit.ston
+        run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalkci/.unit.ston
         timeout-minutes: 10
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.PostgreSQL.ston → .smalltalkci/.PostgreSQL.ston b/.PostgreSQL.ston → .smalltalkci/.PostgreSQL.ston
@@ -2,7 +2,7 @@ SmalltalkCISpec {
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Glorp',
-      #directory : '',
+      #directory : '..',
       #load : [ 'Tests' ],
       #platforms : [  #pharo ]
     },
@@ -15,7 +15,7 @@ SmalltalkCISpec {
     }
   ],
   #postLoading : [
-    'scripts/setupP3AsDatabaseDriver.st'
+    '../scripts/setupP3AsDatabaseDriver.st'
   ],
   #testing : {
      #coverage : {

diff --git a/.SQLite3.ston → .smalltalkci/.SQLite3.ston b/.SQLite3.ston → .smalltalkci/.SQLite3.ston
@@ -2,7 +2,7 @@ SmalltalkCISpec {
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Glorp',
-      #directory : '',
+      #directory : '..',
       #load : [ 'Tests' ],
       #platforms : [  #pharo ]
     },
@@ -15,7 +15,7 @@ SmalltalkCISpec {
     }
   ],
   #postLoading : [
-    'scripts/setupSQLite3AsDatabaseDriver.st'
+    '../scripts/setupSQLite3AsDatabaseDriver.st'
   ],
   #testing : {
      #coverage : {

diff --git a/.unit.ston → .smalltalkci/.unit.ston b/.unit.ston → .smalltalkci/.unit.ston
@@ -2,7 +2,7 @@ SmalltalkCISpec {
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Glorp',
-      #directory : '',
+      #directory : '..',
       #load : [ 'CI' ],
       #platforms : [  #pharo ]
     }

diff --git a/BaselineOfGlorp/BaselineOfGlorp.class.st b/BaselineOfGlorp/BaselineOfGlorp.class.st
@@ -14,7 +14,7 @@ BaselineOfGlorp >> baseline: spec [
 				package: 'Glorp';
 				group: 'Core' with: 'Glorp';
 
-				package: 'Glorp-Unit-Tests' with: [ spec requires: 'Glorp' ];
+				package: 'Glorp-Unit-Tests' with: [ spec requires: 'Core' ];
 				group: 'Tests' with: 'Glorp-Unit-Tests';
 				group: 'CI' with: 'Glorp-Unit-Tests';
 
@@ -23,6 +23,12 @@ BaselineOfGlorp >> baseline: spec [
 
 			"This keeps backwards compatibility for people loading Glorp-Tests"
 			spec group: 'Glorp-Tests' with: 'Tests'
+			].
+	spec
+		for: #'pharo10.x'
+		do: [ spec
+				package: 'Glorp-Pharo10';
+				group: 'Core' with: 'Glorp-Pharo10'
 			]
 ]
 

diff --git a/Glorp-Pharo10/String.extension.st b/Glorp-Pharo10/String.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : #String }
+
+{ #category : #'*Glorp-Pharo10' }
+String >> convertToEncoding: encodingName [
+
+	^ self encodeWith: encodingName
+]
diff --git a/Glorp-Pharo10/package.st b/Glorp-Pharo10/package.st
@@ -0,0 +1 @@
+Package { #name : #'Glorp-Pharo10' }
diff --git a/Glorp/Dialect.class.st b/Glorp/Dialect.class.st
@@ -12,7 +12,7 @@ Class {
 		'lastSystemTime',
 		'lastServerTime'
 	],
-	#category : 'Glorp-Exceptions'
+	#category : #'Glorp-Exceptions'
 }
 
 { #category : #dates }
@@ -249,7 +249,6 @@ Dialect class >> readFixedPointFrom: aString [
 Dialect class >> reset [
 	"self reset"
 	lookedUpNames := nil.
-	identitySetClass := nil.
 	timestampClass := nil.
 	dialectName := nil
 ]

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2021 Pharo RDBMS Contributors
+Copyright (c) 2017-2022 Pharo RDBMS Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,11 +1,13 @@
 # GLORP
 
-[![Unit Tests](https://github.com/pharo-rdbms/glorp/workflows/Unit%20Tests/badge.svg?branch=master)](https://github.com/pharo-rdbms/glorp/actions?query=workflow%3AUnit%20Tests)
-[![PostgreSQL Tests](https://github.com/pharo-rdbms/glorp/workflows/PostgreSQL%20Integration%20Tests/badge.svg?branch=master)](https://github.com/pharo-rdbms/glorp/actions?query=workflow%3APostgreSQL%20Integration%20Tests)
-[![SQLite3 Tests](https://github.com/pharo-rdbms/glorp/workflows/SQLite3%20Integration%20Tests/badge.svg?branch=master)](https://github.com/pharo-rdbms/glorp/actions?query=workflow%3ASQLite3%20Integration%20Tests)
+[![Unit Tests](https://github.com/pharo-rdbms/glorp/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/pharo-rdbms/glorp/actions/workflows/unit-tests.yml)
+[![PostgreSQL Integration Tests](https://github.com/pharo-rdbms/glorp/actions/workflows/postgreSQL-integration-tests.yml/badge.svg)](https://github.com/pharo-rdbms/glorp/actions/workflows/postgreSQL-integration-tests.yml)
+[![SQLite3 Integration Tests](https://github.com/pharo-rdbms/glorp/actions/workflows/sqlite3-integration-tests.yml/badge.svg)](https://github.com/pharo-rdbms/glorp/actions/workflows/sqlite3-integration-tests.yml)
 [![Coverage Status](https://codecov.io/github/pharo-rdbms/glorp/coverage.svg?branch=master)](https://codecov.io/gh/pharo-rdbms/glorp/branch/master)
+
 [![Pharo 8.0](https://img.shields.io/badge/Pharo-8.0-informational)](https://pharo.org)
 [![Pharo 9.0](https://img.shields.io/badge/Pharo-9.0-informational)](https://pharo.org)
+[![Pharo 10](https://img.shields.io/badge/Pharo-10-informational)](https://pharo.org)
 
 ## Generic Lightweight Object Relational Persistence (for Pharo)
 

diff --git a/scripts/setup-PostgreSQL.sh b/scripts/setup-PostgreSQL.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-readonly DOCKER_IMAGE_VERSION=$(echo "$RDBMS" | cut --complement -c -11)
-  docker run -d -p 127.0.0.1:5432:5432 \
-    -e POSTGRES_PASSWORD=secret \
-    -e POSTGRES_USER=postgres \
-    -e POSTGRES_DB=test \
-    postgres:"$DOCKER_IMAGE_VERSION"
+DOCKER_IMAGE_VERSION=$(echo "$RDBMS" | cut --complement -c -11)
+docker run -d -p 127.0.0.1:5432:5432 \
+  -e POSTGRES_PASSWORD=secret \
+  -e POSTGRES_USER=postgres \
+  -e POSTGRES_DB=test \
+  postgres:"$DOCKER_IMAGE_VERSION"