diff --git a/Adaptors/PostgreSQL/PostgreSQLChannel.m b/Adaptors/PostgreSQL/PostgreSQLChannel.m index ace9acd..b08caaa 100644 --- a/Adaptors/PostgreSQL/PostgreSQLChannel.m +++ b/Adaptors/PostgreSQL/PostgreSQLChannel.m @@ -788,7 +788,7 @@ - (NSArray *)describeTableNames EOSQLExpression *expression; expression = [[[[[self adaptorContext] adaptor] expressionClass] alloc] init]; - [expression setStatement:@"SELECT c.oid AS tableoid, n.nspname AS schemaname, c.relname AS tablename, pg_get_userbyid(c.relowner) AS tableowner, c.relhasindex AS hasindexes, c.relhasrules AS hasrules, (c.reltriggers > 0) AS hastriggers FROM (pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::\"char\") OR (c.relkind = 's'::\"char\"))"]; + [expression setStatement:@"SELECT c.oid AS tableoid, n.nspname AS schemaname, c.relname AS tablename, pg_get_userbyid(c.relowner) AS tableowner, c.relhasindex AS hasindexes, c.relhasrules AS hasrules, (c.relhastriggers = 'yes') AS hastriggers FROM (pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::\"char\") OR (c.relkind = 's'::\"char\"))"]; NS_DURING [self evaluateExpression:expression]; @@ -819,7 +819,7 @@ - (EOEntity *)_createEntityForTableNamed:(NSString *)name EOEntity *entity; expression = [[[[[self adaptorContext] adaptor] expressionClass] alloc] init]; - [expression setStatement:EOFormat(@"SELECT c.oid AS tableoid, n.nspname AS schemaname, c.relname AS tablename, pg_get_userbyid(c.relowner) AS tableowner, c.relhasindex AS hasindexes, c.relhasrules AS hasrules, (c.reltriggers > 0) AS hastriggers FROM (pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::\"char\") OR (c.relkind = 's'::\"char\")) AND (c.relname = '%@' AND n.nspname = 'public')", name)]; + [expression setStatement:EOFormat(@"SELECT c.oid AS tableoid, n.nspname AS schemaname, c.relname AS tablename, pg_get_userbyid(c.relowner) AS tableowner, c.relhasindex AS hasindexes, c.relhasrules AS hasrules, (c.relhastriggers = 'yes') AS hastriggers FROM (pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::\"char\") OR (c.relkind = 's'::\"char\")) AND (c.relname = '%@' AND n.nspname = 'public')", name)]; [self evaluateExpression:expression]; row = [self fetchRowWithZone:NULL]; [self cancelFetch]; @@ -946,9 +946,9 @@ - (EOEntity *)_createEntityForTableNamed:(NSString *)name - (EOModel *)describeModelWithTableNames:(NSArray *)tableNames { EOModel *model; - int x; - int numTableNames; - NSString *EOName; + NSInteger x; + NSInteger numTableNames; + NSString *EOName; model = [[EOModel allocWithZone:[self zone]] init]; EOName = [[[[self adaptorContext] adaptor] connectionDictionary] objectForKey:@"databaseName"]; diff --git a/Adaptors/PostgreSQLInterface copy-Info.plist b/Adaptors/PostgreSQLInterface copy-Info.plist new file mode 100644 index 0000000..055ad03 --- /dev/null +++ b/Adaptors/PostgreSQLInterface copy-Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + PostgreSQLInterface + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + BNDL + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/EOModeler/EOModeler.xcodeproj/project.pbxproj b/EOModeler/EOModeler.xcodeproj/project.pbxproj index f05e1c5..45a4261 100644 --- a/EOModeler/EOModeler.xcodeproj/project.pbxproj +++ b/EOModeler/EOModeler.xcodeproj/project.pbxproj @@ -1440,6 +1440,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = Yes; + EOAdaptorDebugEnabled = YES; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_DYNAMIC_NO_PIC = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1448,6 +1449,7 @@ GCC_PREFIX_HEADER = EOModeler_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Applications; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_BUNDLE_IDENTIFIER = com.ajr.EOModeler; PRODUCT_NAME = EOModeler; WRAPPER_EXTENSION = app; @@ -1458,6 +1460,7 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; + EOAdaptorDebugEnabled = NO; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1465,6 +1468,7 @@ GCC_PREFIX_HEADER = EOModeler_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Applications; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_BUNDLE_IDENTIFIER = com.ajr.EOModeler; PRODUCT_NAME = EOModeler; WRAPPER_EXTENSION = app; @@ -1474,6 +1478,7 @@ 70BEAF1509590ED1005ACB45 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + EOAdaptorDebugEnabled = NO; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1481,6 +1486,7 @@ GCC_PREFIX_HEADER = EOModeler_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Applications; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_BUNDLE_IDENTIFIER = com.ajr.EOModeler; PRODUCT_NAME = EOModeler; WRAPPER_EXTENSION = app; diff --git a/EOModeler/Fixes/NSComboBoxCellFix.m b/EOModeler/Fixes/NSComboBoxCellFix.m index 8253156..158171d 100644 --- a/EOModeler/Fixes/NSComboBoxCellFix.m +++ b/EOModeler/Fixes/NSComboBoxCellFix.m @@ -152,9 +152,9 @@ - (id)_ajrInitWithCoder:(NSCoder *)coder case NSMiniControlSize: [self setFont:[[NSFontManager sharedFontManager] convertFont:[self font] toSize:[NSFont smallSystemFontSize] - 2.0]]; break; - case NSControlSizeLarge: - [self setFont:[[NSFontManager sharedFontManager] convertFont:[self font] toSize:[NSFont systemFontSize] + 2.0]]; - break; +// case NSControlSizeLarge: +// [self setFont:[[NSFontManager sharedFontManager] convertFont:[self font] toSize:[NSFont systemFontSize] + 2.0]]; +// break; } return self;