ObjFW/ObjPgSQL
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Compare commits

base: ObjFW:1.0-release
Branches Tags
ObjFW:main
ObjFW:1.0.1-release
ObjFW:1.0-release
..
compare: ObjFW:main
Branches Tags
ObjFW:main
ObjFW:1.0.1-release
ObjFW:1.0-release

4 commits
1.0-releas ... main

Author SHA1 Message Date
Jonathan Schleifer
d8f53de646
Update copyright & URL 2025-06-24 18:35:30 +02:00
Jonathan Schleifer
b75455125a
Set version to 1.0.1 2025-06-23 23:20:21 +02:00
Jonathan Schleifer
68fff75083 Use ARC functions for RR 
FossilOrigin-Name: a19b24ae129c1144fed2ba35d5a57ff2298b58ebb3c8f5071613e9efe67e4f63
 2025-04-19 13:34:33 +00:00
Jonathan Schleifer
bf51ce812c Include includedir in .oc file 
FossilOrigin-Name: 7c54d67cf30ec374b8f855873ce30d488dd86160bc366ff2c44f3dacf18e00ca
 2024-08-17 00:33:22 +00:00
19 changed files with 79 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ObjPgSQL.oc.in
View file

@ -1,5 +1,5 @@
package_format 1 package_format 1
CPPFLAGS="$CPPFLAGS @LIBPQ_CPPFLAGS@" CPPFLAGS="$CPPFLAGS -I@includedir@ @LIBPQ_CPPFLAGS@"
LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $LIBS" LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $LIBS"
FRAMEWORK_LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $FRAMEWORK_LIBS" FRAMEWORK_LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $FRAMEWORK_LIBS"
STATIC_LIBS="@libdir@/libobjpgsql.a @LIBPQ_LIBS@ $STATIC_LIBS" STATIC_LIBS="@libdir@/libobjpgsql.a @LIBPQ_LIBS@ $STATIC_LIBS"

3
meson.build
View file

