See README.md for changes

VFPX · Sep 17, 2022 · da2336e · da2336e
1 parent 2415a20
commit da2336e
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 72 deletions.
diff --git a/PROGRAM/bulkxmlload.prg b/PROGRAM/bulkxmlload.prg
@@ -2,7 +2,7 @@
 * Function:			BulkXMLLoad
 * Purpose:			Performs a SQL Server bulk XML load
 * Author:			Doug Hennig
-* Last revision:	08/26/2020
+* Last revision:	09/17/2022
 * Parameters:		tcAlias      - the alias of the cursor to export
 *					tcTable      - the name of the table to import into
 *					ttBlank      - the value to use for blank DateTime values
@@ -254,9 +254,10 @@ enddo while lnRecsProcessed < reccount()
 if llClose
 	use
 endif llClose
-if empty(lcReturn)
+try
 	erase (lcSchema)
 	erase (lcData)
-endif empty(lcReturn)
+catch
+endtry
 select (lnSelect)
 return lcReturn
diff --git a/README.md b/README.md
@@ -40,9 +40,25 @@ See [How to contribute to Upsizing Wizard](.github/CONTRIBUTING.md) for details
 
 ## Releases
 
+### 2022.09.17
+
+* Added a record to the TypeMap table to support upsizing VFP Date to SQL Server.
+
+* Added the reserved word "TRAN" to the keywords table and removed the ServerType column.
+
+* Upon completion, calls the CompleteProcess function rather than displaying a message box and raises the new UpsizingComplete event.
+
+* Fixed a bug in DefaultsAndRules: added [] delimiters around field name.
+
+* Added support for multiple unique keys by appending field name to the name. 
+
+* Error messages in BulkXMLLoad are now logged.
+
+* XSD and XML files used by BulkXMLLoad are now deleted when BulkXMLLoad fails.
+
 ### 2019.02.04
 
-* This updates add the reserved word "BULK" to the keywords table and removes some debugging code.
+* This update adds the reserved word "BULK" to the keywords table and removes some debugging code.
 
 ### 2019.02.04
 

diff --git a/UpsizingWizard.PJT b/UpsizingWizard.PJT
diff --git a/data/_exprmap.db2 b/data/_exprmap.db2
@@ -97,28 +97,31 @@
 		</FIELD>
 	</FIELDS>
 
-
-	<indexFile>_EXPRMAP.CDX</indexFile>
-
-	<INDEXES>
-		<INDEX>
-			<TagName>ORACLE</TagName>
-			<TagType>REGULAR</TagType>
-			<Key>ORACLE</Key>
-			<Filter></Filter>
-			<Order>ASCENDING</Order>
-			<Collate>MACHINE</Collate>
-		</INDEX>
-		<INDEX>
-			<TagName>SQLSERVER</TagName>
-			<TagType>REGULAR</TagType>
-			<Key>SQLSERVER</Key>
-			<Filter></Filter>
-			<Order>ASCENDING</Order>
-			<Collate>MACHINE</Collate>
-		</INDEX>
-	</INDEXES>
-
+	<IndexFiles>
+
+		<IndexFile Type="Structural" >
+
+			<INDEXES>
+				<INDEX>
+					<TagName>ORACLE</TagName>
+					<TagType>REGULAR</TagType>
+					<Key>ORACLE</Key>
+					<Filter></Filter>
+					<Order>ASCENDING</Order>
+					<Collate>MACHINE</Collate>
+				</INDEX>
+				<INDEX>
+					<TagName>SQLSERVER</TagName>
+					<TagType>REGULAR</TagType>
+					<Key>SQLSERVER</Key>
+					<Filter></Filter>
+					<Order>ASCENDING</Order>
+					<Collate>MACHINE</Collate>
+				</INDEX>
+			</INDEXES>
+		</IndexFile>
+
+	</IndexFiles>
 
 
 	<RECORDS>

diff --git a/data/_keywords.db2 b/data/_keywords.db2
@@ -37,20 +37,23 @@
 		</FIELD>
 	</FIELDS>
 
