gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-19 17:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more name changes for PostgreSQLAdaptor.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@23527 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2006-09-15 13:42:00 +00:00
parent c442f1d885
commit 5591a4e998
11 changed files with 49 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile
View file

@ -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

8
EOAdaptors/PostgreSQLAdaptor/LoginPanel/Makefile.postamble
View file

@ -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

8
EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.h
View file

@ -1,5 +1,5 @@
/** -*-ObjC-*-
PostgresLoginPanel.h
PostgreSQLLoginPanel.h
Copyright (C) 2004,2005 Free Software Foundation, Inc.
@ -25,10 +25,10 @@
*/
#include <EOAccess/EOAccess.h>
#include "PostgresChannel.h"
#include "PostgresSQLExpression.h"
#include "PostgreSQLChannel.h"
#include "PostgreSQLExpression.h"
@interface PostgresLoginPanel : EOLoginPanel
@interface PostgreSQLLoginPanel : EOLoginPanel
{
/* gui stuff */
NSWindow *_win;

16
EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m
View file

@ -1,5 +1,5 @@
/** -*-ObjC-*-
PostgresLoginPanel.m
PostgreSQLLoginPanel.m
Copyright (C) 2004,2005 Free Software Foundation, Inc.
@ -33,11 +33,11 @@
#include <GNUstepBase/GSCategories.h>
#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..

10
EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m
View file

@ -70,11 +70,11 @@ RCS_ID("$Id$")
#include <EOAccess/EOEntity.h>
#include <EOAccess/EOModel.h>
#include <PostgreSQLEOAdaptor/PostgreSQLAdaptor.h>
#include <PostgreSQLEOAdaptor/PostgreSQLContext.h>
#include <PostgreSQLEOAdaptor/PostgreSQLChannel.h>
#include <PostgreSQLEOAdaptor/PostgreSQLExpression.h>
#include <PostgreSQLEOAdaptor/PostgreSQLValues.h>
#include "PostgreSQLAdaptor.h"
#include "PostgreSQLContext.h"
#include "PostgreSQLChannel.h"
#include "PostgreSQLExpression.h"
#include "PostgreSQLValues.h"
#include "PostgreSQLPrivate.h"

11
EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.h
View file

@ -31,14 +31,23 @@
#define __PostgreSQLChannel_h__
#include <EOAccess/EOAdaptorChannel.h>
#include <PostgreSQLEOAdaptor/PostgreSQLContext.h>
/* Include PostgreSQL Headers */
#undef Assert
#include <stdio.h>
#include <libpq-fe.h>
#include <libpq/libpq-fs.h>
#include <pg_config.h>
#undef Assert
@class NSString;
@class NSMutableDictionary;
@class NSMutableArray;
@class EOAttribute;
@class PostgreSQLContext;
@interface PostgreSQLChannel : EOAdaptorChannel
{
PostgreSQLContext *_adaptorContext;

7
EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m
View file

@ -73,9 +73,10 @@ RCS_ID("$Id$")
#include <EOAccess/EOModel.h>
#include <EOAccess/EOSQLExpression.h>
#include <PostgreSQLEOAdaptor/PostgreSQLChannel.h>
#include <PostgreSQLEOAdaptor/PostgreSQLContext.h>
#include <PostgreSQLEOAdaptor/PostgreSQLValues.h>
#include "PostgreSQLAdaptor.h"
#include "PostgreSQLChannel.h"
#include "PostgreSQLContext.h"
#include "PostgreSQLValues.h"
#include "PostgreSQLPrivate.h"

4
EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.h
View file

@ -31,8 +31,6 @@
#define __PostgreSQLContext_h__
#include <EOAccess/EOAdaptorContext.h>
#include <PostgreSQLEOAdaptor/PostgreSQLAdaptor.h>
@interface PostgreSQLContext : EOAdaptorContext
{
@ -45,7 +43,7 @@
} _flags;
}
- initWithAdaptor: (EOAdaptor *)adaptor;
- (id)initWithAdaptor: (EOAdaptor *)adaptor;
- (void)beginTransaction;
- (void)commitTransaction;

8
EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m
View file

@ -58,10 +58,10 @@ RCS_ID("$Id$")
#include <EOControl/EODebug.h>
#include <PostgreSQLEOAdaptor/PostgreSQLAdaptor.h>
#include <PostgreSQLEOAdaptor/PostgreSQLContext.h>
#include <PostgreSQLEOAdaptor/PostgreSQLChannel.h>
#include <PostgreSQLEOAdaptor/PostgreSQLExpression.h>
#include "PostgreSQLAdaptor.h"
#include "PostgreSQLContext.h"
#include "PostgreSQLChannel.h"
#include "PostgreSQLExpression.h"
@implementation PostgreSQLContext

8
configure vendored
View file

@ -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;}

4
configure.ac
View file

@ -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