Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1316

Timestamp:

07/07/09 14:40:22 (13 months ago)

Author:

tsnorri

Message:

Database model object export enhancements
- The user can now choose relationship naming style when exporting to reduce the amount of arrows in the graph.
- There is now an experimental mom exporter.
- The m4 build rule for BaseTen? Assistant now handles spaces in path.
- Added snprintf.c to SQL parser target, because the symbols seemed to be required.

Location:

Files:

: 2 added
: 12 modified

BaseTen.xcodeproj/project.pbxproj (modified) (10 diffs)
BaseTenAssistant/BaseTenAssistant.xcodeproj/project.pbxproj (modified) (1 diff)
BaseTenAssistant/English.lproj/MainMenu.xib (modified) (64 diffs)
BaseTenAssistant/Sources/BXAController.h (modified) (2 diffs)
BaseTenAssistant/Sources/BXAController.m (modified) (5 diffs)
Sources/BXConstants.h (modified) (1 diff)
Sources/BXDatabaseObjectModelMOMSerialization.h (added)
Sources/BXDatabaseObjectModelMOMSerialization.mm (added)
Sources/BXDatabaseObjectModelXMLSerialization.h (modified) (1 diff)
Sources/BXDatabaseObjectModelXMLSerialization.m (modified) (2 diffs)
Sources/BXPGInterface.m (modified) (2 diffs)
Sources/BXRelationshipDescription.h (modified) (1 diff)
Sources/BXRelationshipDescription.m (modified) (1 diff)
Sources/BXRelationshipDescriptionPrivate.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/BaseTen.xcodeproj/project.pbxproj

r1304	r1316
387	387	53CE950F0E658CE400063193 /* BXPGExpressionValueType.m in Sources / = {isa = PBXBuildFile; fileRef = 53CE950D0E658CE400063193 / BXPGExpressionValueType.m */; };
388	388	53CE953B0E658E2600063193 /* BXPredicateVisitor.m in Sources / = {isa = PBXBuildFile; fileRef = 53526E090E5D70EB00B67550 / BXPredicateVisitor.m */; };
	389	53D0482110021E07001A92FB /* BXDatabaseObjectModelMOMSerialization.h in Headers / = {isa = PBXBuildFile; fileRef = 53D0481F10021E07001A92FB / BXDatabaseObjectModelMOMSerialization.h */; settings = {ATTRIBUTES = (Private, ); }; };
	390	53D0482210021E07001A92FB /* BXDatabaseObjectModelMOMSerialization.mm in Sources / = {isa = PBXBuildFile; fileRef = 53D0482010021E07001A92FB / BXDatabaseObjectModelMOMSerialization.mm */; };
	391	53D048AB10022072001A92FB /* snprintf.c in Sources / = {isa = PBXBuildFile; fileRef = 53D048AA10022072001A92FB / snprintf.c */; };
389	392	53D672BA0E55CD5F00D8A5F8 /* PGTSProbes.d in Sources / = {isa = PBXBuildFile; fileRef = 53666CC80E1CD8D20028DBEA / PGTSProbes.d */; };
390	393	53D672BC0E55CD6200D8A5F8 /* PGTSQuery.m in Sources / = {isa = PBXBuildFile; fileRef = 53666CCA0E1CD8D20028DBEA / PGTSQuery.m */; };
…	…
953	956	53CE950C0E658CE400063193 /* BXPGExpressionValueType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BXPGExpressionValueType.h; path = Sources/BXPGExpressionValueType.h; sourceTree = "<group>"; };
954	957	53CE950D0E658CE400063193 /* BXPGExpressionValueType.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; name = BXPGExpressionValueType.m; path = Sources/BXPGExpressionValueType.m; sourceTree = "<group>"; };
	958	53D0481F10021E07001A92FB /* BXDatabaseObjectModelMOMSerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BXDatabaseObjectModelMOMSerialization.h; path = Sources/BXDatabaseObjectModelMOMSerialization.h; sourceTree = "<group>"; };
	959	53D0482010021E07001A92FB /* BXDatabaseObjectModelMOMSerialization.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BXDatabaseObjectModelMOMSerialization.mm; path = Sources/BXDatabaseObjectModelMOMSerialization.mm; sourceTree = "<group>"; };
	960	53D048AA10022072001A92FB /* snprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snprintf.c; path = "/Users/tsnorri/Build/Debug/BaseTen-PostgreSQL/postgresql-8.3.7/src/port/snprintf.c"; sourceTree = "<absolute>"; };
955	961	53D0D19B0B6F90B300D2D101 /* BXPGCertificateVerificationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BXPGCertificateVerificationDelegate.h; path = Sources/BXPGCertificateVerificationDelegate.h; sourceTree = "<group>"; };
956	962	53D0D19C0B6F90B300D2D101 /* BXPGCertificateVerificationDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BXPGCertificateVerificationDelegate.m; path = Sources/BXPGCertificateVerificationDelegate.m; sourceTree = "<group>"; };
…	…
1169	1175	53671B490FABAC5F002FD0B4 /* BXDatabaseObjectModelXMLSerialization.h */,
1170	1176	53671B4A0FABAC5F002FD0B4 /* BXDatabaseObjectModelXMLSerialization.m */,
	1177	53D0481F10021E07001A92FB /* BXDatabaseObjectModelMOMSerialization.h */,
	1178	53D0482010021E07001A92FB /* BXDatabaseObjectModelMOMSerialization.mm */,
1171	1179	53B8730F0A0A53D9007315BC /* Descriptions */,
1172	1180	);
…	…
1476	1484	538A82B90E1D15BB0025B3C8 /* print.c */,
1477	1485	538A83050E1D1DD30025B3C8 /* prompt.c */,
	1486	53D048AA10022072001A92FB /* snprintf.c */,
1478	1487	538A82F80E1D1C1B0025B3C8 /* stringutils.c */,
1479	1488	538A82B60E1D151D0025B3C8 /* variables.c */,
…	…
1819	1828	536206550FB87E8C00ACAE57 /* PGTSDates.h in Headers */,
1820	1829	53015A850FBEF22400E52C1E /* BXArraySize.h in Headers */,
	1830	53D0482110021E07001A92FB /* BXDatabaseObjectModelMOMSerialization.h in Headers */,
1821	1831	);
1822	1832	runOnlyForDeploymentPostprocessing = 0;
…	…
2256	2266	5362062B0FB87A0300ACAE57 /* PGTSValueTypes.m in Sources */,
2257	2267	536206530FB87DDA00ACAE57 /* PGTSValuePlaceholder.m in Sources */,
	2268	53D0482210021E07001A92FB /* BXDatabaseObjectModelMOMSerialization.mm in Sources */,
2258	2269	);
2259	2270	runOnlyForDeploymentPostprocessing = 0;
…	…
2275	2286	538A83870E1D2ACE0025B3C8 /* prompt.c in Sources */,
2276	2287	538A83880E1D2ACF0025B3C8 /* stringutils.c in Sources */,
	2288	53D048AB10022072001A92FB /* snprintf.c in Sources */,
