[GB.DB]

* BUG: Connection.ApplyTemplate() now correctly handles a collation whose name is "default" in the template file.


git-svn-id: svn://localhost/gambas/trunk@7941 867c0c6c-44f3-4631-809d-bfa615b0a4ec

main/lib/db/gb.db/.component

@@ -1,3 +1,3 @@
 [Component]
 Key=gb.db
-Version=3.8.90
+Version=3.9.90

main/lib/db/gb.db/.project

@@ -1,8 +1,8 @@
 # Gambas Project File 3.0
-# Compiled with Gambas 3.8.90
+# Compiled with Gambas 3.9.90
 Title=gb.db
 Startup=Main
-Version=3.8.90
+Version=3.9.90
 VersionFile=1
 Component=gb.db
 TabSize=2

main/lib/db/gb.db/.settings

@@ -22,7 +22,7 @@ File[1]=".src/Main.module:0.16"
 Active=3
 File[2]=".src/Connections.class:41.180"
 Count=4
-File[3]=".src/Connection.class:0.233"
+File[3]=".src/Connection.class:21.25"
 File[4]=".src/SQLRequest.class:2.57"
 
 [Watches]

main/lib/db/gb.db/.src/Connection.class

@@ -23,6 +23,7 @@ Public Sub ApplyTemplate(Template As String)
   Dim hTable As Table
   Dim iLength As Integer
   Dim sErr As String
+  Dim sColl As String
   
   hFile = Open String Template
   
@@ -113,7 +114,9 @@ CREATE_TABLE:
     iLength = 0
     Try iLength = cField["Length"]
     'Print "create field: "; cField["Name"];; cField["Type"];; iLength;; cField["Default"];; cField["Collation"]
-    hTable.Fields.Add(cField["Name"], cField["Type"], iLength, cField["Default"], cField["Collation"])
+    sColl = cField["Collation"]
+    If sColl = "default" Then sColl = ""
+    hTable.Fields.Add(cField["Name"], cField["Type"], iLength, cField["Default"], sColl)
   Next
   
   'Print "primary key: "; cTable["PrimaryKey"].Join(",")

main/lib/db/gb.db/.startup

@@ -2,7 +2,7 @@ Main
 gb.db
 0
 0
-3.8.90
+3.9.90
 
 gb.db