Sync BaseTool trunk (version r2460) into EDKII BaseTools. The change mainly includes:

[mirror_edk2.git] / BaseTools / Source / Python / Table / TableFdf.py

diff --git a/BaseTools/Source/Python/Table/TableFdf.py b/BaseTools/Source/Python/Table/TableFdf.py
index 5fb8cd82322c54a15dfee508dddccd070f5e21f7..927b5d1a3be637833ebe55bfb5e4cb237c91697a 100644 (file)
--- a/BaseTools/Source/Python/Table/TableFdf.py
+++ b/BaseTools/Source/Python/Table/TableFdf.py
@@ -55,7 +55,8 @@ class TableFdf(Table):
                                                        Value1 VARCHAR NOT NULL,\r
                                                        Value2 VARCHAR,\r
                                                        Value3 VARCHAR,\r
-                                                       Arch VarCHAR,\r
+                                                       Scope1 VarCHAR,\r
+                                                       Scope2 VarCHAR,\r
                                                        BelongsToItem SINGLE NOT NULL,\r
                                                        BelongsToFile SINGLE NOT NULL,\r
                                                        StartLine INTEGER NOT NULL,\r
@@ -84,11 +85,11 @@ class TableFdf(Table):
     # @param EndColumn:      EndColumn of a Fdf item\r
     # @param Enabled:        If this item enabled\r
     #\r
-    def Insert(self, Model, Value1, Value2, Value3, Arch, BelongsToItem, BelongsToFile, StartLine, StartColumn, EndLine, EndColumn, Enabled):\r
+    def Insert(self, Model, Value1, Value2, Value3, Scope1, Scope2, BelongsToItem, BelongsToFile, StartLine, StartColumn, EndLine, EndColumn, Enabled):\r
         self.ID = self.ID + 1\r
-        (Value1, Value2, Value3, Arch) = ConvertToSqlString((Value1, Value2, Value3, Arch))\r
-        SqlCommand = """insert into %s values(%s, %s, '%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s)""" \\r
-                     % (self.Table, self.ID, Model, Value1, Value2, Value3, Arch, BelongsToItem, BelongsToFile, StartLine, StartColumn, EndLine, EndColumn, Enabled)\r
+        (Value1, Value2, Value3, Scope1, Scope2) = ConvertToSqlString((Value1, Value2, Value3, Scope1, Scope2))\r
+        SqlCommand = """insert into %s values(%s, %s, '%s', '%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s)""" \\r
+                     % (self.Table, self.ID, Model, Value1, Value2, Value3, Scope1, Scope2, BelongsToItem, BelongsToFile, StartLine, StartColumn, EndLine, EndColumn, Enabled)\r
         Table.Insert(self, SqlCommand)\r
         \r
         return self.ID\r
@@ -100,7 +101,7 @@ class TableFdf(Table):
     # @retval:       A recordSet of all found records \r
     #\r
     def Query(self, Model):\r
-        SqlCommand = """select ID, Value1, Value2, Value3, Arch, BelongsToItem, BelongsToFile, StartLine from %s\r
+        SqlCommand = """select ID, Value1, Value2, Value3, Scope1, Scope2, BelongsToItem, BelongsToFile, StartLine from %s\r
                         where Model = %s\r
                         and Enabled > -1""" % (self.Table, Model)\r
         EdkLogger.debug(4, "SqlCommand: %s" % SqlCommand)\r