2277	2289	);
2278	2290	runOnlyForDeploymentPostprocessing = 0;
…	…
2552	2564	GCC_ENABLE_OBJC_GC = supported;
2553	2565	GCC_OPTIMIZATION_LEVEL = 0;
	2566	GCC_VERSION = 4.0;
2554	2567	HEADER_SEARCH_PATHS = (
2555	2568	"$(BUILT_PRODUCTS_DIR)/BaseTen-PostgreSQL/postgresql",
…	…
2590	2603	GCC_ENABLE_FIX_AND_CONTINUE = NO;
2591	2604	GCC_ENABLE_OBJC_GC = supported;
	2605	GCC_VERSION = 4.0;
2592	2606	HEADER_SEARCH_PATHS = (
2593	2607	"$(BUILT_PRODUCTS_DIR)/BaseTen-PostgreSQL/postgresql",
…	…
2709	2723	GCC_ENABLE_OBJC_GC = supported;
2710	2724	GCC_OPTIMIZATION_LEVEL = 0;
	2725	GCC_VERSION = 4.0;
2711	2726	HEADER_SEARCH_PATHS = (
2712	2727	"$(BUILT_PRODUCTS_DIR)/BaseTen-PostgreSQL/postgresql",

trunk/BaseTenAssistant/BaseTenAssistant.xcodeproj/project.pbxproj

r1308	r1316
74	74	"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}",
75	75	);
76		script = "m4 ~~${INPUT_FILE_PATH} > ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}~~";
	76	script = "m4 \"${INPUT_FILE_PATH}\" > \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}\"";
77	77	};
78	78	/* End PBXBuildRule section */

trunk/BaseTenAssistant/English.lproj/MainMenu.xib

r1279	r1316
10	10	<bool key="EncodedWithXMLCoder">YES</bool>
11	11	<integer value="825"/>
	12	<integer value="629"/>
12	13	<integer value="449"/>
13		<integer value="629"/>
14		<integer value="1094"/>
	14	<integer value="1097"/>
15	15	</object>
16	16	<object class="NSArray" key="IBDocument.PluginDependencies">
…	…
211	211	<string key="NSToolbarItemToolTip">Customize Toolbar</string>
212	212	<nil key="NSToolbarItemView"/>
213		<object class="NSImage" key="NSToolbarItemImage" id="5~~49553732~~">
	213	<object class="NSImage" key="NSToolbarItemImage" id="578314448">
214	214	<int key="NSImageFlags">683671552</int>
215	215	<string key="NSSize">{32, 32}</string>
…	…
297	297	</object>
298	298	</object>
299		<object class="NSColor" key="NSColor" id="~~104525784~~8">
	299	<object class="NSColor" key="NSColor" id="216120738">
300	300	<int key="NSColorSpace">3</int>
301	301	<bytes key="NSWhite">MCAwAA</bytes>
…	…
504	504	<double key="NSMaxWidth">1.000000e+03</double>
505	505	<object class="NSTableHeaderCell" key="NSHeaderCell">
506		<int key="NSCellFlags">75628032</int>
507		<int key="NSCellFlags2">0</int>
	506	<int key="NSCellFlags">75628096</int>
	507	<int key="NSCellFlags2">2048</int>
508	508	<string key="NSContents">Schema</string>
509	509	<reference key="NSSupport" ref="26"/>
…	…
596	596	<object class="NSScroller" id="185590363">
597	597	<reference key="NSNextResponder" ref="552675218"/>
598		<int key="NSvFlags">~~256~~</int>
	598	<int key="NSvFlags">-2147483392</int>
599	599	<string key="NSFrame">{{-100, -100}, {188, 15}}</string>
600	600	<reference key="NSSuperview" ref="552675218"/>
…	…
667	667	<double key="NSMaxWidth">1.000000e+03</double>
668	668	<object class="NSTableHeaderCell" key="NSHeaderCell">
669		<int key="NSCellFlags">75628032</int>
670		<int key="NSCellFlags2">0</int>
	669	<int key="NSCellFlags">75628096</int>
	670	<int key="NSCellFlags2">2048</int>
671	671	<string key="NSContents">Tables and Views</string>
672	672	<reference key="NSSupport" ref="26"/>
…	…
695	695	<double key="NSMaxWidth">1.000000e+03</double>
696	696	<object class="NSTableHeaderCell" key="NSHeaderCell">
697		<int key="NSCellFlags">75628032</int>
698		<int key="NSCellFlags2">0</int>
	697	<int key="NSCellFlags">75628096</int>
	698	<int key="NSCellFlags2">2048</int>
699	699	<string key="NSContents">Enabled</string>
700	700	<reference key="NSSupport" ref="26"/>
…	…
710	710	<int key="NSButtonFlags">1215582719</int>
711	711	<int key="NSButtonFlags2">2</int>
712		<object class="NSCustomResource" key="NSNormalImage">
	712	<object class="NSCustomResource" key="NSNormalImage" id="902320579">
713	713	<string key="NSClassName">NSImage</string>
714	714	<string key="NSResourceName">NSSwitch</string>
715	715	</object>
716		<object class="NSButtonImageSource" key="NSAlternateImage">
	716	<object class="NSButtonImageSource" key="NSAlternateImage" id="707487436">
717	717	<string key="NSImageName">NSSwitch</string>
718	718	</object>
…	…
766	766	<object class="NSScroller" id="762737495">
767	767	<reference key="NSNextResponder" ref="819491386"/>
768		<int key="NSvFlags">~~256~~</int>
	768	<int key="NSvFlags">-2147483392</int>
769	769	<string key="NSFrame">{{-100, -100}, {283, 15}}</string>
770	770	<reference key="NSSuperview" ref="819491386"/>
…	…
1008	1008	<string>allowsFloats</string>
1009	1009	<string>formatterBehavior</string>
	1010	<string>locale</string>
1010	1011	<string>maximum</string>
1011	1012	<string>minimum</string>
…	…
1015	1016	<integer value="1" id="9"/>
1016	1017	<integer value="1040"/>
1017		<real value="6.553500e+04" id="781511585"/>
	1018	<object class="NSLocale">
	1019	<string key="NS.identifier"/>
	1020	</object>
	1021	<real value="6.553500e+04" id="686712097"/>
1018	1022	<reference ref="9"/>
1019	1023	</object>
…	…
1042	1046	</object>
1043	1047	<reference key="NS.min" ref="9"/>
1044		<reference key="NS.max" ref="~~781511585~~"/>
	1048	<reference key="NS.max" ref="686712097"/>
1045	1049	<object class="NSDecimalNumberHandler" key="NS.rounding">
1046	1050	<int key="NS.roundingmode">3</int>
…	…
1049	1053	<bool key="NS.raise.dividebyzero">YES</bool>
1050	1054	</object>
1051		<string key="NS.decimal">,</string>
1052		<string ~~type="base64-UTF8" key="NS.thousand">wqA~~</string>
	1055	<string key="NS.decimal">.</string>
	1056	<string key="NS.thousand">,</string>
1053	1057	<bool key="NS.hasthousands">NO</bool>
1054		<bool key="NS.localized">~~YES~~</bool>
	1058	<bool key="NS.localized">NO</bool>
1055	1059	<bool key="NS.allowsfloats">YES</bool>
1056	1060	</object>
…	…
1396	1400	<object class="NSScroller" id="1061755770">
1397	1401	<reference key="NSNextResponder" ref="392771615"/>
1398		<int key="NSvFlags">~~256~~</int>
	1402	<int key="NSvFlags">-2147483392</int>
1399	1403	<string key="NSFrame">{{-100, -100}, {343, 15}}</string>
1400	1404	<reference key="NSSuperview" ref="392771615"/>
…	…
1602	1606	<string key="NSToolbarItemToolTip">Customize Toolbar</string>
1603	1607	<nil key="NSToolbarItemView"/>
1604		<reference key="NSToolbarItemImage" ref="5~~49553732~~"/>
	1608	<reference key="NSToolbarItemImage" ref="578314448"/>
1605	1609	<nil key="NSToolbarItemTarget"/>
1606	1610	<string key="NSToolbarItemAction">runToolbarCustomizationPalette:</string>
…	…
1676	1680	</object>
1677	1681	</object>
1678		<reference key="NSColor" ref="~~104525784~~8"/>
	1682	<reference key="NSColor" ref="216120738"/>
1679	1683	</object>
1680	1684	<nil key="NSToolbarItemTarget"/>
…	…
1884	1888	<object class="NSScroller" id="965050326">
1885	1889	<reference key="NSNextResponder" ref="81154272"/>
1886		<int key="NSvFlags">~~256~~</int>
	1890	<int key="NSvFlags">-2147483392</int>
1887	1891	<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
1888	1892	<reference key="NSSuperview" ref="81154272"/>
…	…
2551	2555	<object class="NSMutableArray" key="NSSubviews">
2552	2556	<bool key="EncodedWithXMLCoder">YES</bool>
	2557	<object class="NSMatrix" id="165541584">
	2558	<reference key="NSNextResponder" ref="305647686"/>
	2559	<int key="NSvFlags">256</int>
	2560	<string key="NSFrame">{{20, 20}, {283, 40}}</string>
	2561	<reference key="NSSuperview" ref="305647686"/>
	2562	<bool key="NSEnabled">YES</bool>
	2563	<int key="NSNumRows">2</int>
	2564	<int key="NSNumCols">1</int>
	2565	<object class="NSMutableArray" key="NSCells">
	2566	<bool key="EncodedWithXMLCoder">YES</bool>
	2567	<object class="NSButtonCell" id="640228329">
	2568	<int key="NSCellFlags">-2080244224</int>
	2569	<int key="NSCellFlags2">0</int>
	2570	<string key="NSContents">Relationships usign foreign key names</string>
	2571	<reference key="NSSupport" ref="920870547"/>
	2572	<reference key="NSControlView" ref="165541584"/>
	2573	<int key="NSButtonFlags">1211912703</int>
	2574	<int key="NSButtonFlags2">2</int>
	2575	<reference key="NSNormalImage" ref="902320579"/>
	2576	<reference key="NSAlternateImage" ref="707487436"/>
	2577	<string key="NSAlternateContents"/>
	2578	<string key="NSKeyEquivalent"/>
	2579	<int key="NSPeriodicDelay">200</int>
	2580	<int key="NSPeriodicInterval">25</int>
	2581	</object>
	2582	<object class="NSButtonCell" id="383068874">
	2583	<int key="NSCellFlags">67239424</int>
	2584	<int key="NSCellFlags2">0</int>
	2585	<string key="NSContents">Relationships using target relation names</string>
	2586	<reference key="NSSupport" ref="920870547"/>
	2587	<reference key="NSControlView" ref="165541584"/>
	2588	<int key="NSButtonFlags">1211912703</int>
	2589	<int key="NSButtonFlags2">2</int>
	2590	<object class="NSImage" key="NSNormalImage" id="412863630">
	2591	<int key="NSImageFlags">12779520</int>
	2592	<object class="NSMutableArray" key="NSReps">
	2593	<bool key="EncodedWithXMLCoder">YES</bool>
	2594	<object class="NSArray">
	2595	<bool key="EncodedWithXMLCoder">YES</bool>
	2596	<reference ref="8"/>
	2597	<object class="NSCoreUIImageRep">
	2598	<object class="NSMutableDictionary" key="NSCoreUIImageOptions">
	2599	<bool key="EncodedWithXMLCoder">YES</bool>
	2600	<object class="NSMutableArray" key="dict.sortedKeys">
	2601	<bool key="EncodedWithXMLCoder">YES</bool>
	2602	<string>size</string>
	2603	<string>state</string>
	2604	<string>value</string>
	2605	<string>widget</string>
	2606	</object>
	2607	<object class="NSMutableArray" key="dict.values">
	2608	<bool key="EncodedWithXMLCoder">YES</bool>
	2609	<string>regular</string>
	2610	<string>normal</string>
	2611	<reference ref="8"/>
	2612	<string>checkbox</string>
	2613	</object>
	2614	</object>
	2615	<string key="NSSize">{18, 18}</string>
	2616	<int key="NSBitsPerSample">0</int>
	2617	<bool key="NSHasAlpha">YES</bool>
	2618	<string key="NSColorSpaceName">NSCalibratedRGBColorSpace</string>
	2619	</object>
	2620	</object>
	2621	</object>
	2622	<reference key="NSColor" ref="216120738"/>
	2623	</object>
	2624	<reference key="NSAlternateImage" ref="707487436"/>
	2625	<string key="NSAlternateContents"/>
	2626	<int key="NSPeriodicDelay">200</int>
	2627	<int key="NSPeriodicInterval">25</int>
	2628	</object>
	2629	</object>
	2630	<string key="NSCellSize">{283, 20}</string>
	2631	<string key="NSIntercellSpacing">{0, 0}</string>
	2632	<int key="NSMatrixFlags">-2080374784</int>
	2633	<nil key="NSCellClass"/>
	2634	<object class="NSButtonCell" key="NSProtoCell" id="1033590321">
	2635	<int key="NSCellFlags">-2080244224</int>
	2636	<int key="NSCellFlags2">0</int>
	2637	<string key="NSContents">Check</string>
	2638	<reference key="NSSupport" ref="920870547"/>
	2639	<int key="NSButtonFlags">1211912703</int>
	2640	<int key="NSButtonFlags2">2</int>
	2641	<reference key="NSNormalImage" ref="412863630"/>
	2642	<reference key="NSAlternateImage" ref="707487436"/>
	2643	<string key="NSAlternateContents"/>
	2644	<int key="NSPeriodicDelay">200</int>
	2645	<int key="NSPeriodicInterval">25</int>
	2646	</object>
	2647	<int key="NSSelectedRow">-1</int>
	2648	<int key="NSSelectedCol">-1</int>
	2649	<reference key="NSBackgroundColor" ref="846343457"/>
	2650	<reference key="NSCellBackgroundColor" ref="846343457"/>
	2651	</object>
2553	2652	<object class="NSPopUpButton" id="690133665">
2554	2653	<reference key="NSNextResponder" ref="305647686"/>
2555	2654	<int key="NSvFlags">268</int>
2556		<string key="NSFrame">{{72, ~~16}, {206~~, 26}}</string>
	2655	<string key="NSFrame">{{72, 68}, {234, 26}}</string>
2557	2656	<reference key="NSSuperview" ref="305647686"/>
2558	2657	<bool key="NSEnabled">YES</bool>
…	…
2611	2710	<reference key="NSTarget" ref="971332630"/>
2612	2711	</object>
	2712	<object class="NSMenuItem" id="507231372">
	2713	<reference key="NSMenu" ref="1377"/>
	2714	<string key="NSTitle">MOM (Experimental)</string>
	2715	<string key="NSKeyEquiv"/>
	2716	<int key="NSMnemonicLoc">2147483647</int>
	2717	<reference key="NSOnImage" ref="622407158"/>
	2718	<reference key="NSMixedImage" ref="978181122"/>
	2719	<string key="NSAction">_popUpItemAction:</string>
	2720	<int key="NSTag">4</int>
	2721	<reference key="NSTarget" ref="971332630"/>
	2722	</object>
2613	2723	</object>
2614	2724	</object>
…	…
2622	2732	<reference key="NSNextResponder" ref="305647686"/>
2623	2733	<int key="NSvFlags">268</int>
2624		<string key="NSFrame">{{17, 22}, {53, 17}}</string>
	2734	<string key="NSFrame">{{17, 74}, {53, 17}}</string>
2625	2735	<reference key="NSSuperview" ref="305647686"/>
2626	2736	<bool key="NSEnabled">YES</bool>
…	…
2636	2746	</object>
2637	2747	</object>
2638		<string key="NSFrameSize">{~~295, 60~~}</string>
	2748	<string key="NSFrameSize">{323, 112}</string>
2639	2749	<reference key="NSSuperview"/>
2640	2750	<string key="NSClassName">NSView</string>
…	…
3504	3614	<int key="connectionID">1113</int>
3505	3615	</object>
	3616	<object class="IBConnectionRecord">
	3617	<object class="IBBindingConnection" key="connection">
	3618	<string key="label">value: exportsUsingFkeyNames</string>
	3619	<reference key="source" ref="640228329"/>
	3620	<reference key="destination" ref="1038163843"/>
	3621	<object class="NSNibBindingConnector" key="connector">
	3622	<reference key="NSSource" ref="640228329"/>
	3623	<reference key="NSDestination" ref="1038163843"/>
	3624	<string key="NSLabel">value: exportsUsingFkeyNames</string>
	3625	<string key="NSBinding">value</string>
	3626	<string key="NSKeyPath">exportsUsingFkeyNames</string>
	3627	<int key="NSNibBindingConnectorVersion">2</int>
	3628	</object>
	3629	</object>
	3630	<int key="connectionID">1120</int>
	3631	</object>
	3632	<object class="IBConnectionRecord">
	3633	<object class="IBBindingConnection" key="connection">
	3634	<string key="label">value: exportsUsingTargetRelationNames</string>
	3635	<reference key="source" ref="383068874"/>
	3636	<reference key="destination" ref="1038163843"/>
	3637	<object class="NSNibBindingConnector" key="connector">
	3638	<reference key="NSSource" ref="383068874"/>
	3639	<reference key="NSDestination" ref="1038163843"/>
	3640	<string key="NSLabel">value: exportsUsingTargetRelationNames</string>
	3641	<string key="NSBinding">value</string>
	3642	<string key="NSKeyPath">exportsUsingTargetRelationNames</string>
	3643	<int key="NSNibBindingConnectorVersion">2</int>
	3644	</object>
	3645	</object>
	3646	<int key="connectionID">1121</int>
	3647	</object>
3506	3648	</object>
3507	3649	<object class="IBMutableOrderedSet" key="objectRecords">
…	…
3510	3652	<object class="IBObjectRecord">
3511	3653	<int key="objectID">0</int>
3512		<object class="NSArray" key="object" id="1049">
	3654	<object class="NSArray" key="object" id="1012779145">
3513	3655	<bool key="EncodedWithXMLCoder">YES</bool>
3514	3656	</object>
…	…
3519	3661	<int key="objectID">-2</int>
3520	3662	<reference key="object" ref="1021"/>
3521		<reference key="parent" ref="1049"/>
	3663	<reference key="parent" ref="1012779145"/>
3522	3664	<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
3523	3665	</object>
…	…
3525	3667	<int key="objectID">-1</int>
3526	3668	<reference key="object" ref="1014"/>
3527		<reference key="parent" ref="1049"/>
	3669	<reference key="parent" ref="1012779145"/>
3528	3670	<string key="objectName">First Responder</string>
3529	3671	</object>
…	…
3531	3673	<int key="objectID">-3</int>
3532	3674	<reference key="object" ref="1050"/>
3533		<reference key="parent" ref="1049"/>
	3675	<reference key="parent" ref="1012779145"/>
3534	3676	<string key="objectName">Application</string>
3535	3677	</object>
…	…
3537	3679	<int key="objectID">373</int>
3538	3680	<reference key="object" ref="163992474"/>
3539		<reference key="parent" ref="1049"/>
	3681	<reference key="parent" ref="1012779145"/>
3540	3682	</object>
3541	3683	<object class="IBObjectRecord">
…	…
3547	3689	<reference ref="355835359"/>
3548	3690	</object>
3549		<reference key="parent" ref="1049"/>
	3691	<reference key="parent" ref="1012779145"/>
3550	3692	</object>
3551	3693	<object class="IBObjectRecord">
…	…
3707	3849	<int key="objectID">472</int>
3708	3850	<reference key="object" ref="398472180"/>
3709		<reference key="parent" ref="1049"/>
	3851	<reference key="parent" ref="1012779145"/>
3710	3852	<string key="objectName">Entities by schema</string>
3711	3853	</object>
…	…
3713	3855	<int key="objectID">510</int>
3714	3856	<reference key="object" ref="322438973"/>
3715		<reference key="parent" ref="1049"/>
	3857	<reference key="parent" ref="1012779145"/>
3716	3858	</object>
3717	3859	<object class="IBObjectRecord">
…	…
3722	3864	<reference ref="55362827"/>
3723	3865	</object>
3724		<reference key="parent" ref="1049"/>
	3866	<reference key="parent" ref="1012779145"/>
3725	3867	<string key="objectName">Connection Panel</string>
3726	3868	</object>
…	…
3913	4055	<int key="objectID">564</int>
3914	4056	<reference key="object" ref="593169211"/>
3915		<reference key="parent" ref="1049"/>
	4057	<reference key="parent" ref="1012779145"/>
3916	4058	<string key="objectName">Attributes by name</string>
3917	4059	</object>
…	…
3928	4070	<reference ref="897401339"/>
3929	4071	</object>
3930		<reference key="parent" ref="1049"/>
	4072	<reference key="parent" ref="1012779145"/>
3931	4073	<string key="objectName">MainMenu</string>
3932	4074	</object>
…	…
4196	4338	<reference ref="106977268"/>
4197	4339	</object>
4198		<reference key="parent" ref="1049"/>
	4340	<reference key="parent" ref="1012779145"/>
4199	4341	<string key="objectName">Progress panel</string>
4200	4342	</object>
…	…
4232	4374	<int key="objectID">716</int>
4233	4375	<reference key="object" ref="1038163843"/>
4234		<reference key="parent" ref="1049"/>
	4376	<reference key="parent" ref="1012779145"/>
4235	4377	</object>
4236	4378	<object class="IBObjectRecord">
4237	4379	<int key="objectID">717</int>
4238	4380	<reference key="object" ref="418952110"/>
4239		<reference key="parent" ref="1049"/>
	4381	<reference key="parent" ref="1012779145"/>
4240	4382	</object>
4241	4383	<object class="IBObjectRecord">
4242	4384	<int key="objectID">749</int>
4243	4385	<reference key="object" ref="80697434"/>
4244		<reference key="parent" ref="1049"/>
	4386	<reference key="parent" ref="1012779145"/>
4245	4387	<string key="objectName">Entities by name</string>
4246	4388	</object>
…	…
4252	4394	<reference ref="957137145"/>
4253	4395	</object>
4254		<reference key="parent" ref="1049"/>
	4396	<reference key="parent" ref="1012779145"/>
4255	4397	<string key="objectName">momc fail</string>
4256	4398	</object>
…	…
4303	4445	<reference ref="470478207"/>
4304	4446	</object>
4305		<reference key="parent" ref="1049"/>
	4447	<reference key="parent" ref="1012779145"/>
4306	4448	<string key="objectName">Log Window</string>
4307	4449	</object>
…	…
4773	4915	<reference ref="690133665"/>
4774	4916	<reference ref="127939036"/>
4775		</object>
4776		<reference key="parent" ref="1049"/>
	4917	<reference ref="165541584"/>
	4918	</object>
	4919	<reference key="parent" ref="1012779145"/>
4777	4920	<string key="objectName">Data Model Export</string>
4778	4921	</object>
…	…
4803	4946	<reference ref="318307494"/>
4804	4947	<reference ref="929742981"/>
	4948	<reference ref="507231372"/>
4805	4949	</object>
4806	4950	<reference key="parent" ref="971332630"/>
…	…
4852	4996	<reference key="parent" ref="452600950"/>
4853	4997	<string key="objectName">2</string>
	4998	</object>
	4999	<object class="IBObjectRecord">
	5000	<int key="objectID">1116</int>
	5001	<reference key="object" ref="165541584"/>
	5002	<object class="NSMutableArray" key="children">
	5003	<bool key="EncodedWithXMLCoder">YES</bool>
	5004	<reference ref="1033590321"/>
	5005	<reference ref="640228329"/>
	5006	<reference ref="383068874"/>
	5007	</object>
	5008	<reference key="parent" ref="305647686"/>
	5009	</object>
	5010	<object class="IBObjectRecord">
	5011	<int key="objectID">1118</int>
	5012	<reference key="object" ref="1033590321"/>
	5013	<reference key="parent" ref="165541584"/>
	5014	</object>
	5015	<object class="IBObjectRecord">
	5016	<int key="objectID">1115</int>
	5017	<reference key="object" ref="640228329"/>
	5018	<reference key="parent" ref="165541584"/>
	5019	</object>
	5020	<object class="IBObjectRecord">
	5021	<int key="objectID">1119</int>
	5022	<reference key="object" ref="383068874"/>
	5023	<reference key="parent" ref="165541584"/>
	5024	</object>
	5025	<object class="IBObjectRecord">
	5026	<int key="objectID">1122</int>
	5027	<reference key="object" ref="507231372"/>
	5028	<reference key="parent" ref="1377"/>
4854	5029	</object>
4855	5030	</object>
…	…
4859	5034	<object class="NSMutableArray" key="dict.sortedKeys">
4860	5035	<bool key="EncodedWithXMLCoder">YES</bool>
4861		~~<string>-1.IBPluginDependency</string>~~
4862		~~<string>-2.IBPluginDependency</string>~~
4863	5036	<string>-3.IBPluginDependency</string>
4864		~~<string>1000.IBPluginDependency</string>~~
4865	5037	<string>1001.IBPluginDependency</string>
4866		~~<string>1002.IBPluginDependency</string>~~
4867		~~<string>1003.IBPluginDependency</string>~~
4868	5038	<string>1004.IBPluginDependency</string>
4869	5039	<string>1005.IBPluginDependency</string>
4870	5040	<string>1006.IBPluginDependency</string>
	5041	<string>1009.IBPluginDependency</string>
	5042	<string>1011.IBPluginDependency</string>
4871	5043	<string>1013.CustomClassName</string>
	5044	<string>1013.IBNumberFormatterLocalizesFormatMetadataKey</string>
4872	5045	<string>1013.IBPluginDependency</string>
4873	5046	<string>1016.IBPluginDependency</string>
…	…
4878	5051	<string>1028.IBEditorWindowLastContentRect</string>
4879	5052	<string>1028.IBPluginDependency</string>
4880		~~<string>1031.IBPluginDependency</string>~~
4881		~~<string>1033.IBPluginDependency</string>~~
4882		~~<string>1034.IBPluginDependency</string>~~
4883	5053	<string>1035.IBPluginDependency</string>
4884	5054	<string>1036.IBPluginDependency</string>
…	…
4902	5072	<string>1075.IBPluginDependency</string>
4903	5073	<string>1076.IBPluginDependency</string>
	5074	<string>1077.IBPluginDependency</string>
4904	5075	<string>1078.IBPluginDependency</string>
4905	5076	<string>1079.IBPluginDependency</string>
	5077	<string>1080.IBPluginDependency</string>
4906	5078	<string>1092.IBPluginDependency</string>
4907	5079	<string>1094.IBEditorWindowLastContentRect</string>
…	…
4924	5096	<string>1110.IBPluginDependency</string>
4925	5097	<string>1110.ImportedFromIB2</string>
	5098	<string>1115.IBPluginDependency</string>
	5099	<string>1122.IBPluginDependency</string>
4926	5100	<string>449.IBEditorWindowLastContentRect</string>
4927	5101	<string>449.IBPluginDependency</string>
…	…
4933	5107	<string>450.IBPluginDependency</string>
4934	5108	<string>452.IBPluginDependency</string>
	5109	<string>453.IBPluginDependency</string>
4935	5110	<string>454.IBPluginDependency</string>
4936	5111	<string>454.ImportedFromIB2</string>
	5112	<string>455.IBPluginDependency</string>
4937	5113	<string>456.IBPluginDependency</string>
4938	5114	<string>457.IBPluginDependency</string>
…	…
4957	5133	<string>471.IBPluginDependency</string>
4958	5134	<string>472.IBPluginDependency</string>
	5135	<string>510.IBPluginDependency</string>
4959	5136	<string>511.IBEditorWindowLastContentRect</string>
4960	5137	<string>511.IBPluginDependency</string>
…	…
4991	5168	<string>524.IBPluginDependency</string>
4992	5169	<string>524.ImportedFromIB2</string>
	5170	<string>525.IBPluginDependency</string>
	5171	<string>526.IBPluginDependency</string>
	5172	<string>527.IBPluginDependency</string>
	5173	<string>528.IBPluginDependency</string>
	5174	<string>529.IBPluginDependency</string>
	5175	<string>530.IBPluginDependency</string>
	5176	<string>531.IBPluginDependency</string>
	5177	<string>532.IBPluginDependency</string>
4993	5178	<string>533.IBPluginDependency</string>
4994	5179	<string>533.ImportedFromIB2</string>
	5180	<string>534.IBPluginDependency</string>
	5181	<string>535.IBPluginDependency</string>
4995	5182	<string>536.IBPluginDependency</string>
4996	5183	<string>536.ImportedFromIB2</string>
…	…
5100	5287	<string>714.IBPluginDependency</string>
5101	5288	<string>714.ImportedFromIB2</string>
5102		<string>716.IBPluginDependency</string>
	5289	<string>715.IBPluginDependency</string>
5103	5290	<string>717.IBPluginDependency</string>
5104	5291	<string>749.IBPluginDependency</string>
…	…
5116	5303	<string>832.IBPluginDependency</string>
5117	5304	<string>833.IBPluginDependency</string>
	5305	<string>840.IBPluginDependency</string>
5118	5306	<string>849.IBEditorWindowLastContentRect</string>
5119	5307	<string>849.IBPluginDependency</string>
…	…
5131	5319	<string>854.IBPluginDependency</string>
5132	5320	<string>854.ImportedFromIB2</string>
	5321	<string>855.IBPluginDependency</string>
5133	5322	<string>855.IBShouldRemoveOnLegacySave</string>
	5323	<string>856.IBPluginDependency</string>
5134	5324	<string>856.IBShouldRemoveOnLegacySave</string>
5135	5325	<string>862.IBPluginDependency</string>
…	…
5166	5356	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5167	5357	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5168		~~<string>com.apple.InterfaceBuilder.CocoaPlugin</string>~~
5169		~~<string>com.apple.InterfaceBuilder.CocoaPlugin</string>~~
5170		~~<string>com.apple.InterfaceBuilder.CocoaPlugin</string>~~
5171	5358	<string>BXAPortFormatter</string>
	5359	<integer value="1"/>
5172	5360	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5173	5361	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
…	…
5187	5375	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5188	5376	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5189		~~<string>com.apple.InterfaceBuilder.CocoaPlugin</string>~~
5190		~~<string>com.apple.InterfaceBuilder.CocoaPlugin</string>~~
5191		~~<string>com.apple.InterfaceBuilder.CocoaPlugin</string>~~
5192	5377	<string>{{422, 824}, {198, 43}}</string>
5193	5378	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
…	…
5205	5390	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5206	5391	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5207		<string>{{243, 515}, {295, 60}}</string>
	5392	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5393	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5394	<string>{{182, 698}, {323, 112}}</string>
5208	5395	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5209	5396	<string>{628, 654}</string>
…	…
5211	5398	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5212	5399	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5213		<string>{{330, 718}, {210, 63}}</string>
5214		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5215		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5216		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5217		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5218		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5219		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5220		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5221		<reference ref="9"/>
5222		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5223		<reference ref="9"/>
5224		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5225		<reference ref="9"/>
5226		<string>{{118, 288}, {506, 387}}</string>
5227		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5228		<string>{{118, 288}, {506, 387}}</string>
	5400	<string>{{243, 709}, {234, 83}}</string>
	5401	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5402	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5403	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5404	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5405	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5406	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5407	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5408	<reference ref="9"/>
	5409	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5410	<reference ref="9"/>
	5411	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5412	<reference ref="9"/>
	5413	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5414	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5415	<string>{{464, -173}, {506, 387}}</string>
	5416	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5417	<string>{{464, -173}, {506, 387}}</string>
5229	5418	<reference ref="8"/>
5230	5419	<string>{{441, 464}, {506, 387}}</string>
…	…
5234	5423	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5235	5424	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5236		<reference ref="9"/>
	5425	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5426	<reference ref="9"/>
	5427	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5237	5428	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5238	5429	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
…	…
5255	5446	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5256	5447	<string>BXAEntityCell</string>
	5448	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5257	5449	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5258	5450	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
…	…
5292	5484	<reference ref="9"/>
5293	5485	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5294		<reference ref="9"/>
5295		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5296		<reference ref="9"/>
5297		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5298		<reference ref="9"/>
5299		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5300		<string>{{-12, 514}, {431, 20}}</string>
	5486	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5487	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5488	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5489	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5490	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5491	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5492	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5493	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5494	<reference ref="9"/>
	5495	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5496	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5497	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5498	<reference ref="9"/>
	5499	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5500	<reference ref="9"/>
	5501	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5502	<string>{{0, 514}, {431, 20}}</string>
5301	5503	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5302	5504	<reference ref="9"/>
…	…
5367	5569	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5368	5570	<reference ref="9"/>
5369		<string>{{151, 261}, {319, 253}}</string>
	5571	<string>{{163, 261}, {319, 253}}</string>
5370	5572	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5371	5573	<reference ref="9"/>
…	…
5390	5592	<reference ref="9"/>
5391	5593	<string>{{187, 979}, {234, 81}}</string>
5392		<~~reference ref="9~~"/>
	5594	<integer value="0" id="6"/>
5393	5595	<reference ref="9"/>
5394	5596	<string>{3.40282e+38, 3.40282e+38}</string>
…	…
5403	5605	<string>fi.karppinen.BaseTen.InterfaceBuilderPlugin</string>
5404	5606	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5405		<string>{{265, 296}, {425, 233}}</string>
5406		<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5407		<string>{{265, 296}, {425, 233}}</string>
	5607	<string>{{425, 296}, {425, 233}}</string>
	5608	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5609	<string>{{425, 296}, {425, 233}}</string>
5408	5610	<reference ref="8"/>
5409	5611	<reference ref="8"/>
…	…
5416	5618	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5417	5619	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5620	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5418	5621	<string>{{301, 332}, {389, 320}}</string>
5419	5622	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
…	…
5421	5624	<reference ref="9"/>
5422	5625	<string>{{906, 834}, {308, 201}}</string>
5423		<reference ref="9"/>
	5626	<reference ref="6"/>
5424	5627	<reference ref="9"/>
5425	5628	<string>{3.40282e+38, 3.40282e+38}</string>
…	…
5431	5634	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5432	5635	<reference ref="9"/>
5433		<reference ref="9"/>
	5636	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
	5637	<reference ref="9"/>
	5638	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
5434	5639	<reference ref="9"/>
5435	5640	<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
…	…
5478	5683	</object>
5479	5684	<nil key="sourceID"/>
5480		<int key="maxID">1113</int>
	5685	<int key="maxID">1122</int>
5481	5686	</object>
5482	5687	<object class="IBClassDescriber" key="IBDocument.Classes">

trunk/BaseTenAssistant/Sources/BXAController.h

r1191	r1316
99	99	BOOL mLastSelectedEntityWasView;
100	100	BOOL mDeniedSchemaInstall;
	101	BOOL mExportUsingFkeyNames;
	102	BOOL mExportUsingTargetRelationNames;
101	103	}
102	104
…	…
104	106	@property (readonly) NSWindow* mainWindow;
105	107	@property (readwrite, retain) NSSavePanel* savePanel;
	108	@property (readwrite, assign) BOOL exportsUsingFkeyNames;
	109	@property (readwrite, assign) BOOL exportsUsingTargetRelationNames;
