fixed for new -describeResults: API

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@752 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 460dc48750f97bd0fb8bd1cef7d8318b22589c93..46dffe22c83d4c76068a72dfa9c68218b25cde7f 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-21  Helge Hess  <helge.hess@opengroupware.org>
+
+       * EOAdaptorChannel.[hm]: added -describeResults: as a public method,
+         implemented -describeResults based on that (adaptors now need to
+         override -describeResults:) (v4.5.50)
+
 2005-04-12  Helge Hess  <helge.hess@opengroupware.org>
 
        * v4.5.49

diff --git a/sope-gdl1/GDLAccess/EOAdaptorChannel.h b/sope-gdl1/GDLAccess/EOAdaptorChannel.h
index efce51feaf4cb2d5f10547b4ce75a313e48acbc4..aa555a0b826c9cb965dc99b1df6205fcd3d92ee6 100644 (file)
--- a/sope-gdl1/GDLAccess/EOAdaptorChannel.h
+++ b/sope-gdl1/GDLAccess/EOAdaptorChannel.h
@@ -106,7 +106,8 @@
   describedByQualifier:(EOSQLQualifier *)aQualifier
   fetchOrder:(NSArray *)aFetchOrder
   lock:(BOOL)aLockFlag;
-- (NSArray*)describeResults;                                    // override
+- (NSArray *)describeResults:(BOOL)_beautifyNames;              // override
+- (NSArray *)describeResults;
 - (NSMutableDictionary*)fetchAttributes:(NSArray *)attributes 
   withZone:(NSZone *)zone;
 - (BOOL)isFetchInProgress;

diff --git a/sope-gdl1/GDLAccess/EOAdaptorChannel.m b/sope-gdl1/GDLAccess/EOAdaptorChannel.m
index df54956d8daef0aa61c06810f4c07b65268d6ba8..61f213d5562abf8424f5eecb6bc47a9bde8b7eaf 100644 (file)
--- a/sope-gdl1/GDLAccess/EOAdaptorChannel.m
+++ b/sope-gdl1/GDLAccess/EOAdaptorChannel.m
@@ -398,10 +398,13 @@
   return nil;
 }
 
