From 5591a4e998340d053d2159cff09cb75cf78d1e2c Mon Sep 17 00:00:00 2001 From: David Ayers Date: Fri, 15 Sep 2006 13:42:00 +0000 Subject: [PATCH] more name changes for PostgreSQLAdaptor. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@23527 72102866-910b-0410-8b05-ffd578937521 --- .../PostgreSQLAdaptor/LoginPanel/GNUmakefile | 6 +++--- .../LoginPanel/Makefile.postamble | 8 ++++---- .../LoginPanel/PostgreSQLLoginPanel.h | 8 ++++---- .../LoginPanel/PostgreSQLLoginPanel.m | 16 ++++++++-------- EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m | 10 +++++----- EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.h | 11 ++++++++++- EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m | 7 ++++--- EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.h | 4 +--- EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m | 8 ++++---- configure | 8 ++++---- configure.ac | 4 ++-- 11 files changed, 49 insertions(+), 41 deletions(-) diff --git a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile index 39b6607..a949c49 100644 --- a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile +++ b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile @@ -36,8 +36,8 @@ endif endif LoginPanel_RESOURCE_FILES = postgreslogo.tif -LoginPanel_OBJC_FILES = PostgresLoginPanel.m -LoginPanel_PRINCIPAL_CLASS = PostgresLoginPanel +LoginPanel_OBJC_FILES = PostgreSQLLoginPanel.m +LoginPanel_PRINCIPAL_CLASS = PostgreSQLLoginPanel LoginPanel_INCLUDE_DIRS = -I.. -I../../.. LoginPanel_LIB_DIRS = \ @@ -49,7 +49,7 @@ ifneq ($(FOUNDATION_LIB),gnu) LoginPanel_OBJC_LIBS += -lgnustep-baseadd endif -LoginPanel_COPY_INTO_DIR = ../PostgresEOAdaptor.framework/Resources +LoginPanel_COPY_INTO_DIR = ../PostgreSQLEOAdaptor.framework/Resources include ../config.mak diff --git a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/Makefile.postamble b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/Makefile.postamble index 83cf9b7..008e37e 100644 --- a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/Makefile.postamble +++ b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/Makefile.postamble @@ -40,7 +40,7 @@ before-all:: @echo Skipping login panel compilation. GNUstep gui not installed. endif endif -before-all:: PostgresEOAdaptor +before-all:: PostgreSQLEOAdaptor # Things to do after compiling # after-all:: @@ -67,7 +67,7 @@ before-all:: PostgresEOAdaptor # Things to do after cleaning after-clean:: - rm -f PostgresEOAdaptor + rm -f PostgreSQLEOAdaptor # Things to do before distcleaning # before-distclean:: @@ -82,5 +82,5 @@ after-distclean:: # Things to do after checking # after-check:: -PostgresEOAdaptor: - ${LN_S} ../PostgresEOAdaptor.framework/Headers PostgresEOAdaptor +PostgreSQLEOAdaptor: + ${LN_S} ../PostgreSQLEOAdaptor.framework/Headers PostgreSQLEOAdaptor diff --git a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.h b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.h index 70a987d..639b4c8 100644 --- a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.h +++ b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.h @@ -1,5 +1,5 @@ /** -*-ObjC-*- - PostgresLoginPanel.h + PostgreSQLLoginPanel.h Copyright (C) 2004,2005 Free Software Foundation, Inc. @@ -25,10 +25,10 @@ */ #include -#include "PostgresChannel.h" -#include "PostgresSQLExpression.h" +#include "PostgreSQLChannel.h" +#include "PostgreSQLExpression.h" -@interface PostgresLoginPanel : EOLoginPanel +@interface PostgreSQLLoginPanel : EOLoginPanel { /* gui stuff */ NSWindow *_win; diff --git a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m index 36bfb09..a38aa2c 100644 --- a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m +++ b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m @@ -1,5 +1,5 @@ /** -*-ObjC-*- - PostgresLoginPanel.m + PostgreSQLLoginPanel.m Copyright (C) 2004,2005 Free Software Foundation, Inc. @@ -33,11 +33,11 @@ #include #endif -#include "PostgresLoginPanel.h" +#include "PostgreSQLLoginPanel.h" static BOOL insideModalLoop; -static NSString *windowTitle = @"Postgresql login"; +static NSString *windowTitle = @"PostgreSQLql login"; static NSString *newDatabaseTitle = @"New"; static NSString *userNameTitle = @"Username: "; static NSString *passwordTitle = @"Password: "; @@ -81,7 +81,7 @@ vfmaxf (int n, float aFloat, ...) -@implementation PostgresLoginPanel : EOLoginPanel +@implementation PostgreSQLLoginPanel : EOLoginPanel - (void) dealloc { @@ -407,7 +407,7 @@ vfmaxf (int n, float aFloat, ...) aMod = [EOModel new]; [aMod setName: @"AvailableDatabases"]; - [aMod setAdaptorName: @"Postgres"]; + [aMod setAdaptorName: @"PostgreSQL"]; /* we need a connection to a known database template1 should exist */ @@ -441,7 +441,7 @@ vfmaxf (int n, float aFloat, ...) if (!exceptionOccured) { [channel openChannel]; - databaseNames = [(PostgresChannel*)channel describeDatabaseNames]; + databaseNames = [(PostgreSQLChannel*)channel describeDatabaseNames]; [channel closeChannel]; RELEASE(aMod); } @@ -489,7 +489,7 @@ vfmaxf (int n, float aFloat, ...) { if (adminFlag) { - BOOL isAdmin = [(PostgresChannel*)adaptorChannel + BOOL isAdmin = [(PostgreSQLChannel*)adaptorChannel userNameIsAdministrative: [userNameField stringValue]]; if (!isAdmin) { @@ -602,7 +602,7 @@ vfmaxf (int n, float aFloat, ...) [userNameField stringValue],@"userName", [passwdField stringValue], @"password", nil]; - adaptor = [EOAdaptor adaptorWithName:@"Postgres"]; + adaptor = [EOAdaptor adaptorWithName:@"PostgreSQL"]; [adaptor setConnectionDictionary:connDict]; // hmm if the user isn't an admin the error is kinda ugly.. diff --git a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m index 036b284..0614133 100644 --- a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m +++ b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m @@ -70,11 +70,11 @@ RCS_ID("$Id$") #include #include -#include -#include -#include -#include -#include +#include "PostgreSQLAdaptor.h" +#include "PostgreSQLContext.h" +#include "PostgreSQLChannel.h" +#include "PostgreSQLExpression.h" +#include "PostgreSQLValues.h" #include "PostgreSQLPrivate.h" diff --git a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.h b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.h index f1d5118..22d0319 100644 --- a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.h +++ b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.h @@ -31,14 +31,23 @@ #define __PostgreSQLChannel_h__ #include -#include +/* Include PostgreSQL Headers */ + +#undef Assert +#include +#include +#include +#include +#undef Assert @class NSString; @class NSMutableDictionary; @class NSMutableArray; @class EOAttribute; +@class PostgreSQLContext; + @interface PostgreSQLChannel : EOAdaptorChannel { PostgreSQLContext *_adaptorContext; diff --git a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m index 0e51a7a..2ee69b5 100644 --- a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m +++ b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m @@ -73,9 +73,10 @@ RCS_ID("$Id$") #include #include -#include -#include -#include +#include "PostgreSQLAdaptor.h" +#include "PostgreSQLChannel.h" +#include "PostgreSQLContext.h" +#include "PostgreSQLValues.h" #include "PostgreSQLPrivate.h" diff --git a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.h b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.h index 9d1bb02..b706084 100644 --- a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.h +++ b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.h @@ -31,8 +31,6 @@ #define __PostgreSQLContext_h__ #include -#include - @interface PostgreSQLContext : EOAdaptorContext { @@ -45,7 +43,7 @@ } _flags; } -- initWithAdaptor: (EOAdaptor *)adaptor; +- (id)initWithAdaptor: (EOAdaptor *)adaptor; - (void)beginTransaction; - (void)commitTransaction; diff --git a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m index 5355d72..7c884b6 100644 --- a/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m +++ b/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m @@ -58,10 +58,10 @@ RCS_ID("$Id$") #include -#include -#include -#include -#include +#include "PostgreSQLAdaptor.h" +#include "PostgreSQLContext.h" +#include "PostgreSQLChannel.h" +#include "PostgreSQLExpression.h" @implementation PostgreSQLContext diff --git a/configure b/configure index 740fab9..4e4d77c 100755 --- a/configure +++ b/configure @@ -3186,7 +3186,7 @@ fi if test $enable_pgsql = yes; then - EOADAPTORS="$EOADAPTORS PostgreSQL" + EOADAPTORS="$EOADAPTORS PostgreSQLAdaptor" HAVE_PGSQL=1 # AC_DEFINE(HAVE_LIBXML,1, @@ -3232,7 +3232,7 @@ echo "${ECHO_T}$VERSION" >&6 #-------------------------------------------------------------------- # Write the Makefiles #-------------------------------------------------------------------- - ac_config_files="$ac_config_files gdl2.make GNUmakefile EOAdaptors/GNUmakefile EOAdaptors/PostgreSQL/GNUmakefile EOAdaptors/PostgreSQL/config.mak" + ac_config_files="$ac_config_files gdl2.make GNUmakefile EOAdaptors/GNUmakefile EOAdaptors/PostgreSQLAdaptor/GNUmakefile EOAdaptors/PostgreSQLAdaptor/config.mak" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3761,8 +3761,8 @@ do "gdl2.make" ) CONFIG_FILES="$CONFIG_FILES gdl2.make" ;; "GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; "EOAdaptors/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/GNUmakefile" ;; - "EOAdaptors/PostgreSQL/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/PostgreSQL/GNUmakefile" ;; - "EOAdaptors/PostgreSQL/config.mak" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/PostgreSQL/config.mak" ;; + "EOAdaptors/PostgreSQLAdaptor/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/PostgreSQLAdaptor/GNUmakefile" ;; + "EOAdaptors/PostgreSQLAdaptor/config.mak" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/PostgreSQLAdaptor/config.mak" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/configure.ac b/configure.ac index d6adf6a..2ef821d 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ AC_CONFIG_HEADER(config.h) AM_PATH_PGSQL(enable_pgsql=yes, enable_pgsql=no) if test $enable_pgsql = yes; then - EOADAPTORS="$EOADAPTORS PostgreSQL" + EOADAPTORS="$EOADAPTORS PostgreSQLAdaptor" HAVE_PGSQL=1 # AC_DEFINE(HAVE_LIBXML,1, @@ -79,5 +79,5 @@ AC_SUBST(GCC_VERSION) #-------------------------------------------------------------------- # Write the Makefiles #-------------------------------------------------------------------- -AC_CONFIG_FILES([gdl2.make GNUmakefile EOAdaptors/GNUmakefile EOAdaptors/PostgreSQL/GNUmakefile EOAdaptors/PostgreSQL/config.mak]) +AC_CONFIG_FILES([gdl2.make GNUmakefile EOAdaptors/GNUmakefile EOAdaptors/PostgreSQLAdaptor/GNUmakefile EOAdaptors/PostgreSQLAdaptor/config.mak]) AC_OUTPUT