106	110
107	111

trunk/BaseTenAssistant/Sources/BXAController.m

r1279	r1316
51	51	#import <BaseTen/BXLogger.h>
52	52	#import <BaseTen/BXDatabaseObjectModelXMLSerialization.h>
	53	#import <BaseTen/BXDatabaseObjectModelMOMSerialization.h>
53	54
54	55	#import <sys/socket.h>
…	…
88	89	@implementation BXAController
89	90	@synthesize savePanel = mSavePanel;
	91	@synthesize exportsUsingFkeyNames = mExportUsingFkeyNames;
	92	@synthesize exportsUsingTargetRelationNames = mExportUsingTargetRelationNames;
90	93
91	94	//Patch by Tim Bedford 2008-08-11
…	…
97	100	mServiceBrowser = [[NSNetServiceBrowser alloc] init];
98	101	[mServiceBrowser setDelegate:self];
99
	102	//End patch
	103	mExportUsingFkeyNames = YES;
	104	mExportUsingTargetRelationNames = YES;
	105
	106	//Patch by Tim Bedford 2008-08-11
100	107	return self;
101	108	}
…	…
1161	1168	NSError* error = nil;
1162	1169	BXDatabaseObjectModel* model = [mContext databaseObjectModel];
1163		~~NSXMLDocument* doc = [BXDatabaseObjectModelXMLSerialization documentFromObjectModel: model error: &error];~~
1164	1170	ExpectV (model);
1165		ExpectV (doc);
1166
1167		if (error)
1168		{
1169		[NSApp presentError: error modalForWindow: mMainWindow delegate: nil
1170		didPresentSelector: NULL contextInfo: NULL];
	1171
	1172	const NSInteger selectedTag = [mModelFormatButton selectedTag];
	1173
	1174	enum BXDatabaseObjectModelSerializationOptions options = kBXDatabaseObjectModelSerializationOptionNone;
	1175	if (mExportUsingFkeyNames)
	1176	options \|= kBXDatabaseObjectModelSerializationOptionRelationshipsUsingFkeyNames;
	1177	if (mExportUsingTargetRelationNames)
	1178	options \|= kBXDatabaseObjectModelSerializationOptionRelationshipsUsingTargetRelationNames;
	1179
	1180	NSData* modelData = nil;
	1181	if (4 == selectedTag)
	1182	{
	1183	NSManagedObjectModel* moModel =
	1184	[BXDatabaseObjectModelMOMSerialization managedObjectModelFromDatabaseObjectModel: model options: options error: &error];
	1185
	1186	if (error)
	1187	{
	1188	[NSApp presentError: error modalForWindow: mMainWindow delegate: nil
	1189	didPresentSelector: NULL contextInfo: NULL];
	1190	}
	1191	else
	1192	{
	1193	ExpectV (moModel);
	1194	modelData = [NSKeyedArchiver archivedDataWithRootObject: moModel];
	1195	ExpectV (modelData);
	1196	}
1171	1197	}
1172	1198	else
1173	1199	{
1174		NS~~Bundle* bundle = [NSBundle bundleForClass: [self class]~~];
1175		~~NSURL* xsltURL = nil;~~
1176		~~switch ([mModelFormatButton selectedTag])~~
	1200	NSXMLDocument* doc = [BXDatabaseObjectModelXMLSerialization documentFromObjectModel: model options: options error: &error];
	1201
	1202	if (error)
1177	1203	{
1178		case 1:
1179		xsltURL = [NSURL fileURLWithPath: [bundle pathForResource: @"ObjectModel" ofType: @"xsl"]];
1180		break;
1181
1182		case 2:
1183		xsltURL = [NSURL fileURLWithPath: [bundle pathForResource: @"ObjectModelRecords" ofType: @"xsl"]];
1184		break;
1185
1186		default:
1187		break;
	1204	[NSApp presentError: error modalForWindow: mMainWindow delegate: nil
	1205	didPresentSelector: NULL contextInfo: NULL];
1188	1206	}
1189
1190		if (xsltURL)
	1207	else
1191	1208	{
1192		NSData* dotData = [doc objectByApplyingXSLTAtURL: xsltURL arguments: nil error: &error];
1193		if (error)
	1209	ExpectV (doc);
	1210
	1211	NSBundle* bundle = [NSBundle bundleForClass: [self class]];
	1212	NSURL* xsltURL = nil;
	1213	switch (selectedTag)
1194	1214	{
1195		[NSApp presentError: error modalForWindow: mMainWindow delegate: nil
1196		didPresentSelector: NULL contextInfo: NULL];
	1215	case 1:
	1216	xsltURL = [NSURL fileURLWithPath: [bundle pathForResource: @"ObjectModel" ofType: @"xsl"]];
	1217	break;
	1218
	1219	case 2:
	1220	xsltURL = [NSURL fileURLWithPath: [bundle pathForResource: @"ObjectModelRecords" ofType: @"xsl"]];
	1221	break;
	1222
	1223	default:
	1224	break;
1197	1225	}
1198		else
	1226
	1227	if (xsltURL)
1199	1228	{
1200		~~[dotData writeToURL: [sheet URL] options: NSAtomicWrite~~ error: &error];
	1229	modelData = [doc objectByApplyingXSLTAtURL: xsltURL arguments: nil error: &error];
1201	1230	if (error)
1202	1231	{
1203	1232	[NSApp presentError: error modalForWindow: mMainWindow delegate: nil
1204	1233	didPresentSelector: NULL contextInfo: NULL];
	1234	ExpectV (! modelData);
1205	1235	}
1206	1236	}
1207		}
1208		else
1209		{
1210		NSData* xmlData = [doc XMLData];
1211		[xmlData writeToURL: [sheet URL] options: NSAtomicWrite error: &error];
1212		if (error)
	1237	else
1213	1238	{
1214		~~[NSApp presentError: error modalForWindow: mMainWindow delegate: nil~~
1215		~~didPresentSelector: NULL contextInfo: NULL]~~;
	1239	modelData = [doc XMLData];
	1240	ExpectV (modelData);
1216	1241	}
1217	1242	}
	1243	}
	1244
	1245	if (modelData)
	1246	{
	1247	[modelData writeToURL: [sheet URL] options: NSAtomicWrite error: &error];
	1248	if (error)
	1249	{
	1250	[NSApp presentError: error modalForWindow: mMainWindow delegate: nil
	1251	didPresentSelector: NULL contextInfo: NULL];
	1252	}
	1253
1218	1254	}
1219	1255	}
…	…
1625	1661	[mSavePanel setRequiredFileType: @"dot"];
1626	1662	break;
	1663	case 4:
	1664	[mSavePanel setRequiredFileType: @"mom"];
	1665	break;