-- (NSArray *)describeResults {
+- (NSArray *)describeResults:(BOOL)_beautifyNames {
   [self subclassResponsibility:_cmd];
   return nil;
 }
+- (NSArray *)describeResults {
+  return [self describeResults:YES];
+}
 
 - (NSMutableDictionary *)fetchAttributes:(NSArray *)attributes
   withZone:(NSZone *)_zone

diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index 704a8fa27d1346e21ef88404845e691f6c157dca..f7227d67578bc35ca68e7d35f47fb431a29918ea 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=49
+SUBMINOR_VERSION:=50

diff --git a/sope-gdl1/PostgreSQL/ChangeLog b/sope-gdl1/PostgreSQL/ChangeLog
index 19a0b570456718faf90638d860c37605fcba1919..7de6d4cd670f2ca15a7b0e6533cff2e5f5929f69 100644 (file)
--- a/sope-gdl1/PostgreSQL/ChangeLog
+++ b/sope-gdl1/PostgreSQL/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-21  Helge Hess  <helge.hess@opengroupware.org>
+
+       * PostgreSQL72Channel.m: changed for -describeResults: API (v4.5.41)
+
 2005-01-14  Helge Hess  <helge.hess@opengroupware.org>
 
        * EOAttribute+PostgreSQL72.m: map PG oid's to NSStrings (avoids issues

diff --git a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.h b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.h
index a36b9f7622c7a82bf8b53767483157f5750276c6..346eeadbde82ad083ef4bf7c4901be55e3ef09cf 100644 (file)
--- a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.h
+++ b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.h
@@ -27,7 +27,7 @@
 #ifndef ___PostgreSQL72_Channel_H___
 #define ___PostgreSQL72_Channel_H___
 
-#import <GDLAccess/EOAdaptorChannel.h>
+#include <GDLAccess/EOAdaptorChannel.h>
 #include <libpq-fe.h>
 
 @class NSArray, NSString, NSMutableDictionary;
@@ -69,23 +69,6 @@ typedef struct {
 - (void)setDebugEnabled:(BOOL)_flag;
 - (BOOL)isDebugEnabled;
 
-- (BOOL)isOpen;
-- (BOOL)openChannel;
-- (void)closeChannel;
-
-- (NSMutableDictionary *)primaryFetchAttributes:(NSArray *)_attributes
-  withZone:(NSZone *)_zone;
-
-- (BOOL)evaluateExpression:(NSString *)_expression;
-
-// cancelFetch is always called to terminate a fetch
-// (even by primaryFetchAttributes)
-// it frees all fetch-local variables
-- (void)cancelFetch;
-
-// uses dataFormat type information to create EOAttribute objects
-- (NSArray *)describeResults;
-
 @end
 
 @interface NSObject(Sybase10ChannelDelegate)
@@ -98,4 +81,4 @@ typedef struct {
 
 @end
 
-#endif
+#endif /* ___PostgreSQL72_Channel_H___ */

diff --git a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
index fc7dbc5763916f574228c5f431caf3a0a18304ed..d3b9165d687549e597949cbd5e0dadd6d6d505a9 100644 (file)
--- a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
+++ b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
@@ -307,7 +307,7 @@ static int openConnectionCount = 0;
   [super cancelFetch];
 }
 
-- (NSArray *)describeResults {
+- (NSArray *)describeResults:(BOOL)_beautifyNames {
   int                 cnt;
   NSMutableArray      *result    = nil;
   NSMutableDictionary *usedNames = nil;
@@ -327,7 +327,9 @@ static int openConnectionCount = 0;
     
     columnName = 
       [[StringClass alloc] initWithCString:self->fieldInfo[cnt].name];
-    attrName   = [columnName _pgModelMakeInstanceVarName];
+    attrName   = _beautifyNames
+      ? [columnName _pgModelMakeInstanceVarName]
+      : columnName;
     
     if ([[usedNames objectForKey:attrName] boolValue]) {
       // TODO: move name generation code to different method!

diff --git a/sope-gdl1/PostgreSQL/Version b/sope-gdl1/PostgreSQL/Version
index 879a0a4c45fc633d1425e9a7c7ec6011f1349348..05ec198e574f67941130b274f39ec94da4f7ee1f 100644 (file)
--- a/sope-gdl1/PostgreSQL/Version
+++ b/sope-gdl1/PostgreSQL/Version
@@ -1,3 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=40
+SUBMINOR_VERSION:=41
+
+# v4.5.41 requires libGDLAccess v4.5.50

diff --git a/sope-gdl1/SQLite3/ChangeLog b/sope-gdl1/SQLite3/ChangeLog
index 1d00e394b04fd37a6f8ea370de4e25cb2cc7873b..5291a2ac3381b2c94ac15b9f6225f9891808fc0b 100644 (file)
--- a/sope-gdl1/SQLite3/ChangeLog
+++ b/sope-gdl1/SQLite3/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-21  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v4.5.17
+
+       * NSString+SQLiteVal.m: fixed a gcc 3.4.3 warning
+
+       * SQLiteChannel.m: changed for -describeResults: API
+
 2005-04-12  Helge Hess  <helge.hess@opengroupware.org>
 
        * SQLiteChannel.m: bumped max connection count from 15 to 150 (v4.5.16)

diff --git a/sope-gdl1/SQLite3/NSString+SQLiteVal.m b/sope-gdl1/SQLite3/NSString+SQLiteVal.m
index 8a407f0635de8a605db31191fd7cf08f9d2b2485..f5104c6791aedd80a9d3d1b9f957bee061763b7c 100644 (file)
--- a/sope-gdl1/SQLite3/NSString+SQLiteVal.m
+++ b/sope-gdl1/SQLite3/NSString+SQLiteVal.m
@@ -93,7 +93,7 @@ static Class EOExprClass = Nil;
     if (EOExprClass == Nil) EOExprClass = [EOQuotedExpression class];
     expr = [[EOExprClass alloc] initWithExpression:expr 
                                quote:@"'" escape:@"\\'"];
-    s = [[expr expressionValueForContext:nil] retain];
+    s = [[(EOQuotedExpression *)expr expressionValueForContext:nil] retain];
     [expr release];
     return [s autorelease];
   }

diff --git a/sope-gdl1/SQLite3/SQLiteChannel.h b/sope-gdl1/SQLite3/SQLiteChannel.h
index c2ba56bcd3e12e5e4d56ad65a2b50b38aea5ed0b..43670cad202494a2607954b1a0b83a33fbed4447 100644 (file)
--- a/sope-gdl1/SQLite3/SQLiteChannel.h
+++ b/sope-gdl1/SQLite3/SQLiteChannel.h
@@ -26,7 +26,7 @@
 #ifndef ___SQLite_Channel_H___
 #define ___SQLite_Channel_H___
 
-#import <GDLAccess/EOAdaptorChannel.h>
+#include <GDLAccess/EOAdaptorChannel.h>
 
 @class NSArray, NSString, NSMutableDictionary;
 
@@ -52,23 +52,6 @@
 - (void)setDebugEnabled:(BOOL)_flag;
 - (BOOL)isDebugEnabled;
 
-- (BOOL)isOpen;
-- (BOOL)openChannel;
-- (void)closeChannel;
-
-- (NSMutableDictionary *)primaryFetchAttributes:(NSArray *)_attributes
-  withZone:(NSZone *)_zone;
-
-- (BOOL)evaluateExpression:(NSString *)_expression;
-
-// cancelFetch is always called to terminate a fetch
-// (even by primaryFetchAttributes)
-// it frees all fetch-local variables
-- (void)cancelFetch;
-
-// uses dataFormat type information to create EOAttribute objects
-- (NSArray *)describeResults;
-
 @end
 
 @interface NSObject(Sybase10ChannelDelegate)

diff --git a/sope-gdl1/SQLite3/SQLiteChannel.m b/sope-gdl1/SQLite3/SQLiteChannel.m
index b77a05cdfe61bd24a099bb6b582346667f4c2646..a44bf264855a321164e7179c0622b56d4df514d9 100644 (file)
--- a/sope-gdl1/SQLite3/SQLiteChannel.m
+++ b/sope-gdl1/SQLite3/SQLiteChannel.m
@@ -247,7 +247,7 @@ static int openConnectionCount = 0;
   [super cancelFetch];
 }
 
-- (NSArray *)describeResults {
+- (NSArray *)describeResults:(BOOL)_beautifyNames {
   // TODO: make exception-less method
   int                 cnt, fieldCount;
   NSMutableArray      *result    = nil;
@@ -289,7 +289,9 @@ static int openConnectionCount = 0;
     
     columnName = [NSString stringWithCString:
                             sqlite3_column_name(self->statement, cnt)];
-    attrName   = [columnName _sqlite3ModelMakeInstanceVarName];
+    attrName   = _beautifyNames
+      ? [columnName _sqlite3ModelMakeInstanceVarName]
+      : columnName;
     
     if ([[usedNames objectForKey:attrName] boolValue]) {
       int      cnt2 = 0;

diff --git a/sope-gdl1/SQLite3/Version b/sope-gdl1/SQLite3/Version
index a80c05fb9aa43e6322582d902540a36087fd6366..937ad5bb64bb4b3dafd00cc589ae452b9e467a4c 100644 (file)
--- a/sope-gdl1/SQLite3/Version
+++ b/sope-gdl1/SQLite3/Version
@@ -1,3 +1,5 @@
 # Version file
 
-SUBMINOR_VERSION:=16
+SUBMINOR_VERSION:=17
+
+# v4.5.17 requires libGDLAccess v4.5.50