2002-11-15 22:57:05 +00:00
|
|
|
/**
|
|
|
|
EOAdaptor.m <title>EOAdaptor Class</title>
|
|
|
|
|
2005-08-17 08:07:57 +00:00
|
|
|
Copyright (C) 1996-2001,2002,2003,2004,2005 Free Software Foundation, Inc.
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
Author: Ovidiu Predescu <ovidiu@bx.logicnet.ro>
|
|
|
|
Date: October 1996
|
|
|
|
|
2006-09-14 16:06:21 +00:00
|
|
|
Author: Mirko Viviani <mirko.viviani@gmail.com>
|
2002-11-15 22:57:05 +00:00
|
|
|
Date: February 2000
|
|
|
|
|
2010-06-01 00:29:37 +00:00
|
|
|
Author: David Wetzel <dave@turbocat.de>
|
|
|
|
Date: 2010
|
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
$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
|
2007-07-12 06:39:22 +00:00
|
|
|
version 3 of the License, or (at your option) any later version.
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
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,
|
2005-08-17 08:07:57 +00:00
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2002-11-15 22:57:05 +00:00
|
|
|
</license>
|
|
|
|
**/
|
|
|
|
|
2002-12-31 16:25:21 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
RCS_ID("$Id$")
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
#if HAVE_LIBC_H
|
|
|
|
# include <libc.h>
|
|
|
|
#else
|
|
|
|
#ifndef __WIN32__
|
|
|
|
# include <unistd.h>
|
|
|
|
#endif /* !__WIN32__ */
|
|
|
|
#endif
|
|
|
|
|
2003-03-31 00:24:15 +00:00
|
|
|
#include <Foundation/Foundation.h>
|
|
|
|
|
2003-07-11 19:04:05 +00:00
|
|
|
#ifndef GNUSTEP
|
2003-08-25 20:01:59 +00:00
|
|
|
#include <GNUstepBase/GNUstep.h>
|
2010-04-26 21:52:42 +00:00
|
|
|
#include <GNUstepBase/NSDebug+GNUstepBase.h>
|
2010-06-09 12:48:33 +00:00
|
|
|
#include <GNUstepBase/NSObject+GNUstepBase.h>
|
|
|
|
#include <GNUstepBase/NSString+GNUstepBase.h>
|
2003-07-11 19:04:05 +00:00
|
|
|
#endif
|
|
|
|
|
2010-06-04 05:41:58 +00:00
|
|
|
#include <GNUstepBase/GSMime.h>
|
2003-08-25 20:01:59 +00:00
|
|
|
#include <GNUstepBase/Unicode.h>
|
2003-03-31 00:24:15 +00:00
|
|
|
|
|
|
|
#include <EOControl/EONSAddOns.h>
|
|
|
|
#include <EOControl/EODebug.h>
|
|
|
|
|
* EOControl/EOAndQualifier.m,
* EOControl/EOFault.m,
* EOControl/EOFaultHandler.m,
* EOControl/EOKeyComparisonQualifier.m,
* EOControl/EOKeyValueArchiver.m,
* EOControl/EOKeyValueCoding.m,
* EOControl/EOKeyValueCodingBase.m,
* EOControl/EOMutableKnownKeyDictionary.h,
* EOControl/EONotQualifier.m,
* EOControl/EOOrQualifier.m,
* EOControl/EOQualifier.m,
* EOAccess/EOAdaptor.m,
* EOAccess/EOAdaptorContext.m,
* EOAccess/EOAttribute.m,
* EOAccess/EODatabase.m,
* EOAccess/EODatabaseContext.m,
* EOAccess/EOExpressionArray.m,
* EOAccess/EOJoin.m,
* EOAccess/EOModel.m,
* EOAccess/EOModelGroup.m,
* EOAccess/EORelationship.m,
* EOAccess/EOSQLExpression.m,
* EOAccess/EOSQLQualifier.m,
* EOAccess/EOSchemaGeneration.m,
* EOAccess/EOStoredProcedure.m,
* EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m,
* EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m,
* EOAdaptors/PostgreSQLAdaptor/PostgreSQLExpression.m,
* EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.m,
* EOAdaptors/SQLiteAdaptor/SQLite3Channel.m,
* EOInterface/EOTableViewAssociation.m,
* EOModeler/EOModelExtensions.m,
* EOModeler/EOModelerApp.m,
* DBModeler/ModelerAttributeEditor.m,
* DBModeler/ModelerEntityEditor.m: Remove references to NSUtilities.h.
Add includes for missing header references.
* DBModeler/Modeler.m (-[showEditor:]): Add cast to avoid compiler
warning.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@25994 72102866-910b-0410-8b05-ffd578937521
2008-01-22 13:57:07 +00:00
|
|
|
#include "EOAccess/EOAdaptor.h"
|
|
|
|
#include "EOAccess/EOAdaptorContext.h"
|
|
|
|
#include "EOAccess/EOAdaptorChannel.h"
|
|
|
|
#include "EOAccess/EOAttribute.h"
|
|
|
|
#include "EOAccess/EOEntity.h"
|
|
|
|
#include "EOAccess/EOModel.h"
|
|
|
|
#include "EOAccess/EOSQLExpression.h"
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2004-07-23 18:33:29 +00:00
|
|
|
#include "EOAdaptorPriv.h"
|
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
NSString *EOGeneralAdaptorException = @"EOGeneralAdaptorException";
|
|
|
|
|
2004-02-22 17:05:48 +00:00
|
|
|
NSString *EOAdministrativeConnectionDictionaryNeededNotification
|
|
|
|
= @"EOAdministrativeConnectionDictionaryNeededNotification";
|
|
|
|
NSString *EOAdaptorKey = @"EOAdaptorKey";
|
|
|
|
NSString *EOModelKey = @"EOModelKey";
|
2004-02-23 19:57:14 +00:00
|
|
|
NSString *EOConnectionDictionaryKey = @"EOConnectionDictionaryKey";
|
2004-02-22 17:05:48 +00:00
|
|
|
NSString *EOAdministrativeConnectionDictionaryKey
|
|
|
|
= @"EOAdministrativeConnectionDictionaryKey";
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
@implementation EOAdaptor
|
|
|
|
|
|
|
|
+ (id)adaptorWithModel: (EOModel *)model
|
|
|
|
{
|
|
|
|
//OK
|
|
|
|
/* Check first to see if the adaptor class exists in the running program
|
|
|
|
by testing the existence of [_model adaptorClassName]. */
|
|
|
|
EOAdaptor *adaptor = nil;
|
|
|
|
|
|
|
|
if(!model)
|
|
|
|
[NSException raise: NSInvalidArgumentException
|
|
|
|
format: @"%@ -- %@ 0x%x: no model specified",
|
|
|
|
NSStringFromSelector(_cmd),
|
|
|
|
NSStringFromClass([self class]),
|
|
|
|
self];
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NSString *adaptorName = [model adaptorName];
|
|
|
|
|
|
|
|
if (!adaptorName)
|
|
|
|
[NSException raise: NSInvalidArgumentException
|
|
|
|
format: @"%@ -- %@ 0x%x: no adaptor name in model named %@",
|
|
|
|
NSStringFromSelector(_cmd),
|
|
|
|
NSStringFromClass([self class]),
|
|
|
|
self,
|
|
|
|
[model name]];
|
|
|
|
else
|
|
|
|
{
|
2004-02-12 17:09:37 +00:00
|
|
|
NSString *className;
|
|
|
|
Class adaptorClass;
|
|
|
|
|
|
|
|
className = [adaptorName stringByAppendingString: @"Adaptor"];
|
|
|
|
adaptorClass = NSClassFromString(className);
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
if(adaptorClass)
|
2003-02-06 David Ayers <d.ayers@inode.at>
* EOAccess/EOModel.m
([EOModel -encodeTableOfContentsIntoPropertyList:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -encodeIntoPropertyList:]), ([EOModel -addEntity:]),
([EOModel -removeEntity:]), ([EOModel -beautifyNames]),
([EOModel -setCreateMutableObjects:]):
Do not access _entities until cache is triggered.
* EOAccess/EOModel.m
([EOModel +findPathForModelNamed:]),
([EOModel -gcDecrementRefCountOfContainedObjects]),
([EOModel -storedProcedures]), ([EOModel -initWithContentsOfFile:]),
([EOModel -initWithTableOfContentsPropertyList:path:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -_classDescriptionNeeded:]), ([EOModel -_entityForClass:]),
([EOModel -_addEntityWithPropertyList:]), ([EOModel -_addEntity:]),
([EOModel -_verifyBuiltEntityObject:named:]):
replaced NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOModel.m ([EOModel -description]), ([EOModel
-addEntity]), ([EOModel removeEntity]): Make temporary objects
autoreleased versions instead explicit release handling.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]):
reinserted accessing adaptor class by principal class of bundle as
fallback in case EOAdaptorClassName isn't found. Raise an
exception if the provided class is not a subclass of EOAdaptor.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]),
([EOAdaptor -fetchedValueForValue:attribute]),
([EOAdaptor -fetchedValueForStringValue:attribute]):
replaced NSLog/NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithModel:]),
([EOAdaptor +adaptorWithName:]),
([EOAdaptor +availableAdaptorNames]):
replaced autorelease with AUTORELEASE().
* EOAdaptors/Postgres95Adaptor/Info.plist: Added
EOAdaptorClassName entry.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15900 72102866-910b-0410-8b05-ffd578937521
2003-02-06 21:18:29 +00:00
|
|
|
adaptor = AUTORELEASE([[adaptorClass alloc] initWithName: adaptorName]);
|
2002-11-15 22:57:05 +00:00
|
|
|
else
|
|
|
|
adaptor = [self adaptorWithName: adaptorName];
|
|
|
|
|
|
|
|
[adaptor setModel: model];
|
|
|
|
[adaptor setConnectionDictionary: [model connectionDictionary]];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return adaptor;
|
|
|
|
}
|
|
|
|
|
2007-01-01 11:52:38 +00:00
|
|
|
+ (id) adaptorWithName: (NSString *)name
|
2002-11-15 22:57:05 +00:00
|
|
|
{
|
|
|
|
//OK
|
|
|
|
NSBundle *bundle = [NSBundle mainBundle];
|
|
|
|
NSString *adaptorBundlePath;
|
2004-02-01 11:23:44 +00:00
|
|
|
NSArray *paths;
|
2002-11-15 22:57:05 +00:00
|
|
|
Class adaptorClass;
|
|
|
|
NSString *adaptorClassName;
|
2005-02-20 20:58:28 +00:00
|
|
|
unsigned i, count;
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
/* Check error */
|
2007-01-01 11:52:38 +00:00
|
|
|
if ([name length] == 0)
|
2002-11-15 22:57:05 +00:00
|
|
|
[NSException raise: NSInvalidArgumentException
|
|
|
|
format: @"%@ -- %@ 0x%x: adaptor name can't be nil",
|
|
|
|
NSStringFromSelector(_cmd),
|
|
|
|
NSStringFromClass([self class]),
|
|
|
|
self];
|
|
|
|
|
|
|
|
// append EOAdaptor
|
2007-01-01 11:52:38 +00:00
|
|
|
if ([name hasSuffix: @"EOAdaptor"] == NO)
|
|
|
|
name = [name stringByAppendingString: @"EOAdaptor"];
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
/* Look in application bundle */
|
2007-01-01 11:52:38 +00:00
|
|
|
adaptorBundlePath = [bundle pathForResource: name
|
2002-11-15 22:57:05 +00:00
|
|
|
ofType: @"framework"];
|
|
|
|
// should be NSString *path=[NSBundle pathForLibraryResource:libraryResource type:@"framework" directory:@"Frameworks"]; ?
|
|
|
|
|
|
|
|
/* Look in standard paths */
|
|
|
|
if (!adaptorBundlePath)
|
|
|
|
{
|
2004-02-01 11:23:44 +00:00
|
|
|
SEL sel = @selector(stringByAppendingPathComponent:);
|
2002-11-15 22:57:05 +00:00
|
|
|
/*
|
2004-02-01 11:23:44 +00:00
|
|
|
The path of where to search for the adaptor files.
|
2002-11-15 22:57:05 +00:00
|
|
|
*/
|
|
|
|
|
2004-02-01 11:23:44 +00:00
|
|
|
paths
|
|
|
|
= NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory,
|
|
|
|
NSAllDomainsMask, NO);
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2004-02-01 11:23:44 +00:00
|
|
|
paths = [paths resultsOfPerformingSelector: sel
|
|
|
|
withObject: @"Frameworks"];
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
/* Loop through the paths and check each one */
|
|
|
|
for(i = 0, count = [paths count]; i < count; i++)
|
|
|
|
{
|
|
|
|
bundle = [NSBundle bundleWithPath: [paths objectAtIndex: i]];
|
2007-01-01 11:52:38 +00:00
|
|
|
adaptorBundlePath = [bundle pathForResource: name
|
2002-11-15 22:57:05 +00:00
|
|
|
ofType: @"framework"];
|
|
|
|
|
|
|
|
if(adaptorBundlePath && [adaptorBundlePath length])
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make adaptor bundle */
|
|
|
|
if(adaptorBundlePath)
|
|
|
|
bundle = [NSBundle bundleWithPath: adaptorBundlePath];
|
|
|
|
else
|
|
|
|
bundle = nil;
|
|
|
|
|
|
|
|
/* Check bundle */
|
|
|
|
if (!bundle)
|
|
|
|
[NSException raise: NSInvalidArgumentException
|
|
|
|
format: @"%@ -- %@ 0x%x: the adaptor bundle '%@' does not exist",
|
|
|
|
NSStringFromSelector(_cmd),
|
|
|
|
NSStringFromClass([self class]),
|
|
|
|
self,
|
2007-01-01 11:52:38 +00:00
|
|
|
name];
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
/* Get the adaptor bundle "infoDictionary", and pricipal class, ie. the
|
|
|
|
adaptor class. Other info about the adaptor should be put in the
|
|
|
|
bundle's "Info.plist" file (property list format - see NSBundle class
|
|
|
|
documentation for details about reserved keys in this dictionary
|
|
|
|
property list containing one entry whose key is adaptorClassName. It
|
|
|
|
identifies the actual adaptor class from the bundle. */
|
|
|
|
|
2003-02-03 14:53:03 +00:00
|
|
|
if(![bundle isLoaded])
|
2003-02-06 David Ayers <d.ayers@inode.at>
* EOAccess/EOModel.m
([EOModel -encodeTableOfContentsIntoPropertyList:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -encodeIntoPropertyList:]), ([EOModel -addEntity:]),
([EOModel -removeEntity:]), ([EOModel -beautifyNames]),
([EOModel -setCreateMutableObjects:]):
Do not access _entities until cache is triggered.
* EOAccess/EOModel.m
([EOModel +findPathForModelNamed:]),
([EOModel -gcDecrementRefCountOfContainedObjects]),
([EOModel -storedProcedures]), ([EOModel -initWithContentsOfFile:]),
([EOModel -initWithTableOfContentsPropertyList:path:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -_classDescriptionNeeded:]), ([EOModel -_entityForClass:]),
([EOModel -_addEntityWithPropertyList:]), ([EOModel -_addEntity:]),
([EOModel -_verifyBuiltEntityObject:named:]):
replaced NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOModel.m ([EOModel -description]), ([EOModel
-addEntity]), ([EOModel removeEntity]): Make temporary objects
autoreleased versions instead explicit release handling.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]):
reinserted accessing adaptor class by principal class of bundle as
fallback in case EOAdaptorClassName isn't found. Raise an
exception if the provided class is not a subclass of EOAdaptor.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]),
([EOAdaptor -fetchedValueForValue:attribute]),
([EOAdaptor -fetchedValueForStringValue:attribute]):
replaced NSLog/NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithModel:]),
([EOAdaptor +adaptorWithName:]),
([EOAdaptor +availableAdaptorNames]):
replaced autorelease with AUTORELEASE().
* EOAdaptors/Postgres95Adaptor/Info.plist: Added
EOAdaptorClassName entry.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15900 72102866-910b-0410-8b05-ffd578937521
2003-02-06 21:18:29 +00:00
|
|
|
EOFLOGClassLevelArgs(@"gsdb", @"Loaded %@? %@", bundle, ([bundle load]? @"YES":@"NO"));
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2003-02-03 14:53:03 +00:00
|
|
|
adaptorClassName = [[bundle infoDictionary] objectForKey: @"EOAdaptorClassName"];
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2003-02-06 David Ayers <d.ayers@inode.at>
* EOAccess/EOModel.m
([EOModel -encodeTableOfContentsIntoPropertyList:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -encodeIntoPropertyList:]), ([EOModel -addEntity:]),
([EOModel -removeEntity:]), ([EOModel -beautifyNames]),
([EOModel -setCreateMutableObjects:]):
Do not access _entities until cache is triggered.
* EOAccess/EOModel.m
([EOModel +findPathForModelNamed:]),
([EOModel -gcDecrementRefCountOfContainedObjects]),
([EOModel -storedProcedures]), ([EOModel -initWithContentsOfFile:]),
([EOModel -initWithTableOfContentsPropertyList:path:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -_classDescriptionNeeded:]), ([EOModel -_entityForClass:]),
([EOModel -_addEntityWithPropertyList:]), ([EOModel -_addEntity:]),
([EOModel -_verifyBuiltEntityObject:named:]):
replaced NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOModel.m ([EOModel -description]), ([EOModel
-addEntity]), ([EOModel removeEntity]): Make temporary objects
autoreleased versions instead explicit release handling.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]):
reinserted accessing adaptor class by principal class of bundle as
fallback in case EOAdaptorClassName isn't found. Raise an
exception if the provided class is not a subclass of EOAdaptor.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]),
([EOAdaptor -fetchedValueForValue:attribute]),
([EOAdaptor -fetchedValueForStringValue:attribute]):
replaced NSLog/NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithModel:]),
([EOAdaptor +adaptorWithName:]),
([EOAdaptor +availableAdaptorNames]):
replaced autorelease with AUTORELEASE().
* EOAdaptors/Postgres95Adaptor/Info.plist: Added
EOAdaptorClassName entry.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15900 72102866-910b-0410-8b05-ffd578937521
2003-02-06 21:18:29 +00:00
|
|
|
EOFLOGClassLevelArgs(@"gsdb", @"adaptorClassName is %@", adaptorClassName);
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2003-02-03 14:53:03 +00:00
|
|
|
adaptorClass = NSClassFromString(adaptorClassName);
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2003-02-06 David Ayers <d.ayers@inode.at>
* EOAccess/EOModel.m
([EOModel -encodeTableOfContentsIntoPropertyList:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -encodeIntoPropertyList:]), ([EOModel -addEntity:]),
([EOModel -removeEntity:]), ([EOModel -beautifyNames]),
([EOModel -setCreateMutableObjects:]):
Do not access _entities until cache is triggered.
* EOAccess/EOModel.m
([EOModel +findPathForModelNamed:]),
([EOModel -gcDecrementRefCountOfContainedObjects]),
([EOModel -storedProcedures]), ([EOModel -initWithContentsOfFile:]),
([EOModel -initWithTableOfContentsPropertyList:path:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -_classDescriptionNeeded:]), ([EOModel -_entityForClass:]),
([EOModel -_addEntityWithPropertyList:]), ([EOModel -_addEntity:]),
([EOModel -_verifyBuiltEntityObject:named:]):
replaced NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOModel.m ([EOModel -description]), ([EOModel
-addEntity]), ([EOModel removeEntity]): Make temporary objects
autoreleased versions instead explicit release handling.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]):
reinserted accessing adaptor class by principal class of bundle as
fallback in case EOAdaptorClassName isn't found. Raise an
exception if the provided class is not a subclass of EOAdaptor.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]),
([EOAdaptor -fetchedValueForValue:attribute]),
([EOAdaptor -fetchedValueForStringValue:attribute]):
replaced NSLog/NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithModel:]),
([EOAdaptor +adaptorWithName:]),
([EOAdaptor +availableAdaptorNames]):
replaced autorelease with AUTORELEASE().
* EOAdaptors/Postgres95Adaptor/Info.plist: Added
EOAdaptorClassName entry.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15900 72102866-910b-0410-8b05-ffd578937521
2003-02-06 21:18:29 +00:00
|
|
|
if (adaptorClass == Nil)
|
|
|
|
{
|
|
|
|
adaptorClass = [bundle principalClass];
|
|
|
|
}
|
|
|
|
|
|
|
|
if(adaptorClass == Nil)
|
|
|
|
{
|
|
|
|
[NSException raise: NSInvalidArgumentException
|
|
|
|
format: @"%@ -- %@ 0x%x: value of EOAdaptorClassName '%@' is not a valid class and bundle does not contain a principal class",
|
|
|
|
NSStringFromSelector(_cmd),
|
|
|
|
NSStringFromClass([self class]),
|
|
|
|
self,
|
2007-01-01 11:52:38 +00:00
|
|
|
name];
|
2003-02-06 David Ayers <d.ayers@inode.at>
* EOAccess/EOModel.m
([EOModel -encodeTableOfContentsIntoPropertyList:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -encodeIntoPropertyList:]), ([EOModel -addEntity:]),
([EOModel -removeEntity:]), ([EOModel -beautifyNames]),
([EOModel -setCreateMutableObjects:]):
Do not access _entities until cache is triggered.
* EOAccess/EOModel.m
([EOModel +findPathForModelNamed:]),
([EOModel -gcDecrementRefCountOfContainedObjects]),
([EOModel -storedProcedures]), ([EOModel -initWithContentsOfFile:]),
([EOModel -initWithTableOfContentsPropertyList:path:]),
([EOModel -initWithPropertyList:owner:]),
([EOModel -_classDescriptionNeeded:]), ([EOModel -_entityForClass:]),
([EOModel -_addEntityWithPropertyList:]), ([EOModel -_addEntity:]),
([EOModel -_verifyBuiltEntityObject:named:]):
replaced NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOModel.m ([EOModel -description]), ([EOModel
-addEntity]), ([EOModel removeEntity]): Make temporary objects
autoreleased versions instead explicit release handling.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]):
reinserted accessing adaptor class by principal class of bundle as
fallback in case EOAdaptorClassName isn't found. Raise an
exception if the provided class is not a subclass of EOAdaptor.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithName:]),
([EOAdaptor -fetchedValueForValue:attribute]),
([EOAdaptor -fetchedValueForStringValue:attribute]):
replaced NSLog/NSDebugMLLog with EOFLOGObject/ClassLevelArgs.
* EOAccess/EOAdaptor.m ([EOAdaptor +adaptorWithModel:]),
([EOAdaptor +adaptorWithName:]),
([EOAdaptor +availableAdaptorNames]):
replaced autorelease with AUTORELEASE().
* EOAdaptors/Postgres95Adaptor/Info.plist: Added
EOAdaptorClassName entry.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15900 72102866-910b-0410-8b05-ffd578937521
2003-02-06 21:18:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ([adaptorClass isSubclassOfClass: [self class]] == NO)
|
|
|
|
{
|
|
|
|
[NSException raise: NSInvalidArgumentException
|
|
|
|
format: @"%@ -- %@ 0x%x: principal class is not a subclass of EOAdaptor:%@",
|
|
|
|
NSStringFromSelector(_cmd),
|
|
|
|
NSStringFromClass([self class]),
|
|
|
|
self,
|
|
|
|
NSStringFromClass([adaptorClass class])];
|
|
|
|
}
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2007-01-01 11:52:38 +00:00
|
|
|
return AUTORELEASE([[adaptorClass alloc] initWithName: name]);
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
+ (void)setExpressionClassName: (NSString *)sqlExpressionClassName
|
|
|
|
adaptorClassName: (NSString *)adaptorClassName
|
|
|
|
{
|
|
|
|
// TODO
|
|
|
|
[self notImplemented: _cmd];
|
|
|
|
}
|
|
|
|
|
|
|
|
+ (EOLoginPanel *)sharedLoginPanelInstance
|
|
|
|
{
|
2004-02-23 19:57:14 +00:00
|
|
|
static NSMutableDictionary *panelDict = nil;
|
|
|
|
NSString *name;
|
|
|
|
EOLoginPanel *panel = nil;
|
2004-02-22 17:05:48 +00:00
|
|
|
|
2004-02-23 19:57:14 +00:00
|
|
|
if ([self isMemberOfClass: [EOAdaptor class]] == NO)
|
2004-02-22 17:05:48 +00:00
|
|
|
{
|
2004-02-23 19:57:14 +00:00
|
|
|
if (panelDict == nil)
|
|
|
|
{
|
|
|
|
panelDict = [NSMutableDictionary new];
|
|
|
|
}
|
|
|
|
|
|
|
|
name = NSStringFromClass(self);
|
|
|
|
panel = [panelDict objectForKey: name];
|
|
|
|
|
|
|
|
if (panel == nil
|
|
|
|
&& NSClassFromString(@"NSApplication") != nil)
|
|
|
|
{
|
|
|
|
NSBundle *adaptorFramework;
|
|
|
|
NSBundle *loginBundle;
|
|
|
|
NSString *path;
|
|
|
|
Class loginClass;
|
2004-02-22 17:05:48 +00:00
|
|
|
|
2004-02-23 19:57:14 +00:00
|
|
|
adaptorFramework = [NSBundle bundleForClass: self];
|
|
|
|
path = [adaptorFramework pathForResource: @"LoginPanel"
|
|
|
|
ofType: @"bundle"];
|
|
|
|
loginBundle = [NSBundle bundleWithPath: path];
|
|
|
|
loginClass = [loginBundle principalClass];
|
|
|
|
panel = [loginClass new];
|
2004-02-23 21:33:00 +00:00
|
|
|
if (panel != nil)
|
|
|
|
{
|
|
|
|
[panelDict setObject: panel forKey: name];
|
|
|
|
}
|
2004-02-23 19:57:14 +00:00
|
|
|
}
|
2004-02-22 17:05:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return panel;
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
2004-04-23 10:28:16 +00:00
|
|
|
/**
|
|
|
|
* Returns an array of EOAdaptor frameworks found in the standard
|
|
|
|
* framework locations. If an adaptor is found in multiple locations
|
|
|
|
* the name is listed only once. An adaptor framework is recognized
|
|
|
|
* the the "EOAdaptor.framework" suffix. The framework name without
|
|
|
|
* this suffix is the name returned in the array.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
+ (NSArray *)availableAdaptorNames
|
|
|
|
{
|
2010-04-26 21:52:42 +00:00
|
|
|
NSArray *pathArray = NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory,
|
|
|
|
NSAllDomainsMask, YES);
|
2002-11-15 22:57:05 +00:00
|
|
|
NSEnumerator *pathEnum = [pathArray objectEnumerator];
|
|
|
|
NSString *searchPath;
|
|
|
|
NSFileManager *defaultManager = [NSFileManager defaultManager];
|
|
|
|
NSArray *fileNames;
|
|
|
|
NSEnumerator *filesEnum;
|
|
|
|
NSString *fileName;
|
2004-04-23 10:28:16 +00:00
|
|
|
NSMutableSet *adaptorNames = [NSMutableSet set];
|
|
|
|
NSString *adaptorSuffix = @"EOAdaptor.framework";
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
EOFLOGObjectFnStartOrCond2(@"AdaptorLevel", @"EOAdaptor");
|
|
|
|
|
|
|
|
while ((searchPath = [pathEnum nextObject]))
|
|
|
|
{
|
2004-04-23 10:28:16 +00:00
|
|
|
searchPath = [searchPath stringByAppendingPathComponent: @"Frameworks"];
|
|
|
|
fileNames = [defaultManager directoryContentsAtPath: searchPath];
|
2002-11-15 22:57:05 +00:00
|
|
|
filesEnum = [fileNames objectEnumerator];
|
|
|
|
|
2010-05-30 19:25:53 +00:00
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
while ((fileName = [filesEnum nextObject]))
|
|
|
|
{
|
2010-05-30 19:25:53 +00:00
|
|
|
|
2004-04-23 10:28:16 +00:00
|
|
|
if ([fileName hasSuffix: adaptorSuffix])
|
|
|
|
{
|
|
|
|
fileName = [fileName stringByDeletingSuffix: adaptorSuffix];
|
|
|
|
[adaptorNames addObject: fileName];
|
|
|
|
}
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
EOFLOGObjectFnStopOrCond2(@"AdaptorLevel", @"EOAdaptor");
|
|
|
|
|
2004-04-23 10:28:16 +00:00
|
|
|
return [adaptorNames allObjects];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
- (void)_performAdministativeStatementsForSelector: (SEL)sel
|
|
|
|
connectionDictionary: (NSDictionary *)connDict
|
|
|
|
administrativeConnectionDictionary: (NSDictionary *)admConnDict
|
|
|
|
{
|
|
|
|
|
|
|
|
if (admConnDict == nil)
|
|
|
|
{
|
|
|
|
admConnDict
|
|
|
|
= [[[self class] sharedLoginPanelInstance]
|
|
|
|
administrativeConnectionDictionaryForAdaptor: self];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (connDict == nil)
|
|
|
|
{
|
|
|
|
connDict = [self connectionDictionary];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (admConnDict != nil)
|
|
|
|
{
|
|
|
|
EOAdaptor *admAdaptor;
|
|
|
|
EOAdaptorContext *admContext;
|
|
|
|
EOAdaptorChannel *admChannel;
|
|
|
|
NSArray *stmts;
|
2005-02-20 20:58:28 +00:00
|
|
|
unsigned i;
|
2004-02-12 17:09:37 +00:00
|
|
|
|
2004-02-26 14:18:04 +00:00
|
|
|
stmts = [(id)[self expressionClass] performSelector: sel
|
|
|
|
withObject: connDict
|
|
|
|
withObject: admConnDict];
|
2004-02-12 17:09:37 +00:00
|
|
|
|
|
|
|
/*TODO: check if we need a model. */
|
|
|
|
admAdaptor = [EOAdaptor adaptorWithName: [self name]];
|
|
|
|
[admAdaptor setConnectionDictionary: admConnDict];
|
|
|
|
|
|
|
|
admContext = [admAdaptor createAdaptorContext];
|
|
|
|
admChannel = [admContext createAdaptorChannel];
|
|
|
|
NS_DURING
|
|
|
|
{
|
2005-02-20 20:58:28 +00:00
|
|
|
unsigned stmtsCount=0;
|
2004-02-12 17:09:37 +00:00
|
|
|
[admChannel openChannel];
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
stmtsCount=[stmts count];
|
|
|
|
for (i = 0; i < stmtsCount; i++)
|
2004-02-12 17:09:37 +00:00
|
|
|
{
|
|
|
|
[admChannel evaluateExpression: [stmts objectAtIndex: i]];
|
|
|
|
}
|
|
|
|
[admChannel closeChannel];
|
|
|
|
}
|
|
|
|
NS_HANDLER
|
|
|
|
{
|
|
|
|
if ([admChannel isOpen])
|
|
|
|
{
|
|
|
|
[admChannel closeChannel];
|
|
|
|
}
|
|
|
|
[localException raise];
|
|
|
|
}
|
|
|
|
NS_ENDHANDLER;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-04-18 19:01:06 +00:00
|
|
|
- (NSArray *)prototypeAttributes
|
2002-11-15 22:57:05 +00:00
|
|
|
{
|
2003-04-18 19:01:06 +00:00
|
|
|
NSBundle *bundle;
|
|
|
|
NSString *path;
|
|
|
|
NSString *modelName;
|
|
|
|
EOModel *model;
|
|
|
|
NSMutableArray *attributes = nil;
|
|
|
|
|
2010-05-30 19:25:53 +00:00
|
|
|
|
2003-04-18 19:01:06 +00:00
|
|
|
|
|
|
|
bundle = [NSBundle bundleForClass: [self class]];
|
|
|
|
|
|
|
|
modelName = [NSString stringWithFormat: @"EO%@Prototypes.eomodeld", _name];
|
|
|
|
path = [[bundle resourcePath] stringByAppendingPathComponent: modelName];
|
|
|
|
|
|
|
|
model = [[EOModel alloc] initWithContentsOfFile: path];
|
|
|
|
|
|
|
|
if (model)
|
|
|
|
{
|
|
|
|
NSArray *entities;
|
2005-02-20 20:58:28 +00:00
|
|
|
unsigned i, count;
|
2003-04-18 19:01:06 +00:00
|
|
|
|
|
|
|
attributes = [NSMutableArray arrayWithCapacity: 20];
|
|
|
|
|
|
|
|
entities = [model entities];
|
|
|
|
count = [entities count];
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
EOEntity *entity = [entities objectAtIndex: i];
|
|
|
|
|
|
|
|
[attributes addObjectsFromArray: [entity attributes]];
|
|
|
|
}
|
|
|
|
|
|
|
|
RELEASE(model);
|
|
|
|
}
|
|
|
|
|
2010-05-30 19:25:53 +00:00
|
|
|
|
2003-04-18 19:01:06 +00:00
|
|
|
|
|
|
|
return attributes;
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
- initWithName:(NSString *)name
|
|
|
|
{
|
|
|
|
if ((self = [super init]))
|
|
|
|
{
|
|
|
|
ASSIGN(_name, name);
|
|
|
|
_contexts = [NSMutableArray new];
|
|
|
|
}
|
|
|
|
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)dealloc
|
|
|
|
{
|
|
|
|
DESTROY(_model);
|
|
|
|
DESTROY(_name);
|
|
|
|
DESTROY(_connectionDictionary);
|
|
|
|
DESTROY(_contexts);
|
|
|
|
|
|
|
|
[super dealloc];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)setConnectionDictionary: (NSDictionary *)dictionary
|
|
|
|
{
|
|
|
|
//OK
|
|
|
|
if ([self hasOpenChannels])
|
|
|
|
[NSException raise: NSInvalidArgumentException
|
|
|
|
format: @"%@ -- %@ 0x%x: cannot set the connection dictionary while the adaptor is connected!",
|
|
|
|
NSStringFromSelector(_cmd),
|
|
|
|
NSStringFromClass([self class]),
|
|
|
|
self];
|
|
|
|
|
|
|
|
ASSIGN(_connectionDictionary, dictionary);
|
|
|
|
// [model setConnectionDictionary:dictionary]; // TODO ??
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)assertConnectionDictionaryIsValid
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (EOAdaptorContext *)createAdaptorContext
|
|
|
|
{
|
|
|
|
[self subclassResponsibility: _cmd];
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSArray *)contexts
|
|
|
|
{
|
2003-03-31 00:24:15 +00:00
|
|
|
SEL sel = @selector(nonretainedObjectValue);
|
|
|
|
return [_contexts resultsOfPerformingSelector: sel];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL)hasOpenChannels
|
|
|
|
{
|
2005-02-20 20:58:28 +00:00
|
|
|
unsigned i;
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2005-02-22 12:52:46 +00:00
|
|
|
i = [_contexts count];
|
|
|
|
while (i--)
|
2002-11-15 22:57:05 +00:00
|
|
|
{
|
2005-02-22 12:52:46 +00:00
|
|
|
EOAdaptorContext *ctx
|
|
|
|
= [[_contexts objectAtIndex: i] nonretainedObjectValue];
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
if([ctx hasOpenChannels] == YES)
|
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)setDelegate:delegate
|
|
|
|
{
|
|
|
|
_delegate = delegate;
|
|
|
|
|
|
|
|
_delegateRespondsTo.processValue
|
|
|
|
= [delegate respondsToSelector:
|
|
|
|
@selector(adaptor:fetchedValueForValue:attribute:)];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)setModel: (EOModel *)model
|
|
|
|
{
|
|
|
|
ASSIGN(_model, model);
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSString *)name
|
|
|
|
{
|
|
|
|
return _name;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSDictionary *)connectionDictionary
|
|
|
|
{
|
|
|
|
return _connectionDictionary;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (EOModel *)model
|
|
|
|
{
|
|
|
|
return _model;
|
|
|
|
}
|
|
|
|
|
|
|
|
- delegate
|
|
|
|
{
|
|
|
|
return _delegate;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (Class)expressionClass
|
|
|
|
{
|
|
|
|
Class expressionClass = Nil;
|
|
|
|
|
2010-05-30 19:25:53 +00:00
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
/* retrieve EOAdaptorQuotesExternalNames from ? or from user default */
|
|
|
|
|
|
|
|
expressionClass = _expressionClass;
|
|
|
|
|
|
|
|
if(!expressionClass)
|
|
|
|
expressionClass = [self defaultExpressionClass];
|
|
|
|
|
2010-05-30 19:25:53 +00:00
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
return expressionClass;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (Class)defaultExpressionClass
|
|
|
|
{
|
|
|
|
[self subclassResponsibility: _cmd];
|
|
|
|
return Nil; //TODO vedere setExpressionClass
|
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL)canServiceModel: (EOModel *)model
|
|
|
|
{
|
|
|
|
return [_connectionDictionary isEqual: [model connectionDictionary]];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSStringEncoding)databaseEncoding
|
|
|
|
{
|
2010-06-01 00:29:37 +00:00
|
|
|
NSString *encodingValue;
|
|
|
|
NSStringEncoding stringEncoding;
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2010-06-01 00:29:37 +00:00
|
|
|
encodingValue = [[self connectionDictionary] objectForKey: @"databaseEncoding"];
|
2006-10-13 04:54:09 +00:00
|
|
|
|
2006-10-13 04:58:11 +00:00
|
|
|
if (encodingValue == nil)
|
2010-06-01 00:29:37 +00:00
|
|
|
{
|
|
|
|
stringEncoding = [NSString defaultCStringEncoding];
|
|
|
|
} else {
|
|
|
|
// + GSMimeDocument encodingFromCharset should be in NSString Additions,
|
|
|
|
// but better there than in GSWeb and GDL -- dw
|
|
|
|
stringEncoding = [GSMimeDocument encodingFromCharset:encodingValue];
|
|
|
|
|
2013-03-02 13:59:48 +00:00
|
|
|
if (stringEncoding == 0) {
|
2010-06-01 00:29:37 +00:00
|
|
|
return [NSString defaultCStringEncoding];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
2010-06-01 00:29:37 +00:00
|
|
|
}
|
|
|
|
|
2006-10-13 04:54:09 +00:00
|
|
|
return stringEncoding;
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
- (id)fetchedValueForValue: (id)value
|
|
|
|
attribute: (EOAttribute *)attribute
|
|
|
|
{
|
|
|
|
//Should be OK
|
|
|
|
SEL valueFactoryMethod;
|
|
|
|
|
|
|
|
valueFactoryMethod = [attribute valueFactoryMethod];
|
|
|
|
|
|
|
|
if (valueFactoryMethod)
|
|
|
|
{
|
|
|
|
NSEmitTODO();
|
|
|
|
[self notImplemented: _cmd]; //TODO
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ([value isKindOfClass: [NSString class]])
|
|
|
|
[self fetchedValueForStringValue: value
|
|
|
|
attribute: attribute];
|
|
|
|
else if ([value isKindOfClass: [NSNumber class]])
|
|
|
|
value = [self fetchedValueForNumberValue: value
|
|
|
|
attribute: attribute];
|
|
|
|
else if ([value isKindOfClass: [NSDate class]])
|
|
|
|
value = [self fetchedValueForDateValue: value
|
|
|
|
attribute: attribute];
|
|
|
|
else if ([value isKindOfClass: [NSData class]])
|
|
|
|
value = [self fetchedValueForDataValue: value
|
|
|
|
attribute: attribute];
|
|
|
|
}
|
|
|
|
|
|
|
|
if(_delegateRespondsTo.processValue)
|
|
|
|
value = [_delegate adaptor: self
|
|
|
|
fetchedValueForValue: value
|
|
|
|
attribute: attribute];
|
|
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSString *)fetchedValueForStringValue: (NSString *)value
|
|
|
|
attribute: (EOAttribute *)attribute
|
|
|
|
{
|
|
|
|
NSString *resultValue = nil;
|
|
|
|
|
|
|
|
if([value length]>0)
|
|
|
|
{
|
|
|
|
//TODO-NOW: correct this code which loop!
|
|
|
|
/*
|
|
|
|
const char *cstr=NULL;
|
2005-02-20 20:58:28 +00:00
|
|
|
unsigned i=0, spc=0;
|
2002-11-15 22:57:05 +00:00
|
|
|
cstr = [value cString];
|
|
|
|
while(*cstr)
|
|
|
|
{
|
|
|
|
if(*cstr == ' ')
|
|
|
|
spc++;
|
|
|
|
else
|
|
|
|
spc = 0;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
cstr = &cstr[-i];
|
|
|
|
|
|
|
|
if(!spc)
|
|
|
|
resultValue=value;
|
|
|
|
else if(!(&cstr[i-spc]-cstr))
|
|
|
|
resultValue=nil;
|
|
|
|
else
|
|
|
|
resultValue=[NSString stringWithCString:cstr
|
|
|
|
length:&cstr[i-spc]-cstr];
|
|
|
|
*/
|
|
|
|
resultValue = value;
|
|
|
|
}
|
|
|
|
|
2010-05-30 19:25:53 +00:00
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
return resultValue;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSNumber *)fetchedValueForNumberValue: (NSNumber *)value
|
|
|
|
attribute: (EOAttribute *)attribute
|
|
|
|
{
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSCalendarDate *)fetchedValueForDateValue: (NSCalendarDate *)value
|
|
|
|
attribute: (EOAttribute *)attribute
|
|
|
|
{
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSData *)fetchedValueForDataValue: (NSData *)value
|
|
|
|
attribute: (EOAttribute *)attribute
|
|
|
|
{
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reconnection to database */
|
|
|
|
- (void)handleDroppedConnection
|
|
|
|
{
|
|
|
|
NSDictionary *newConnectionDictionary = nil;
|
2013-03-02 18:48:29 +00:00
|
|
|
NSUInteger i;
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2013-03-02 18:48:29 +00:00
|
|
|
for (i = 0; i < [_contexts count]; i++)
|
2002-11-15 22:57:05 +00:00
|
|
|
{
|
|
|
|
EOAdaptorContext *ctx = [[_contexts objectAtIndex:i]
|
|
|
|
nonretainedObjectValue];
|
|
|
|
|
|
|
|
[ctx handleDroppedConnection];
|
|
|
|
}
|
|
|
|
|
|
|
|
[_contexts removeAllObjects];
|
|
|
|
|
|
|
|
if (_delegate
|
|
|
|
&& [_delegate
|
|
|
|
respondsToSelector: @selector(reconnectionDictionaryForAdaptor:)])
|
|
|
|
{
|
|
|
|
if ((newConnectionDictionary = [_delegate
|
|
|
|
reconnectionDictionaryForAdaptor: self]))
|
|
|
|
{
|
|
|
|
[self setConnectionDictionary: newConnectionDictionary];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-09 12:48:33 +00:00
|
|
|
/**
|
|
|
|
* Returns YES if the exception is one that the adaptor can attempt to recover from by reconnecting.
|
|
|
|
* NO otherwise.
|
|
|
|
* The default implementation returns NO.
|
|
|
|
*
|
|
|
|
* Subclasses that support database reconnection should override this
|
|
|
|
* to allow for automatic database reconnection.
|
|
|
|
*/
|
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
- (BOOL)isDroppedConnectionException: (NSException *)exception
|
|
|
|
{
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Attempts to create a database using
|
|
|
|
* the statments returned by the Adaptor's expression class
|
|
|
|
* for @selector(createDatabaseStatementsForConnectionDictionary:administrativeConnectionDictionary:);
|
|
|
|
* using the connectionDictionary as the administrative connection dictionary.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
- (void)createDatabaseWithAdministrativeConnectionDictionary: (NSDictionary *)connectionDictionary
|
|
|
|
{
|
2004-02-12 17:09:37 +00:00
|
|
|
SEL sel;
|
|
|
|
sel = @selector(createDatabaseStatementsForConnectionDictionary:administrativeConnectionDictionary:);
|
|
|
|
[self _performAdministativeStatementsForSelector: sel
|
|
|
|
connectionDictionary: [self connectionDictionary]
|
|
|
|
administrativeConnectionDictionary: connectionDictionary];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
2004-03-06 11:12:49 +00:00
|
|
|
* Attempts to drop a database using
|
2004-02-12 17:09:37 +00:00
|
|
|
* the statments returned by the Adaptor's expression class
|
2004-03-06 11:12:49 +00:00
|
|
|
* for @selector(dropDatabaseStatementsForConnectionDictionary:administrativeConnectionDictionary:);
|
2004-02-12 17:09:37 +00:00
|
|
|
* using the connectionDictionary as the administrative connection dictionary.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
- (void)dropDatabaseWithAdministrativeConnectionDictionary: (NSDictionary *)connectionDictionary
|
|
|
|
{
|
2004-02-12 17:09:37 +00:00
|
|
|
SEL sel;
|
|
|
|
sel = @selector(dropDatabaseStatementsForConnectionDictionary:administrativeConnectionDictionary:);
|
|
|
|
[self _performAdministativeStatementsForSelector: sel
|
|
|
|
connectionDictionary: [self connectionDictionary]
|
|
|
|
administrativeConnectionDictionary: connectionDictionary];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
2002-12-30 22:10:43 +00:00
|
|
|
- (BOOL) isValidQualifierType: (NSString *)attribute
|
2002-12-08 10:07:26 +00:00
|
|
|
model: (EOModel *)model
|
|
|
|
{
|
|
|
|
[self subclassResponsibility: _cmd];
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
@end /* EOAdaptor */
|
|
|
|
|
|
|
|
|
|
|
|
@implementation EOAdaptor (EOAdaptorLoginPanel)
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Invokes [EOLoginPanel-runPanelForAdaptor:validate:allowsCreation:]
|
|
|
|
* for the adaptor's [+sharedLoginPanelInstance],
|
|
|
|
* with YES as the validate flag.
|
|
|
|
* If the user supplies valid connection information,
|
|
|
|
* the reciever's connection dictionary is updated,
|
|
|
|
* and the method return YES. Otherwise it returns NO.
|
|
|
|
* Subclass shouldn't need to override this method,
|
|
|
|
* yet if the do, they should call this implementation.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
- (BOOL)runLoginPanelAndValidateConnectionDictionary
|
|
|
|
{
|
2004-02-12 17:09:37 +00:00
|
|
|
EOLoginPanel *panel;
|
|
|
|
NSDictionary *connDict;
|
|
|
|
|
|
|
|
panel = [[self class] sharedLoginPanelInstance];
|
|
|
|
connDict = [panel runPanelForAdaptor: self
|
|
|
|
validate: YES
|
|
|
|
allowsCreation: NO];
|
|
|
|
if (connDict != nil)
|
|
|
|
{
|
|
|
|
[self setConnectionDictionary: connDict];
|
|
|
|
}
|
|
|
|
|
|
|
|
return (connDict != nil ? YES : NO);
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Invokes [EOLoginPanel-runPanelForAdaptor:validate:allowsCreation:]
|
|
|
|
* for the adaptor's [+sharedLoginPanelInstance],
|
|
|
|
* with YES as the validate flag.
|
|
|
|
* Returns the dictionary without
|
|
|
|
* changing the recievers connection dictionary.
|
|
|
|
* Subclass shouldn't need to override this method,
|
|
|
|
* yet if the do, they should call this implementation.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
- (NSDictionary *)runLoginPanel
|
|
|
|
{
|
2004-02-12 17:09:37 +00:00
|
|
|
EOLoginPanel *panel;
|
|
|
|
NSDictionary *connDict;
|
|
|
|
|
|
|
|
panel = [[self class] sharedLoginPanelInstance];
|
|
|
|
connDict = [panel runPanelForAdaptor: self
|
|
|
|
validate: NO
|
|
|
|
allowsCreation: NO];
|
|
|
|
|
|
|
|
return connDict;
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation EOAdaptor (EOExternalTypeMapping)
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Subclasses must override this method without invoking this implementation
|
|
|
|
* to return the name of the class used internal to the database
|
|
|
|
* for the extType provided.
|
|
|
|
* A subclass may use information provided by
|
|
|
|
* an optional model to determine the exact type.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
+ (NSString *)internalTypeForExternalType: (NSString *)extType
|
|
|
|
model: (EOModel *)model
|
|
|
|
{
|
|
|
|
[self subclassResponsibility: _cmd];
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Subclasses must override this method without invoking this implementation
|
|
|
|
* to return an array of types available for the RDBMS.
|
|
|
|
* A subclass may use information provided by
|
|
|
|
* an optional model to determine the exact available types.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
+ (NSArray *)externalTypesWithModel: (EOModel *)model
|
|
|
|
{
|
|
|
|
[self subclassResponsibility: _cmd];
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Subclasses must override this method without invoking this implementation
|
|
|
|
* to set the the external type according to the internal type information.
|
|
|
|
* It should take into account width, precesion and scale accordingly.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
+ (void)assignExternalTypeForAttribute: (EOAttribute *)attribute
|
|
|
|
{
|
2004-02-12 17:09:37 +00:00
|
|
|
[self subclassResponsibility: _cmd];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Invokes [+assignExternalTypeForAttribute:]
|
|
|
|
* and unless the attribute is derived
|
|
|
|
* it sets the column name if it hasn't been set.
|
|
|
|
* An 'attributeName' result in a column named 'ATTRIBUTE_NAME'. <br/>
|
|
|
|
* NOTE: This differs from the EOF implementation as EOF unconditionally
|
|
|
|
* sets the the external name attributes that are not derived.
|
|
|
|
* This can cause trouble on certain RDMS which may not support
|
|
|
|
* the extended names used internally in an application.
|
|
|
|
* Subclass shouldn't need to override this method,
|
|
|
|
* yet if the do, they should call this implementation.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
+ (void)assignExternalInfoForAttribute: (EOAttribute *)attribute
|
|
|
|
{
|
2004-02-12 17:09:37 +00:00
|
|
|
if ([[attribute columnName] length] == 0
|
|
|
|
&& [attribute isFlattened] == NO)
|
|
|
|
{
|
|
|
|
NSString *name;
|
|
|
|
name = [NSString externalNameForInternalName: [attribute name]
|
|
|
|
separatorString: @"_"
|
|
|
|
useAllCaps: YES];
|
|
|
|
[attribute setColumnName: name];
|
|
|
|
}
|
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
[self assignExternalTypeForAttribute: attribute];
|
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Invokes [+assignExternalInfoForAttribute:]
|
|
|
|
* for each of the model's entities.
|
|
|
|
* If the externalName of the entity hasn't been set,
|
|
|
|
* this method sets it to a standardized name
|
|
|
|
* according to the entities name.
|
|
|
|
* An 'entityName' will be converted to 'ENTITY_NAME'. <br/>
|
|
|
|
* Subclass shouldn't need to override this method,
|
|
|
|
* yet if the do, they should call this implementation.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
+ (void)assignExternalInfoForEntity: (EOEntity *)entity
|
|
|
|
{
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
NSArray *attributes=nil;
|
|
|
|
unsigned i=0;
|
2005-02-20 20:58:28 +00:00
|
|
|
unsigned attributesCount=0;
|
2004-02-12 17:09:37 +00:00
|
|
|
|
|
|
|
if ([[entity externalName] length] == 0)
|
|
|
|
{
|
|
|
|
NSString *name;
|
|
|
|
name = [NSString externalNameForInternalName: [entity name]
|
|
|
|
separatorString: @"_"
|
|
|
|
useAllCaps: YES];
|
|
|
|
[entity setExternalName: name];
|
|
|
|
}
|
|
|
|
|
|
|
|
attributes = [entity attributes];
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
attributesCount=[attributes count];
|
2004-02-12 17:09:37 +00:00
|
|
|
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
for (i = 0; i < attributesCount; i++)
|
2004-02-12 17:09:37 +00:00
|
|
|
{
|
|
|
|
[self assignExternalInfoForAttribute: [attributes objectAtIndex: i]];
|
|
|
|
}
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
/**
|
|
|
|
* Invokes [+assignExternalInfoForEntity:]
|
|
|
|
* for each of the model's entities.
|
|
|
|
* Subclass shouldn't need to override this method,
|
|
|
|
* yet if the do, they should call this implementation.
|
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
+ (void)assignExternalInfoForEntireModel: (EOModel *)model
|
|
|
|
{
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
NSArray *entities=nil;
|
|
|
|
unsigned i=0;
|
2005-02-20 20:58:28 +00:00
|
|
|
unsigned entitiesCount=0;
|
2004-02-12 17:09:37 +00:00
|
|
|
|
|
|
|
entities = [model entities];
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
entitiesCount=[entities count];
|
2004-02-12 17:09:37 +00:00
|
|
|
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
for (i = 0; i < entitiesCount; i++)
|
2004-02-12 17:09:37 +00:00
|
|
|
{
|
|
|
|
[self assignExternalInfoForEntity: [entities objectAtIndex: i]];
|
|
|
|
}
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
|
|
|
|
@implementation EOAdaptor (EOAdaptorPrivate)
|
|
|
|
|
|
|
|
- (void) _requestConcreteImplementationForSelector: (SEL)param0
|
|
|
|
{
|
|
|
|
[self notImplemented: _cmd]; //TODO
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void) _unregisterAdaptorContext: (EOAdaptorContext*)adaptorContext
|
|
|
|
{
|
2013-03-02 18:48:29 +00:00
|
|
|
NSUInteger i = 0;
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2013-03-02 18:48:29 +00:00
|
|
|
for (i = 0; i < [_contexts count]; i++)
|
2002-11-15 22:57:05 +00:00
|
|
|
{
|
|
|
|
if ([[_contexts objectAtIndex: i] nonretainedObjectValue]
|
|
|
|
== adaptorContext)
|
|
|
|
{
|
2013-03-02 18:48:29 +00:00
|
|
|
// this works, since it breaks out on first find
|
2002-11-15 22:57:05 +00:00
|
|
|
[_contexts removeObjectAtIndex: i];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void) _registerAdaptorContext: (EOAdaptorContext*)adaptorContext
|
|
|
|
{
|
|
|
|
[_contexts addObject: [NSValue valueWithNonretainedObject: adaptorContext]];
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
2003-02-03 14:53:03 +00:00
|
|
|
|
|
|
|
@implementation EOLoginPanel
|
|
|
|
|
2004-02-12 17:09:37 +00:00
|
|
|
- (NSDictionary *) runPanelForAdaptor: (EOAdaptor *)adaptor
|
|
|
|
validate: (BOOL)yn
|
|
|
|
allowsCreation: (BOOL)allowsCreation
|
2003-02-03 14:53:03 +00:00
|
|
|
{
|
|
|
|
[self subclassResponsibility: _cmd];
|
|
|
|
return nil;
|
|
|
|
}
|
2004-03-06 11:12:49 +00:00
|
|
|
/**
|
|
|
|
Subclasses should implement this method to return a connection dictionary
|
|
|
|
for an administrative user able to create databases etc. Or nil if the
|
|
|
|
the user cancels.
|
|
|
|
*/
|
2004-02-12 17:09:37 +00:00
|
|
|
- (NSDictionary *) administrativeConnectionDictionaryForAdaptor: (EOAdaptor *)adaptor
|
2003-02-03 14:53:03 +00:00
|
|
|
{
|
|
|
|
[self subclassResponsibility: _cmd];
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
2004-02-12 17:09:37 +00:00
|
|
|
|
|
|
|
@implementation EOLoginPanel (Deprecated)
|
|
|
|
|
|
|
|
- (NSDictionary *) runPanelForAdaptor: (EOAdaptor *)adaptor validate: (BOOL)yn
|
|
|
|
{
|
|
|
|
return [self runPanelForAdaptor: adaptor validate: yn allowsCreation: NO];
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|