1627	1666	case 3:
1628	1667	default:

trunk/Sources/BXConstants.h

r1257	r1316
163	163	kBXPropertyKindRelationship /*< The property is a relationship. /
164	164	};
	165
	166	enum BXDatabaseObjectModelSerializationOptions
	167	{
	168	kBXDatabaseObjectModelSerializationOptionNone = 0,
	169	kBXDatabaseObjectModelSerializationOptionRelationshipsUsingFkeyNames = (1 << 0),
	170	kBXDatabaseObjectModelSerializationOptionRelationshipsUsingTargetRelationNames = (1 << 1)
	171	};

trunk/Sources/BXDatabaseObjectModelXMLSerialization.h

r1135	r1316
35	35	{
36	36	}
37		+ (NSData ) dataFromObjectModel: (BXDatabaseObjectModel ) objectModel error: (NSError **) outError;
38		+ (NSXMLDocument ) documentFromObjectModel: (BXDatabaseObjectModel ) objectModel error: (NSError **) outError;
	37	+ (NSData ) dataFromObjectModel: (BXDatabaseObjectModel ) objectModel
	38	options: (enum BXDatabaseObjectModelSerializationOptions) options
	39	error: (NSError **) outError;
	40	+ (NSXMLDocument ) documentFromObjectModel: (BXDatabaseObjectModel ) objectModel
	41	options: (enum BXDatabaseObjectModelSerializationOptions) options
	42	error: (NSError **) outError;
39	43	@end

trunk/Sources/BXDatabaseObjectModelXMLSerialization.m

r1135	r1316
33	33	#import "BXAttributeDescription.h"
34	34	#import "BXRelationshipDescription.h"
	35	#import "BXRelationshipDescriptionPrivate.h"
35	36
36	37
37	38	@implementation BXDatabaseObjectModelXMLSerialization
38		+ (NSData ) dataFromObjectModel: (BXDatabaseObjectModel ) objectModel error: (NSError **) outError
	39	+ (NSData ) dataFromObjectModel: (BXDatabaseObjectModel ) objectModel
	40	options: (enum BXDatabaseObjectModelSerializationOptions) options
	41	error: (NSError **) outError
39	42	{
40		return [[self documentFromObjectModel: objectModel error: outError] XMLData];
	43	return [[self documentFromObjectModel: objectModel options: options error: outError] XMLData];
41	44	}
42	45
43	46
44		+ (NSXMLDocument ) documentFromObjectModel: (BXDatabaseObjectModel ) objectModel error: (NSError **) outError
	47	+ (NSXMLDocument ) documentFromObjectModel: (BXDatabaseObjectModel ) objectModel
	48	options: (enum BXDatabaseObjectModelSerializationOptions) options
	49	error: (NSError **) outError
45	50	{
	51	const BOOL exportFkeyRelationships = options & kBXDatabaseObjectModelSerializationOptionRelationshipsUsingFkeyNames;
	52	const BOOL exportRelNameRelationships = options & kBXDatabaseObjectModelSerializationOptionRelationshipsUsingTargetRelationNames;
	53
46	54	NSXMLElement* root = [NSXMLElement elementWithName: @"objectModel"];
47	55	NSXMLDocument* retval = [NSXMLDocument documentWithRootElement: root];
…	…
77	85	[entity addChild: attrs];
78	86
79		if ([currentEntity hasCapability: kBXEntityCapabilityRelationships])
	87	if ((exportFkeyRelationships \|\| exportRelNameRelationships) && [currentEntity hasCapability: kBXEntityCapabilityRelationships])
80	88	{
81	89	NSXMLElement* rels = [NSXMLElement elementWithName: @"relationships"];
82	90	BXEnumerate (currentRel, e, [[currentEntity relationshipsByName] objectEnumerator])
83	91	{
84		if (! [currentRel isDeprecated])
	92	BOOL usesRelNames = [currentRel usesRelationNames];
	93	if (((usesRelNames && exportRelNameRelationships) \|\|
	94	(!usesRelNames && exportFkeyRelationships)) &&
	95	! [currentRel isDeprecated])
85	96	{
86	97	NSXMLElement* rel = [NSXMLElement elementWithName: @"relationship"];

trunk/Sources/BXPGInterface.m

r1300	r1316
913	913	@" is_inverse, "
914	914	@" is_deprecated, "
	915	@" has_rel_names, "
915	916	@" srcnspname, "
916	917	@" srcrelname, "
…	…
1082	1083	[rel setDeprecated: [[currentRel objectForKey: @"is_deprecated"] boolValue]];
1083	1084
	1085	//Name kind
	1086	[rel setUsesRelationNames: [[currentRel objectForKey: @"has_rel_names"] boolValue]];
	1087
1084	1088	//Optionality
1085	1089	//FIXME: all relationships are now treated as optional. NULL constraints should be checked, though.
1086	1090	[rel setOptional: YES];
1087
	1091
1088	1092	if ('m' == kind)
1089	1093	{

trunk/Sources/BXRelationshipDescription.h

r1109	r1316
43	43	BOOL mIsInverse;
44	44	BOOL mIsDeprecated;
	45	BOOL mUsesRelationNames;
45	46	}
46	47

trunk/Sources/BXRelationshipDescription.m

r1283	r1316
225	225	mForeignKey = [aKey retain];
226	226	}
	227	}
	228
	229	- (BOOL) usesRelationNames
	230	{
	231	return mUsesRelationNames;
	232	}
	233
	234	- (void) setUsesRelationNames: (BOOL) aBool
	235	{
	236	mUsesRelationNames = aBool;
227	237	}
228	238

trunk/Sources/BXRelationshipDescriptionPrivate.h

r1109	r1316
40	40	- (BOOL) isInverse;
41	41	- (void) setIsInverse: (BOOL) aBool;
	42	- (BOOL) usesRelationNames;
	43	- (void) setUsesRelationNames: (BOOL) aBool;
42	44	- (void) setInverseName: (NSString *) aString;
43	45	- (void) setDeprecated: (BOOL) aBool;

Download in other formats: