* EOAccess/EODatabaseContext.h/m:

(EOStoredProcedureNameHintKey, EOCustomQueryExpressionHintKey):
        Define missing keys.
        * EOControl/EODeprecated.h: (EOPrefetchingRelationshipHintKey)
        (EOFetchLimitHintKey, EOPromptAfterFetchLimitHintKey): Ditto.
        * EOControl/EOFetchSpecification.m:
        (EOPrefetchingRelationshipHintKey, EOFetchLimitHintKey)
        (EOPromptAfterFetchLimitHintKey): Ditto.  Use globally defined
        keys instead of local strings.
        * EOAccess/EODatabaseChannel.m
        (_selectWithFetchSpecification:editingContext:) Use globally
        defined keys instead of local strings.

        * EOControl/EOQualifier.m (+[stringForOperatorSelector:]):
        Return selector name instead of nil if not given a standard
        EOQualifierOperator selector.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20279 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,22 @@
+2004-11-02  David Ayers  <d.ayers@inode.at>
+
+	* EOAccess/EODatabaseContext.h/m: 
+	(EOStoredProcedureNameHintKey, EOCustomQueryExpressionHintKey):
+	Define missing keys.
+	* EOControl/EODeprecated.h: (EOPrefetchingRelationshipHintKey)
+	(EOFetchLimitHintKey, EOPromptAfterFetchLimitHintKey): Ditto.
+	* EOControl/EOFetchSpecification.m:
+	(EOPrefetchingRelationshipHintKey, EOFetchLimitHintKey)
+	(EOPromptAfterFetchLimitHintKey): Ditto.  Use globally defined
+	keys instead of local strings.
+	* EOAccess/EODatabaseChannel.m
+	(_selectWithFetchSpecification:editingContext:) Use globally 
+	defined keys instead of local strings.
+
+	* EOControl/EOQualifier.m (+[stringForOperatorSelector:]):
+	Return selector name instead of nil if not given a standard
+	EOQualifierOperator selector.
+	
 2004-10-20  David Ayers  <d.ayers@inode.at>
 
 	* EOInterface/EODetailSelectionAssociation.h/m: New files.

EOAccess/EODatabaseChannel.m

@@ -645,7 +645,7 @@ RCS_ID("$Id$")
 
   _hints = [fetch _hints];
 
-  customQueryExpressionHint = [_hints objectForKey: @"EOCustomQueryExpressionHintKey"];//TODO use it
+  customQueryExpressionHint = [_hints objectForKey: EOCustomQueryExpressionHintKey];//TODO use it
 
   if (customQueryExpressionHint)
     {
@@ -722,7 +722,7 @@ RCS_ID("$Id$")
   entity = [database entityNamed:entityName];
   primaryKeyAttributes = [entity primaryKeyAttributes];
   hints = [fetch hints]; // ret {} 
-  storedProcedureName = [hints objectForKey: @"EOStoredProcedureNameHintKey"];//TODO use it
+  storedProcedureName = [hints objectForKey: EOStoredProcedureNameHintKey];//TODO use it
   model = [entity model];
   modelGroup = [model modelGroup]; //ret nil
   //TODO if model gr

EOAccess/EODatabaseContext.h

@@ -438,6 +438,7 @@ shouldRaiseExceptionForLockFailure: (NSException *)exception;
 @end
 
 GDL2ACCESS_EXPORT NSString *EOCustomQueryExpressionHintKey;
+GDL2ACCESS_EXPORT NSString *EOStoredProcedureNameHintKey;
 
 GDL2ACCESS_EXPORT NSString *EODatabaseContextKey;
 GDL2ACCESS_EXPORT NSString *EODatabaseOperationsKey;

EOAccess/EODatabaseContext.m

@@ -111,6 +111,8 @@ NSString *EODatabaseContextKey = @"EODatabaseContextKey";
 NSString *EODatabaseOperationsKey = @"EODatabaseOperationsKey";
 NSString *EOFailedDatabaseOperationKey = @"EOFailedDatabaseOperationKey";
 
+NSString *EOCustomQueryExpressionHintKey = @"EOCustomQueryExpressionHintKey";
+NSString *EOStoredProcedureNameHintKey = @"EOStoredProcedureNameHintKey";
 
 @interface EODatabaseContext(EOObjectStoreSupportPrivate)
 - (id) entityForGlobalID: (EOGlobalID *)globalID;

EOControl/EODeprecated.h

@@ -68,5 +68,8 @@
 
 @end
 
+GDL2CONTROL_EXPORT NSString *EOPrefetchingRelationshipHintKey;
+GDL2CONTROL_EXPORT NSString *EOFetchLimitHintKey;
+GDL2CONTROL_EXPORT NSString *EOPromptAfterFetchLimitHintKey;
 
 #endif 

EOControl/EOFetchSpecification.m

@@ -56,6 +56,13 @@ RCS_ID("$Id$")
 #include <EOControl/EONSAddOns.h>
 #include <EOControl/EOQualifier.h>
 
+#include <EOControl/EODeprecated.h>
+
+NSString *EOPrefetchingRelationshipHintKey = @"EOPrefetchingRelationshipHintKey";
+NSString *EOFetchLimitHintKey = @"EOFetchLimitHintKey";
+NSString *EOPromptAfterFetchLimitHintKey = @"EOPromptAfterFetchLimitHintKey";
+
+
 @interface NSObject (EOAccess)
  /* EOEntity.h */
 - (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)fetchSpecName;
@@ -537,20 +544,20 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
       if (fetchLimit != 0)
         {
           [mutableHints setObject: [NSNumber numberWithInt: fetchLimit]
-			forKey: @"EOFetchLimitHintKey"];
+			forKey: EOFetchLimitHintKey];
         }
 
       if (promptsAfterFetchLimit)
         {
 	  [mutableHints setObject: [NSNumber numberWithBool:
 					       promptsAfterFetchLimit]
-			forKey: @"EOPromptAfterFetchLimitHintKey"];
+			forKey: EOPromptAfterFetchLimitHintKey];
         }
 
       if ([prefetchingRelationshipKeyPaths count] > 0)
         {
 	  [mutableHints setObject: prefetchingRelationshipKeyPaths
-			forKey: @"EOPrefetchingRelationshipHintKey"];
+			forKey: EOPrefetchingRelationshipHintKey];
         }
     }
 

EOControl/EOQualifier.m

@@ -768,7 +768,7 @@ static Class whichQualifier(const char **cFormat, const char **s)
   else if (sel_eq(selector, EOQualifierOperatorCaseInsensitiveLike))
     return @"caseInsensitiveLike";
 
-  return nil;
+  return NSStringFromSelector(selector);
 }
 
 + (SEL)operatorSelectorForString: (NSString *)string