@ -1,5 +1,5 @@
project('ObjPgSQL', 'objc', project('ObjPgSQL', 'objc',
version: '1.0', version: '1.0.1',
meson_version: '>= 1.5.0', meson_version: '>= 1.5.0',
default_options: { default_options: {
'warning_level': '3', 'warning_level': '3',
@ -31,6 +31,7 @@ configure_file(
input: 'ObjPgSQL.oc.in', input: 'ObjPgSQL.oc.in',
output: 'ObjPgSQL.oc', output: 'ObjPgSQL.oc',
configuration: { configuration: {
'includedir': get_option('prefix') / get_option('includedir'),
'libdir': get_option('prefix') / get_option('libdir'), 'libdir': get_option('prefix') / get_option('libdir'),
'LIBPQ_CPPFLAGS': libpq_cflags, 'LIBPQ_CPPFLAGS': libpq_cflags,
'LIBPQ_LIBS': libpq_libs, 'LIBPQ_LIBS': libpq_libs,

4
src/ObjPgSQL.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

4
src/PGSQLConnection+Private.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

4
src/PGSQLConnection.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

8
src/PGSQLConnection.m
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -34,7 +34,7 @@
@try { @try {
_parameters = [[OFDictionary alloc] init]; _parameters = [[OFDictionary alloc] init];
} @catch (id e) { } @catch (id e) {
[self release]; objc_release(self);
@throw e; @throw e;
} }
@ -43,7 +43,7 @@
- (void)dealloc - (void)dealloc
{ {
[_parameters release]; objc_release(_parameters);
[self close]; [self close];

4
src/PGSQLResult+Private.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

4
src/PGSQLResult.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

7
src/PGSQLResult.m
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -26,7 +26,8 @@
+ (instancetype)pg_resultWithResult: (PGresult *)result + (instancetype)pg_resultWithResult: (PGresult *)result
{ {
return [[[self alloc] pg_initWithResult: result] autorelease]; return objc_autoreleaseReturnValue(
[[self alloc] pg_initWithResult: result]);
} }
- (instancetype)pg_initWithResult: (PGresult *)result - (instancetype)pg_initWithResult: (PGresult *)result

4
src/PGSQLResultRow+Private.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

4
src/PGSQLResultRow.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

47
src/PGSQLResultRow.m
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -65,23 +65,29 @@ convertType(PGresult *res, int column, OFString *string)
@implementation PGSQLResultRow @implementation PGSQLResultRow
+ (instancetype)pg_rowWithResult: (PGSQLResult *)result row: (int)row + (instancetype)pg_rowWithResult: (PGSQLResult *)result row: (int)row
{ {
return [[[self alloc] pg_initWithResult: result row: row] autorelease]; return objc_autoreleaseReturnValue(
[[self alloc] pg_initWithResult: result row: row]);
} }
- (instancetype)pg_initWithResult: (PGSQLResult *)result row: (int)row - (instancetype)pg_initWithResult: (PGSQLResult *)result row: (int)row
{ {
self = [super init]; self = [super init];
_result = [result retain]; @try {
_res = result.pg_result; _result = objc_retain(result);
_row = row; _res = result.pg_result;
_row = row;
} @catch (id e) {
objc_release(self);
@throw e;
}
return self; return self;
} }
- (void)dealloc - (void)dealloc
{ {
[_result release]; objc_release(_result);
[super dealloc]; [super dealloc];
} }
@ -115,16 +121,16 @@ convertType(PGresult *res, int column, OFString *string)
- (OFEnumerator *)keyEnumerator - (OFEnumerator *)keyEnumerator
{ {
return [[[PGSQLResultRowKeyEnumerator alloc] return objc_autoreleaseReturnValue(
initWithResult: _result [[PGSQLResultRowKeyEnumerator alloc] initWithResult: _result
row: _row] autorelease]; row: _row]);
} }
- (OFEnumerator *)objectEnumerator - (OFEnumerator *)objectEnumerator
{ {
return [[[PGSQLResultRowObjectEnumerator alloc] return objc_autoreleaseReturnValue(
initWithResult: _result [[PGSQLResultRowObjectEnumerator alloc] initWithResult: _result
row: _row] autorelease]; row: _row]);
} }
- (int)countByEnumeratingWithState: (OFFastEnumerationState *)state - (int)countByEnumeratingWithState: (OFFastEnumerationState *)state
@ -165,17 +171,22 @@ convertType(PGresult *res, int column, OFString *string)
{ {
self = [super init]; self = [super init];
_result = [result retain]; @try {
_res = result.pg_result; _result = objc_retain(result);
_row = row; _res = result.pg_result;
_count = PQnfields(_res); _row = row;
_count = PQnfields(_res);
} @catch (id e) {
objc_release(self);
@throw e;
}
return self; return self;
} }
- (void)dealloc - (void)dealloc
{ {
[_result release]; objc_release(_result);
[super dealloc]; [super dealloc];
} }

4
src/exceptions/PGSQLConnectionFailedException.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

4
src/exceptions/PGSQLConnectionFailedException.m
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

4
src/exceptions/PGSQLException.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

15
src/exceptions/PGSQLException.m
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -29,7 +29,8 @@
+ (instancetype)exceptionWithConnection: (PGSQLConnection *)connection + (instancetype)exceptionWithConnection: (PGSQLConnection *)connection
{ {
return [[[self alloc] initWithConnection: connection] autorelease]; return objc_autoreleaseReturnValue(
[[self alloc] initWithConnection: connection]);
} }
- (instancetype)init - (instancetype)init
@ -42,12 +43,12 @@
self = [super init]; self = [super init];
@try { @try {
_connection = [connection retain]; _connection = objc_retain(connection);
_errorMessage = [[OFString alloc] _errorMessage = [[OFString alloc]
initWithCString: PQerrorMessage([_connection pg_connection]) initWithCString: PQerrorMessage([_connection pg_connection])
encoding: [OFLocale encoding]]; encoding: [OFLocale encoding]];
} @catch (id e) { } @catch (id e) {
[self release]; objc_release(self);
@throw e; @throw e;
} }
@ -56,8 +57,8 @@
- (void)dealloc - (void)dealloc
{ {
[_connection release]; objc_release(_connection);
[_errorMessage release]; objc_release(_errorMessage);
[super dealloc]; [super dealloc];
} }

4
src/exceptions/PGSQLExecuteCommandFailedException.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

13
src/exceptions/PGSQLExecuteCommandFailedException.m
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -29,8 +29,9 @@
+ (instancetype)exceptionWithConnection: (PGSQLConnection *)connection + (instancetype)exceptionWithConnection: (PGSQLConnection *)connection
command: (OFConstantString *)command command: (OFConstantString *)command
{ {
return [[[self alloc] initWithConnection: connection return objc_autoreleaseReturnValue(
command: command] autorelease]; [[self alloc] initWithConnection: connection
command: command]);
} }
- (instancetype)initWithConnection: (PGSQLConnection *)connection - (instancetype)initWithConnection: (PGSQLConnection *)connection
@ -46,7 +47,7 @@
@try { @try {
_command = [command copy]; _command = [command copy];
} @catch (id e) { } @catch (id e) {
[self release]; objc_release(self);
@throw e; @throw e;
} }
@ -55,7 +56,7 @@
- (void)dealloc - (void)dealloc
{ {
[_command release]; objc_release(_command);
[super dealloc]; [super dealloc];
} }

4
tests/Tests.m
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2012 - 2019, 2021, 2024 Jonathan Schleifer <js@nil.im> * Copyright (c) 2012 - 2019, 2021, 2024, 2025 Jonathan Schleifer <js@nil.im>
* *
* https://fl.nil.im/objpgsql * https://git.nil.im/ObjFW/ObjPgSQL
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above