mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-02-23 03:10:55 +00:00
* *.h/m, *.h/m): Used #include instead of depricated #import. Avoid including entire library headers. Use export macro where applicable. * EOControl/GNUmakefile: Removed EOKeyValueCodingBase.m/h and EOUndoMananger.h. Added EOArrayDataSource.m/h, EODefines.h and EODepricated.h. * EOControl/EODefines.h: Updated for GDL2 & gnustep-make. * EOControl/EODebug.h: Updated. * EOControl/EODepricated.h: Updated for current state of GDL2. ([NSObject +flushClassKeyBindings]): Added declaration. ([EOClassDescription +setDelegate:]): Added declaration. ([EOClassDescription +delegate]): Added declaration. (EOUndoManager): Moved declaration of interface here. * EOControl/EOKeyValueCoding.m ([EOClassDescription +flushClassKeyBindings]): Added empty implementation. ([NSObject takeStoredValuesFromDictionary:]): Cache EONull instance and use it instead of isKindOfClass:. * EOControl/EOEditingContext.m ([EOEditingContext +initialize]): Tidied. ([EOEditingContest -deleteObject]): Use NSUndoManager instead of EOUndoManager. * EOControl/EOQualifier.m ([NSArray -filteredArrayUsingQualifier:]): Added minor optimization tweak. * EOControl/EOClassDescription.m: Removed inactive commented code. Added private declerations of EOAccess methods to avoid compiler warnings. ([EOClassDescription +initialize]): Tidied. ([EOClassDescription -classDescriptionForClass:]): Use GSObjCName() instead of objc runtime routines. * EOControl/EOFault.m: Exchanged direct usages of ObjC runtime routines with NS/GSObjCRuntime abstraction API. ([EOFault +superclass]): Ditto. ([EOFault +targetClassForFault:]): Ditto. ([EOFault -respondsToSelector:]): Ditto. ([EOFault +initialize]): Cache static class variable. ([EOFault +isKindOfClass]): Use static class variable. ([EOFault +handlerForFault:]): Ditto. ([EOFault +targetClassForFault:]): Ditto. ([EOFault -dealloc]): Ditto. * EOControl/EOGenericRecord.m: ([EOGenericRecord +initialize]): Tidied. * EOControl/EOKeyComparisonQualifier.m: Tidied documentation. * EOControl/EOKeyValueQualifier.m: Ditto. * EOControl/EONSAddOns.h/m: Added declarations to surpress compiler warnings. ([NSObject -eoCompareOnName:]): Adjusted casts to surpress compiler warnings. (GSUseStrictWO451Compatibility): Added function. (GDL2GlobalLock, GDL2GlobalRecursive): Ditto. * EOControl/EONull: Remove implementations for foundation libraries without key value coding and fully rely on NSNull. Added assertions in all intance methods as instances should never be created. ([EONull +allocWithZone:]) Corrected method name so it will actually be used. * EOControl/EOSortOrdering.m ([NSArray sortedArrayUsingKeyOrderArray:]): Tidied. ([NSMutableArray sortUsingKeyOrderArray:]): Ditto. ([EONull compareAscending:]): Sync with referencs implementation. ([EONull compareDescending:]): Ditto. ([EONull compareCaseInsensitiveAscending:]): Ditto. ([EONull compareCaseInsensitiveDescending:]): Ditto. * EOAccess/EOAdaptor.h: Added comment about API compatibility. * EOAccess/EOAdaptor.m ([EOAdaptor -contexts]): Return array of adaptor contexts rather tham GC-wrapper objects containing adaptor contexts. ([EOAdaptor -databaseEncoding]): Use GSEncodingName() instead of GetEncodingName(). * EOAccess/EODatabaseContext.m ([EODatabaseContext -_turnFault:gid:editingContext:isComplete:]): Use GSObjCClass() instead of trying to access isa by dereferencing from id with incorrect member. * EOAccess/EOModel.m ([EOModel -entityNames]): Sort returned array to insure comparable output. * EOAccess/EOSQLExpression.m ([EOSQLExpression sqlStringForArrayOfQualifiers:operation:]): Added cast to surpress compiler warning. * EOAccess/EOUtilities.m ([EOObjectStoreCoordinator setModelGroup:]): Ditto. * EOAccess/EORelationship.h ([EORelationship -docComment]): Added declaration. * EOAccess/GNUmakefile: Added EODefines.h and EODepricated.h. * Tools/*.m: Use RCS_ID macro. * Tools/EOAttribute+GSDoc.h: ([EOAttribute gsdocContentWithTagName:idPtr:]): Corrected Typo. * Tools/EOModel+GSDoc.h/m: ([EOModel gsdocContentSplittedByEntities:idPtr:]): Ditto. * Tools/EORelationship+GSDoc.m: ([EORelationship gsdocContentWithTagName:idPtr:]): Change variable type to supress compiler warnings. * Tools/eoutil.m (dump): Initialize variables to supress compiler warnings. * Tools/gsdoc-model.m: Include GSCategories.h to supress compiler warnings. (main): Added cast to supress compiler warning. Fixed typo in method invocation. 2003-03-25 Stephane Corthesy <stephane@sente.ch> * EOControl/EODefines.h: Added new file for export/win32 support. * EOControl/EODepricated.h: Added new file for depricated features. * EOControl/EOControl.h: Added EOArrayDataSource.h and EODefines.h. * EOControl/EOArrayDataSource.h/m: Added new files. Some methods (<NSCoding> and qualifier bindings) are empty stubs. * EOControl/EODebug.h: Use export macro instead of explicit extern for function and symbol declarations. * EOControl/EOGlobalID.h: Ditto. * EOControl/EONull.h: Ditto. * EOControl/EOObjectStore.h: Ditto. * EOControl/EOOrQualifier.m: Replaced autorelease by AUTORELEASE and fixed typo. * EOControl/EOQualifier.m ([NSArray -filteredArrayUsingQualifier:]): Implemented. * EOControl/EONSAddOns.m: Use volatile in some exception handlers (man longjmp for more info). * EOControl/EOSortOrdering.h/m ([EOSortOrdering -copyWithZone:]): Implemented <NSCopying>. ([EOSortOrdering -encodeWithKeyValueArchiver:]): Implemented. * EOAccess/EODefines.h: Added new file for export/win32 support. * EOAccess/EODepricated.h: Added new file for depricated features. * EOAccess/EOAccess.h: Added EODefines.h. * EOAccess/EOSQLExpression.h/m: Fixed typo for EOPrimaryKeyConstraintKey. * EOAccess/EOExpressionArray.h/m: Use volatile for variables usein in exception handlers. (man longjmp for more info) * EOAccess/EODatabase.h: Use export macro instead of explicit extern for function and symbol declarations. * EOAccess/EOEntity.h: Ditto. * EOAccess/EOModel.h: Ditto. * EOAccess/EOSchemaGeneration.h: Ditto. * EOAccess/EOSQLExpression.h: Ditto. * EOAccess/EOUtilities.h: Ditto. * Tools/eoutil.m (dump): Implemented use of -postinstall option. Corrected bug when getting adaptor's expression class. Renamed symbol EOPrimaryKeyContraintsKey into EOPrimaryKeyConstraintsKey. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@16298 72102866-910b-0410-8b05-ffd578937521
340 lines
8.8 KiB
Objective-C
340 lines
8.8 KiB
Objective-C
/**
|
|
Postgres95Values.m
|
|
|
|
Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
|
|
|
Author: Mirko Viviani <mirko.viviani@rccr.cremona.it
|
|
Date: February 2000
|
|
|
|
$Revision$
|
|
$Date$
|
|
|
|
<abstract></abstract>
|
|
|
|
This file is part of the GNUstep Database Library.
|
|
|
|
<license>
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; see the file COPYING.LIB.
|
|
If not, write to the Free Software Foundation,
|
|
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
</license>
|
|
**/
|
|
|
|
#include "config.h"
|
|
|
|
RCS_ID("$Id$")
|
|
|
|
|
|
#ifndef NeXT_Foundation_LIBRARY
|
|
#include <Foundation/NSData.h>
|
|
#include <Foundation/NSDate.h>
|
|
#include <Foundation/NSString.h>
|
|
#include <Foundation/NSValue.h>
|
|
#include <Foundation/NSDecimalNumber.h>
|
|
#include <Foundation/NSException.h>
|
|
#include <Foundation/NSDebug.h>
|
|
#else
|
|
#include <Foundation/Foundation.h>
|
|
#endif
|
|
|
|
|
|
#include <EOAccess/EOAttribute.h>
|
|
|
|
#include <Postgres95EOAdaptor/Postgres95Adaptor.h>
|
|
#include <Postgres95EOAdaptor/Postgres95Channel.h>
|
|
#include <Postgres95EOAdaptor/Postgres95Values.h>
|
|
|
|
|
|
void __postgres95_values_linking_function (void)
|
|
{
|
|
}
|
|
|
|
//NSString *Postgres95CalendarFormat = @"%m-%d-%Y %H:%M:%S %Z";
|
|
NSString *Postgres95CalendarFormat = nil;
|
|
|
|
@implementation Postgres95Values
|
|
|
|
|
|
+ (id)newValueForBytes: (const void *)bytes
|
|
length: (int)length
|
|
attribute: (EOAttribute *)attribute
|
|
{
|
|
switch ([attribute adaptorValueType])
|
|
{
|
|
case EOAdaptorNumberType:
|
|
return [self newValueForNumberType: bytes
|
|
length: length
|
|
attribute: attribute];
|
|
case EOAdaptorCharactersType:
|
|
return [self newValueForCharactersType: bytes
|
|
length: length
|
|
attribute: attribute];
|
|
case EOAdaptorBytesType:
|
|
return [self newValueForBytesType: bytes
|
|
length: length
|
|
attribute: attribute];
|
|
case EOAdaptorDateType:
|
|
return [self newValueForDateType: bytes
|
|
length: length
|
|
attribute: attribute];
|
|
}
|
|
|
|
return nil;
|
|
}
|
|
|
|
/**
|
|
For efficiency reasons, the returned value is NOT autoreleased !
|
|
**/
|
|
+ (id)newValueForNumberType: (const void *)bytes
|
|
length: (int)length
|
|
attribute: (EOAttribute *)attribute
|
|
{
|
|
NSString *str = nil;
|
|
id value = nil;
|
|
|
|
if ([[attribute externalType] isEqualToString: @"bool"])
|
|
{
|
|
if (((char *)bytes)[0] == 't' && ((char *)bytes)[1] == 0)
|
|
return [[NSNumber alloc] initWithBool:YES];
|
|
if (((char *)bytes)[0] == 'f' && ((char *)bytes)[1] == 0)
|
|
return [[NSNumber alloc] initWithBool:NO];
|
|
}
|
|
|
|
str = [[NSString alloc] initWithCString:(char *)bytes length:length];
|
|
|
|
if ([[attribute valueClassName] isEqualToString: @"NSDecimalNumber"])
|
|
value = [[NSDecimalNumber alloc] initWithString: str];
|
|
else if ([[attribute valueType] isEqualToString: @"i"])
|
|
value = [[NSNumber alloc] initWithInt: [str intValue]];
|
|
else
|
|
value = [[NSNumber alloc] initWithDouble: [str doubleValue]];
|
|
|
|
[str release];
|
|
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
For efficiency reasons, the returned value is NOT autoreleased !
|
|
**/
|
|
+ (id)newValueForCharactersType: (const void *)bytes
|
|
length: (int)length
|
|
attribute: (EOAttribute *)attribute
|
|
{
|
|
return [attribute newValueForBytes: bytes
|
|
length: length
|
|
encoding: [NSString defaultCStringEncoding]];
|
|
}
|
|
|
|
/**
|
|
For efficiency reasons, the returned value is NOT autoreleased !
|
|
**/
|
|
+ (id)newValueForBytesType: (const void *)bytes
|
|
length: (int)length
|
|
attribute: (EOAttribute *)attribute
|
|
{
|
|
return [attribute newValueForBytes: bytes
|
|
length: length];
|
|
}
|
|
|
|
|
|
/**
|
|
For efficiency reasons, the returned value is NOT autoreleased !
|
|
**/
|
|
+ (id)newValueForDateType: (const void *)bytes
|
|
length: (int)length
|
|
attribute: (EOAttribute *)attribute
|
|
{
|
|
id d;
|
|
NSString *str = [NSString stringWithCString: bytes length: length];
|
|
NSString *format = [NSCalendarDate postgres95Format];
|
|
|
|
d = [[NSCalendarDate alloc] initWithString: str
|
|
calendarFormat: format];
|
|
// TODO server TZ ?
|
|
|
|
// NSDebugMLLog(@"gsdb",@"str=%@ d=%@ format=%@",str,d,format);
|
|
NSDebugMLog(@"str=%@ d=%@ format=%@", str, d, format);
|
|
|
|
return d;
|
|
}
|
|
|
|
|
|
@end
|
|
/*
|
|
@implementation NSString (Postgres95ValueCreation)
|
|
|
|
|
|
For efficiency reasons, the returned value is NOT autoreleased !
|
|
|
|
- stringValueForPostgres95Type:(NSString*)type
|
|
attribute:(EOAttribute*)attribute
|
|
{
|
|
if ([type isEqual:@"bytea"])
|
|
return [[NSData alloc]initWithBytes:[self cString]
|
|
length:[self cStringLength]]
|
|
stringValueForPostgres95Type:type
|
|
attribute:attribute];
|
|
else
|
|
return [[[[EOQuotedExpression alloc]
|
|
initWithExpression:self
|
|
quote:@"'"
|
|
escape:@"\\'"]
|
|
autorelease]
|
|
expressionValueForContext:nil];
|
|
return nil;
|
|
}
|
|
|
|
@end // NSString (Postgres95ValueCreation)
|
|
|
|
|
|
|
|
@implementation NSNumber (Postgres95ValueCreation)
|
|
|
|
- stringValueForPostgres95Type:(NSString*)type
|
|
attribute:(EOAttribute*)attribute;
|
|
{
|
|
if ([[attribute externalType] isEqualToString:@"bool"])
|
|
return [self boolValue] ? @"'t'" : @"'f'";
|
|
|
|
return [self description];
|
|
}
|
|
|
|
@end // NSNumber (Postgres95ValueCreation)
|
|
|
|
|
|
@implementation NSData (Postgres95ValueCreation)
|
|
|
|
|
|
- stringValueForPostgres95Type:(NSString*)type
|
|
attribute:(EOAttribute*)attribute
|
|
{
|
|
if ([[attribute externalType] isEqualToString:@"bytea"]) {
|
|
const char* bytes = [self bytes];
|
|
int length = [self length];
|
|
int final_length;
|
|
char *description, *temp;
|
|
int i;
|
|
|
|
if (!length)
|
|
return @"''";
|
|
|
|
final_length = 4 + 2 * length + 1;
|
|
description = Malloc (final_length);
|
|
temp = description + 3;
|
|
|
|
description[0] = 0;
|
|
strcat (description, "'0x");
|
|
for (i = 0; i < length; i++, temp += 2)
|
|
sprintf (temp, "%02X", (unsigned char)bytes[i]);
|
|
temp[0] = '\'';
|
|
temp[1] = 0;
|
|
|
|
return [[[NSString alloc]
|
|
initWithCStringNoCopy:description
|
|
length:final_length-1
|
|
freeWhenDone:YES]
|
|
autorelease];
|
|
}
|
|
|
|
return [[NSString stringWithCString:[self bytes] length:[self length]]
|
|
stringValueForPostgres95Type:type attribute:attribute];
|
|
}
|
|
|
|
@end // NSData (Postgres95ValueCreation)
|
|
|
|
*/
|
|
@implementation NSCalendarDate (Postgres95ValueCreation)
|
|
/*
|
|
- stringValueForPostgres95Type:(NSString*)type
|
|
attribute:(EOAttribute*)attribute
|
|
{
|
|
NSString* externalType = [attribute externalType];
|
|
if (!CALENDAR_FORMAT)
|
|
[NSCalendarDate setPostgres95Format:[NSString stringWithCString:"%b %d %Y %I:%M%p %Z"]];
|
|
|
|
if ([externalType isEqualToString:@"abstime"]) {
|
|
id tz = [attribute serverTimeZone];
|
|
id date;
|
|
|
|
if (tz) {
|
|
date = [[self copy] autorelease];
|
|
[date setTimeZone:tz];
|
|
}
|
|
else
|
|
date = self;
|
|
|
|
return [NSString stringWithFormat:@"'%@'",
|
|
[date descriptionWithCalendarFormat:CALENDAR_FORMAT]];
|
|
}
|
|
|
|
THROW([[DataTypeMappingNotSupportedException alloc]
|
|
initWithFormat:@"Postgres95 cannot map NSCalendarDate in "
|
|
@"attribute %@ to external type %@",
|
|
[attribute name], externalType]);
|
|
return nil;
|
|
}
|
|
*/
|
|
|
|
+ (NSString*)postgres95Format
|
|
{
|
|
if (!Postgres95CalendarFormat)
|
|
//Mirko: @"%d/%m/%Y %H:%M:%S.00 %Z"
|
|
[NSCalendarDate setPostgres95Format: [NSString stringWithCString: "%m-%d-%Y %H:%M:%S %Z"]]; //"%b %d %Y %I:%M%p %Z"]];
|
|
|
|
return Postgres95CalendarFormat;
|
|
}
|
|
|
|
+ (void)setPostgres95Format: (NSString*)_format
|
|
{
|
|
ASSIGN(Postgres95CalendarFormat, _format);
|
|
}
|
|
|
|
|
|
@end // NSCalendarDate (Postgres95ValueCreation)
|
|
|
|
/*
|
|
@implementation EONull (Postgres95ValueCreation)
|
|
|
|
- stringValueForPostgres95Type:(NSString*)type
|
|
attribute:(EOAttribute*)attribute
|
|
{
|
|
return @"NULL";
|
|
}
|
|
|
|
@end
|
|
|
|
|
|
@implementation NSObject (Postgres95ValueCreation)
|
|
|
|
- stringValueForPostgres95Type:(NSString*)type
|
|
attribute:(EOAttribute*)attribute
|
|
{
|
|
if ([self respondsToSelector:@selector(stringForType:)])
|
|
return [[self stringForType:[attribute valueType]]
|
|
stringValueForPostgres95Type:type attribute:attribute];
|
|
else if ([self respondsToSelector:@selector(dataForType:)])
|
|
return [[self dataForType:[attribute valueType]]
|
|
stringValueForPostgres95Type:type attribute:attribute];
|
|
else
|
|
THROW([[DataTypeMappingNotSupportedException alloc]
|
|
initWithFormat:@"Postgres95 cannot map value class %@ "
|
|
@"because its instances does not responds to either "
|
|
@" `stringForType:' or `dataForType:'. ",
|
|
NSStringFromClass([self class])]);
|
|
return nil;
|
|
}
|
|
|
|
@end // NSObject (Postgres95ValueCreation)
|
|
*/
|