개정판 f0a86602
fix sql
Change-Id: I31ba763752e2844fc68cf3e6352dc3ed002745a6
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 675 | 675 |
if not all: |
| 676 | 676 |
sql = """SELECT a.UID,a.Name,b.Type,a.Threshold,a.MinMatchPoint,a.IsDetectOrigin,a.RotationCount, |
| 677 | 677 |
a.OCROption,a.IsContainChild,a.OriginalPoint,a.ConnectionPoint,a.BaseSymbol,a.AdditionalSymbol,a.Width,a.Height, |
| 678 |
a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as Desc FROM Symbol a inner join SymbolType b on
|
|
| 678 |
a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as [Desc] FROM Symbol a inner join SymbolType b on
|
|
| 679 | 679 |
a.SymbolType_UID=b.UID WHERE a.IsExceptDetect = 0 and a.[SymbolType_UID] != -1 order by width * height desc""" |
| 680 | 680 |
else: |
| 681 | 681 |
sql = """SELECT a.UID,a.Name,b.Type,a.Threshold,a.MinMatchPoint,a.IsDetectOrigin,a.RotationCount, |
| 682 | 682 |
a.OCROption,a.IsContainChild,a.OriginalPoint,a.ConnectionPoint,a.BaseSymbol,a.AdditionalSymbol,a.Width,a.Height, |
| 683 |
a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as Desc FROM Symbol a inner join SymbolType b on
|
|
| 683 |
a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as [Desc] FROM Symbol a inner join SymbolType b on
|
|
| 684 | 684 |
a.SymbolType_UID=b.UID WHERE a.[SymbolType_UID] != -1 order by width * height desc""" |
| 685 | 685 |
try: |
| 686 | 686 |
cursor.execute(sql) |
| ... | ... | |
| 1780 | 1780 |
sql = self.project.database.to_sql(f"SELECT a.UID as UID,a.Name,b.Type,a.Threshold,a.MinMatchPoint," |
| 1781 | 1781 |
f"a.IsDetectOrigin,a.RotationCount,a.OCROption,a.IsContainChild," |
| 1782 | 1782 |
f"a.OriginalPoint,a.ConnectionPoint,a.BaseSymbol,a.AdditionalSymbol," |
| 1783 |
f"a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as Desc FROM "
|
|
| 1783 |
f"a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as [Desc] FROM "
|
|
| 1784 | 1784 |
f"Symbol a inner join SymbolType b on a.SymbolType_UID=b.UID WHERE " |
| 1785 | 1785 |
f"a.{fieldName}=?")
|
| 1786 | 1786 |
try: |
| ... | ... | |
| 1818 | 1818 |
if field_name is not None and param is not None: |
| 1819 | 1819 |
sql = """SELECT a.UID,a.Name,b.Type,a.Threshold,a.MinMatchPoint,a.IsDetectOrigin,a.RotationCount, |
| 1820 | 1820 |
a.OCROption,a.IsContainChild,a.OriginalPoint,a.ConnectionPoint,a.BaseSymbol,a.AdditionalSymbol,a.Width,a.Height, |
| 1821 |
a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as Desc FROM Symbol a
|
|
| 1821 |
a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as [Desc] FROM Symbol a
|
|
| 1822 | 1822 |
inner join SymbolType b on a.SymbolType_UID=b.UID WHERE |
| 1823 | 1823 |
SymbolType_UID = (select UID from SymbolType where {}={})""".format(
|
| 1824 | 1824 |
field_name, self.project.database.place_holder) |
| 1825 | 1825 |
else: |
| 1826 | 1826 |
sql = """SELECT a.UID,a.Name,b.Type,a.Threshold,a.MinMatchPoint,a.IsDetectOrigin,a.RotationCount, |
| 1827 | 1827 |
a.OCROption,a.IsContainChild,a.OriginalPoint,a.ConnectionPoint,a.BaseSymbol,a.AdditionalSymbol,a.Width,a.Height, |
| 1828 |
a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as Desc FROM Symbol a
|
|
| 1828 |
a.IsExceptDetect,a.HasInstrumentLabel,a.flip,a.TextArea,b.UID as DB_UID,a.Type as [Desc] FROM Symbol a
|
|
| 1829 | 1829 |
inner join SymbolType b on a.SymbolType_UID=b.UID""" |
| 1830 | 1830 |
try: |
| 1831 | 1831 |
cursor.execute(sql, (param,)) if param is not None else cursor.execute(sql) |
내보내기 Unified diff