-
-	<indexFile>_KEYWORDS.CDX</indexFile>
-
-	<INDEXES>
-		<INDEX>
-			<TagName>KEYWORD</TagName>
-			<TagType>REGULAR</TagType>
-			<Key>KEYWORD</Key>
-			<Filter></Filter>
-			<Order>ASCENDING</Order>
-			<Collate>MACHINE</Collate>
-		</INDEX>
-	</INDEXES>
-
+	<IndexFiles>
+
+		<IndexFile Type="Structural" >
+
+			<INDEXES>
+				<INDEX>
+					<TagName>KEYWORD</TagName>
+					<TagType>REGULAR</TagType>
+					<Key>KEYWORD</Key>
+					<Filter></Filter>
+					<Order>ASCENDING</Order>
+					<Collate>MACHINE</Collate>
+				</INDEX>
+			</INDEXES>
+		</IndexFile>
+
+	</IndexFiles>
 
 
 	<RECORDS>

diff --git a/data/_typemap.db2 b/data/_typemap.db2
@@ -157,36 +157,39 @@
 		</FIELD>
 	</FIELDS>
 
-
-	<indexFile>_TYPEMAP.CDX</indexFile>
-
-	<INDEXES>
-		<INDEX>
-			<TagName>BOTH</TagName>
-			<TagType>REGULAR</TagType>
-			<Key>LOCALTYPE+SERVER</Key>
-			<Filter></Filter>
-			<Order>ASCENDING</Order>
-			<Collate>MACHINE</Collate>
-		</INDEX>
-		<INDEX>
-			<TagName>LOCALTYPE</TagName>
-			<TagType>REGULAR</TagType>
-			<Key>LOCALTYPE</Key>
-			<Filter></Filter>
-			<Order>ASCENDING</Order>
-			<Collate>MACHINE</Collate>
-		</INDEX>
-		<INDEX>
-			<TagName>REMOTETYPE</TagName>
-			<TagType>REGULAR</TagType>
-			<Key>REMOTETYPE</Key>
-			<Filter></Filter>
-			<Order>ASCENDING</Order>
-			<Collate>MACHINE</Collate>
-		</INDEX>
-	</INDEXES>
-
+	<IndexFiles>
+
+		<IndexFile Type="Structural" >
+
+			<INDEXES>
+				<INDEX>
+					<TagName>BOTH</TagName>
+					<TagType>REGULAR</TagType>
+					<Key>LOCALTYPE+SERVER</Key>
+					<Filter></Filter>
+					<Order>ASCENDING</Order>
+					<Collate>MACHINE</Collate>
+				</INDEX>
+				<INDEX>
+					<TagName>LOCALTYPE</TagName>
+					<TagType>REGULAR</TagType>
+					<Key>LOCALTYPE</Key>
+					<Filter></Filter>
+					<Order>ASCENDING</Order>
+					<Collate>MACHINE</Collate>
+				</INDEX>
+				<INDEX>
+					<TagName>REMOTETYPE</TagName>
+					<TagType>REGULAR</TagType>
+					<Key>REMOTETYPE</Key>
+					<Filter></Filter>
+					<Order>ASCENDING</Order>
+					<Collate>MACHINE</Collate>
+				</INDEX>
+			</INDEXES>
+		</IndexFile>
+
+	</IndexFiles>
 
 
 	<RECORDS>

diff --git a/data/project1.pj2 b/data/project1.pj2
@@ -33,7 +33,6 @@ _AutoIncrement = "0"
 
 
 *<BuildProj>
-*<.HomeDir = 'D:\VFXDEVELOPMENT\UPSIZINGWIZARD\UPSIZE\' />
 
 FOR EACH loProject IN _VFP.Projects FOXOBJECT
 	loProject.Close()
@@ -50,7 +49,7 @@ MODIFY PROJECT 'project1.pjx' NOWAIT NOSHOW NOPROJECTHOOK
 loProject = _VFP.Projects('project1.pjx')
 
 WITH loProject.FILES
-	.ADD('upsize1.dbc')		&& *< FileMetadata: Type="d" Cpid="0" Timestamp="0" ID="0" ObjRev="0" User="" DevInfo="" />
+	.ADD('upsize1.dbc')		&& *< FileMetadata: Type="d" Cpid="0" Timestamp="0" ID="0" ObjRev="0" User="" />
 	*</BuildProj>
 
 	.ITEM('__newproject.f2b').Remove()

diff --git a/upsizingwizard.app b/upsizingwizard.app
diff --git a/upsizingwizard.pjx b/upsizingwizard.pjx