Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds pharo-12 to test matrix #153

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/postgreSQL-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
strategy:
fail-fast: false
matrix:
smalltalk: [ Pharo64-8.0, Pharo64-9.0, Pharo64-10, Pharo64-11 ]
rdbms: [ PostgreSQLv10, PostgreSQLv11, PostgreSQLv12, PostgreSQLv13, PostgreSQLv14 ]
smalltalk: [ Pharo64-8.0, Pharo64-9.0, Pharo64-10, Pharo64-11, Pharo64-12 ]
rdbms: [ PostgreSQLv12, PostgreSQLv13, PostgreSQLv14, PostgreSQLv15, PostgreSQLv16 ]
name: ${{ matrix.smalltalk }} + ${{ matrix.rdbms }}
steps:
- uses: actions/checkout@v2
Expand Down
13 changes: 7 additions & 6 deletions src/BaselineOfGlorp/BaselineOfGlorp.class.st
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Class {
#name : #BaselineOfGlorp,
#superclass : #BaselineOf,
#category : #BaselineOfGlorp
#name : 'BaselineOfGlorp',
#superclass : 'BaselineOf',
#category : 'BaselineOfGlorp',
#package : 'BaselineOfGlorp'
}

{ #category : #baselines }
{ #category : 'baselines' }
BaselineOfGlorp >> baseline: spec [

<baseline>
Expand All @@ -25,14 +26,14 @@ BaselineOfGlorp >> baseline: spec [
spec group: 'Glorp-Tests' with: 'Tests'
].
spec
for: #(#'pharo10.x' #'pharo11.x')
for: #(#'pharo10.x' #'pharo11.x' #'pharo12.x')
do: [ spec
package: 'Glorp-Pharo10';
group: 'Core' with: 'Glorp-Pharo10'
]
]

{ #category : #baselines }
{ #category : 'baselines' }
BaselineOfGlorp >> projectClass [

^ MetacelloCypressBaselineProject
Expand Down
2 changes: 1 addition & 1 deletion src/BaselineOfGlorp/package.st
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Package { #name : #BaselineOfGlorp }
Package { #name : 'BaselineOfGlorp' }
70 changes: 36 additions & 34 deletions src/Glorp/AbstractProxy.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,36 @@ Instance Variables:

"
Class {
#name : #AbstractProxy,
#superclass : #ProtoObject,
#name : 'AbstractProxy',
#superclass : 'ProtoObject',
#instVars : [
'value',
'isInstantiated'
],
#category : #'Glorp-Queries'
#category : 'Glorp-Queries',
#package : 'Glorp',
#tag : 'Queries'
}

{ #category : #testing }
{ #category : 'testing' }
AbstractProxy class >> isAbstract [

^ self == AbstractProxy
]

{ #category : #'instance creation' }
{ #category : 'instance creation' }
AbstractProxy class >> new [

^super new proxyInitialize
]

{ #category : #accessing }
{ #category : 'accessing' }
AbstractProxy >> = anObject [
"In VA we inherit this as identity. Need to override"
^self getValue = anObject
]

{ #category : #printing }
{ #category : 'printing' }
AbstractProxy >> basicPrintOn: aStream [
aStream nextPut: ${.
isInstantiated
Expand All @@ -44,56 +46,56 @@ AbstractProxy >> basicPrintOn: aStream [
aStream nextPut: $}
]

{ #category : #printing }
{ #category : 'printing' }
AbstractProxy >> basicPrintString [
| aStream |
aStream := WriteStream on: String new.
self basicPrintOn: aStream.
^aStream contents
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> basicSize [
^self getValue basicSize
]

{ #category : #'dnu handling' }
{ #category : 'dnu handling' }
AbstractProxy >> doesNotUnderstand: aMessage [

^self getValue perform: aMessage selector withArguments: aMessage arguments
]

{ #category : #'dnu handling' }
{ #category : 'dnu handling' }
AbstractProxy >> doesNotUnderstand: sel args: args [
"This is the variant for ObjectStudio"
^self getValue perform: sel withArguments: args
]

{ #category : #api }
{ #category : 'api' }
AbstractProxy >> getValue [

self subclassesMustImplement
]

{ #category : #notification }
{ #category : 'notification' }
AbstractProxy >> glorpPostFetch: aSession [
]

{ #category : #notification }
{ #category : 'notification' }
AbstractProxy >> glorpPostFetchValidate: aSession [
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> hash [
^self getValue hash
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> inspect [
^self getValue inspect
]

{ #category : #initialization }
{ #category : 'initialization' }
AbstractProxy >> instVarAt: index [
"Primitive. Answer a fixed variable in an object. The numbering of the
variables corresponds to the named instance variables. Fail if the index
Expand All @@ -105,46 +107,46 @@ AbstractProxy >> instVarAt: index [
^self basicAt: index - self class instSize
]

{ #category : #testing }
{ #category : 'testing' }
AbstractProxy >> isGlorpProxy [
^true
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> isImmutable [
^self getValue isImmutable
]

{ #category : #testing }
{ #category : 'testing' }
AbstractProxy >> isInstantiated [
isInstantiated isNil ifTrue: [isInstantiated := false].
^isInstantiated
]

{ #category : #accessing }
{ #category : 'accessing' }
AbstractProxy >> isKindOf: aClass [
self isInstantiated ifTrue: [^value isKindOf: aClass].
^false
]

{ #category : #testing }
{ #category : 'testing' }
AbstractProxy >> isNumber [

^false
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> isSelfEvaluating [
^false
]

{ #category : #testing }
{ #category : 'testing' }
AbstractProxy >> isString [

^false
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> longPrintOn: aStream limitedTo: sizeLimit indent: indent [
"Append to the argument, aStream, the names and values of all of the receiver's instance variables. Limit is the length limit for each inst var."

Expand All @@ -160,7 +162,7 @@ AbstractProxy >> longPrintOn: aStream limitedTo: sizeLimit indent: indent [
cr]
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> longPrintStringLimitedTo: aLimitValue [
"Answer a String whose characters are a description of the receiver."

Expand All @@ -170,7 +172,7 @@ AbstractProxy >> longPrintStringLimitedTo: aLimitValue [
^ str isEmpty ifTrue: [self printString, String cr] ifFalse: [str]
]

{ #category : #printing }
{ #category : 'printing' }
AbstractProxy >> printOn: aStream [
aStream nextPut: ${.
isInstantiated
Expand All @@ -179,7 +181,7 @@ AbstractProxy >> printOn: aStream [
aStream nextPut: $}
]

{ #category : #printing }
{ #category : 'printing' }
AbstractProxy >> printString [

| aStream |
Expand All @@ -188,7 +190,7 @@ AbstractProxy >> printString [
^aStream contents
]

{ #category : #printing }
{ #category : 'printing' }
AbstractProxy >> printStringLimitedTo: limit [
"Answer a String whose characters are a description of the receiver.
If you want to print without a character limit, use fullPrintString."
Expand All @@ -198,32 +200,32 @@ AbstractProxy >> printStringLimitedTo: limit [
^ limitedString , '...etc...'
]

{ #category : #initialization }
{ #category : 'initialization' }
AbstractProxy >> proxyInitialize [

isInstantiated := false
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> shouldBePrintedAsLiteral [

^false
]

{ #category : #overrides }
{ #category : 'overrides' }
AbstractProxy >> store [
"For Object Studio compatibility"
^self inspectorString.
]

{ #category : #accessing }
{ #category : 'accessing' }
AbstractProxy >> uninstantiate [

value := nil.
isInstantiated := false
]

{ #category : #accessing }
{ #category : 'accessing' }
AbstractProxy >> ~= anObject [

^(self = anObject) not
Expand Down
Loading
Loading