From: yamat0jp Date: Tue, 21 Jan 2020 01:51:40 +0000 (+0900) Subject: firebirdに一時的に変更 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e19632df24c2a40089d78dfc7a02187fcf1a8b0b;p=newbbs%2Fnewbbs.git firebirdに一時的に変更 MySQLでもBoolean型をSmallIntに戻す計画 逆行しているかもしれませんけど --- diff --git a/WebModuleUnit1.dfm b/WebModuleUnit1.dfm index 5bba989..0952138 100644 --- a/WebModuleUnit1.dfm +++ b/WebModuleUnit1.dfm @@ -1901,7 +1901,6 @@ object WebModule1: TWebModule1 MasterFields = 'DBNUM' Connection = FDConnection1 FetchOptions.AssignedValues = [evLiveWindowParanoic] - FetchOptions.LiveWindowParanoic = True UpdateOptions.UpdateTableName = 'article' TableName = 'article' Left = 584 @@ -2024,8 +2023,9 @@ object WebModule1: TWebModule1 Origin = 'TITLE2' Size = 320 end - object FDTable3mente: TBooleanField - FieldName = 'mente' + object FDTable3MENTE: TSmallintField + FieldName = 'MENTE' + Origin = 'MENTE' end object FDTable3INFO: TIntegerField FieldName = 'INFO' @@ -2046,7 +2046,7 @@ object WebModule1: TWebModule1 end object FDConnection1: TFDConnection Params.Strings = ( - 'ConnectionDef=first_sql') + 'ConnectionDef=test_server') Connected = True Left = 632 Top = 56 diff --git a/WebModuleUnit1.pas b/WebModuleUnit1.pas index a44faa5..54c65e2 100644 --- a/WebModuleUnit1.pas +++ b/WebModuleUnit1.pas @@ -70,9 +70,9 @@ type FDTable5SOURCE: TBlobField; login: TPageProducer; footer: TPageProducer; - FDTable3mente: TBooleanField; FDGUIxWaitCursor1: TFDGUIxWaitCursor; FDQuery1: TFDQuery; + FDTable3MENTE: TSmallintField; procedure indexHTMLTag(Sender: TObject; Tag: TTag; const TagString: string; TagParams: TStrings; var ReplaceText: string); procedure WebModule1indexpageAction(Sender: TObject; Request: TWebRequest; @@ -187,7 +187,7 @@ begin else if TagString = 'uri' then ReplaceText := Request.ScriptName else if (TagString = 'mente') and - (FDTable3.FieldByName('mente').AsBoolean = true) then + (FDTable3.FieldByName('mente').AsInteger = 1) then ReplaceText := 'checked="checked"' else if TagString = 'database' then ReplaceText := Request.QueryFields.Values['db']; @@ -263,8 +263,7 @@ end; procedure TWebModule1.footerHTMLTag(Sender: TObject; Tag: TTag; const TagString: string; TagParams: TStrings; var ReplaceText: string); -var - i: Integer; +var i: Integer; begin if TagString = 'link' then begin @@ -502,16 +501,17 @@ function TWebModule1.mente: Boolean; var s: string; begin - if FDTable3.FieldByName('mente').AsBoolean = true then + if FDTable3.FieldByName('mente').AsInteger = 1 + then begin - s:=Request.QueryFields.Values['db']; + s := Request.QueryFields.Values['db']; if s <> '' then - s:='?db='+s; + s := '?db=' + s; result := true; Response.Content := '


‚½‚¾‚¢‚܃ƒ“ƒeƒiƒ“ƒX’†‚Å‚·^_^

' + Format('

ŠÇ—ŽÒ—pƒƒOƒCƒ“', - [Request.ScriptName,s]); + [Request.ScriptName, s]); end else result := false; @@ -731,8 +731,8 @@ begin FDQuery1.Open; while FDQuery1.Eof = false do begin - FDTable1.Locate('dbnum',FDQuery1.FieldByName('dbnum').AsInteger); - ReplaceText:=ReplaceText+ti.Content; + FDTable1.Locate('dbnum', FDQuery1.FieldByName('dbnum').AsInteger); + ReplaceText := ReplaceText + ti.Content; FDQuery1.Next; end; FDQuery1.Close; @@ -861,13 +861,17 @@ procedure TWebModule1.WebModule1adminsetAction(Sender: TObject; Request: TWebRequest; Response: TWebResponse; var Handled: Boolean); var s: string; + i: integer; begin s := Request.ContentFields.Values['pass']; with FDTable3 do begin Edit; - FieldByName('mente').AsBoolean := Request.ContentFields.Values - ['mente'] = 'on'; + if Request.ContentFields.Values['mente'] = 'on' then + i:=1 + else + i:=0; + FieldByName('mente').AsInteger:=i; if s <> '' then begin s := hash(s); @@ -1323,7 +1327,7 @@ begin FDTable3.AppendRecord (['‚Æ‚é‚ˁ`‚Ǎ†', '

‚Æ‚é‚ˁ`‚Ǎ†

', - false, i, 30, hash(hash('admin')), s]); + 0, i, 30, hash(hash('admin')), s]); end; end; diff --git a/newbbs.dproj b/newbbs.dproj index 468d020..390931d 100644 --- a/newbbs.dproj +++ b/newbbs.dproj @@ -1,13 +1,13 @@  {48FDE727-B792-4350-8984-F966A4A0D89F} - 16.1 + 18.6 VCL newbbs.dpr True Debug Win32 - 3 + 1 Application @@ -18,11 +18,6 @@ Base true - - true - Base - true - true Base @@ -57,16 +52,11 @@ $(BDS)\bin\default_app.manifest true IndyIPClient;FireDACASADriver;FireDACSqliteDriver;bindcompfmx;FireDACDSDriver;DBXSqliteDriver;FireDACPgDriver;FireDACODBCDriver;RESTBackendComponents;emsclientfiredac;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;FireDACCommon;bindcomp;inetdb;tethering;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapServer;DataSnapCommon;DBXOdbcDriver;vclFireDAC;DataSnapProviderClient;xmlrtl;DataSnapNativeClient;DBXSybaseASEDriver;DbxCommonDriver;svnui;vclimg;ibxpress;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;FireDACCommonDriver;MetropolisUILiveTile;bindengine;vclactnband;vcldb;bindcompdbx;soaprtl;vcldsnap;bindcompvcl;vclie;fmxFireDAC;FireDACADSDriver;vcltouch;DBXDb2Driver;emsclient;CustomIPTransport;DBXOracleDriver;vclribbon;VCLRESTComponents;FireDACMSSQLDriver;FireDAC;VclSmp;dsnap;DBXInformixDriver;vcl;DataSnapConnectors;fmxase;DataSnapServerMidas;DBXMSSQLDriver;IndyIPCommon;IndyCore;dsnapcon;FireDACIBDriver;DBXFirebirdDriver;inet;IndyIPServer;DataSnapFireDAC;fmxobj;CloudService;FireDACDBXDriver;FireDACMySQLDriver;soapmidas;vclx;soapserver;inetdbxpress;CodeSiteExpressPkg;svn;DBXSybaseASADriver;dsnapxml;FireDACOracleDriver;FireDACInfxDriver;FireDACDb2Driver;RESTComponents;fmxdae;FireDACMSAccDriver;dbexpress;DataSnapIndy10ServerTransport;adortl;$(DCC_UsePackage) - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - - - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - $(BDS)\bin\default_app.manifest - 1033 - true - IndyIPClient;FireDACASADriver;FireDACSqliteDriver;bindcompfmx;FireDACDSDriver;DBXSqliteDriver;FireDACPgDriver;FireDACODBCDriver;RESTBackendComponents;emsclientfiredac;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;FireDACCommon;bindcomp;inetdb;tethering;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapServer;DataSnapCommon;DBXOdbcDriver;vclFireDAC;DataSnapProviderClient;xmlrtl;DataSnapNativeClient;DBXSybaseASEDriver;DbxCommonDriver;vclimg;ibxpress;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;FireDACCommonDriver;MetropolisUILiveTile;bindengine;vclactnband;vcldb;bindcompdbx;soaprtl;vcldsnap;bindcompvcl;vclie;fmxFireDAC;FireDACADSDriver;vcltouch;DBXDb2Driver;emsclient;CustomIPTransport;DBXOracleDriver;vclribbon;VCLRESTComponents;FireDACMSSQLDriver;FireDAC;VclSmp;dsnap;DBXInformixDriver;vcl;DataSnapConnectors;fmxase;DataSnapServerMidas;DBXMSSQLDriver;IndyIPCommon;IndyCore;dsnapcon;FireDACIBDriver;DBXFirebirdDriver;inet;IndyIPServer;DataSnapFireDAC;fmxobj;CloudService;FireDACDBXDriver;FireDACMySQLDriver;soapmidas;vclx;soapserver;inetdbxpress;DBXSybaseASADriver;dsnapxml;FireDACOracleDriver;FireDACInfxDriver;FireDACDb2Driver;RESTComponents;fmxdae;FireDACMSAccDriver;dbexpress;DataSnapIndy10ServerTransport;adortl;$(DCC_UsePackage) + true + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png DEBUG;$(DCC_Define) @@ -78,6 +68,7 @@ false + Debug false @@ -123,133 +114,104 @@ newbbs.dpr - - - - .\ - true - - - - - newbbs.exe - true - - + + - - - .\ - true - - - - - newbbs.exe - true - - - - + + + + 1 - .dylib - - - 0 - .bpl Contents\MacOS 1 - .dylib - - - 1 - .dylib - - - - - 1 - .dylib 0 - .dll;.bpl - - - Contents\MacOS - 1 - .dylib - + + + + classes 1 - .dylib - - + + + res\xml 1 - + + + + library\lib\armeabi-v7a 1 - - - Contents + + + library\lib\armeabi 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + library\lib\mips 1 - + - res\drawable-normal + library\lib\armeabi-v7a 1 - + - library\lib\x86 + res\drawable 1 - - + + + res\values 1 - + + + + res\values-v21 1 - - - ../ + + + res\drawable 1 - + - library\lib\armeabi-v7a + res\drawable-xxhdpi 1 - - + + + res\drawable-ldpi 1 - + + + + res\drawable-mdpi 1 - + - res\drawable-xlarge + res\drawable-hdpi 1 @@ -259,38 +221,36 @@ 1 - - - 1 - - + + + res\drawable-small 1 - + - res\drawable-xxhdpi + res\drawable-normal 1 - + - library\lib\mips + res\drawable-large 1 - + - res\drawable + res\drawable-xlarge 1 - - Contents\MacOS + 1 - + + Contents\MacOS 1 @@ -303,186 +263,333 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 - - - res\drawable-small + + 1 + .dylib - - - - ../ + 1 + .dylib + + + 1 + .dylib - - Contents\MacOS 1 + .dylib - + + Contents\MacOS 1 + .dylib - Contents\MacOS 0 + .dll;.bpl - - - classes + + 1 + .dylib - - - + 1 + .dylib 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + 0 + .bpl + + + + + 0 + + + 0 + + + 0 + + + 0 + + + Contents\Resources\StartUp\ + 0 + + + Contents\Resources\StartUp\ + 0 + + + 0 - + + 1 + + 1 1 - - - res\drawable + + 1 - - - - Contents\Resources + + 1 + + 1 - - + + + 1 + + + 1 + + 1 - + + 1 + + 1 1 - - + + 1 - - library\lib\armeabi-v7a + 1 - - 0 + + 1 - - Contents\MacOS + + + + 1 + + 1 1 - - - library\lib\armeabi + + + 1 + + + 1 + + 1 - + - res\drawable-large 1 - - - 0 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 - - 0 + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 - - 0 + + + + 1 - - Contents\MacOS - 0 + + 1 + + + + + ..\ + 1 + + + ..\ + 1 + + + + + 1 + + + 1 - 0 + 1 - - + + + 1 + + 1 1 - - - res\drawable-ldpi + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - res\values + + + ..\ + 1 + + + ..\ 1 - - + + + Contents 1 - + + Contents 1 - - - res\drawable-mdpi + + + Contents\Resources + 1 + + + Contents\Resources 1 - + - res\drawable-hdpi + library\lib\armeabi-v7a + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + Contents\MacOS + 1 + + + Contents\MacOS + 1 + + + 0 + + + + + 1 + + 1 - - + + + Assets + 1 + + + Assets 1 - - + + + Assets + 1 + + + Assets + 1 + + + + + + + + - True - True False diff --git a/newbbs.res b/newbbs.res index 0f3facb..d41c6f2 100644 Binary files a/newbbs.res and b/newbbs.res differ diff --git a/tool/Project1.dproj b/tool/Project1.dproj index ad8debf..50820d1 100644 --- a/tool/Project1.dproj +++ b/tool/Project1.dproj @@ -1,7 +1,7 @@  {5D8A280C-8B73-4960-87FE-E3F496F45568} - 16.1 + 18.6 VCL Project1.dpr True @@ -18,11 +18,6 @@ Base true - - true - Base - true - true Base @@ -55,12 +50,12 @@ true Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) $(BDS)\bin\default_app.manifest - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) IndyIPClient;FireDACASADriver;FireDACSqliteDriver;bindcompfmx;FireDACDSDriver;DBXSqliteDriver;FireDACPgDriver;FireDACODBCDriver;RESTBackendComponents;emsclientfiredac;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;FireDACCommon;bindcomp;inetdb;tethering;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapServer;DataSnapCommon;DBXOdbcDriver;vclFireDAC;DataSnapProviderClient;xmlrtl;DataSnapNativeClient;DBXSybaseASEDriver;DbxCommonDriver;svnui;vclimg;ibxpress;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;FireDACCommonDriver;MetropolisUILiveTile;bindengine;vclactnband;vcldb;bindcompdbx;soaprtl;vcldsnap;bindcompvcl;vclie;fmxFireDAC;FireDACADSDriver;vcltouch;DBXDb2Driver;emsclient;CustomIPTransport;DBXOracleDriver;vclribbon;VCLRESTComponents;FireDACMSSQLDriver;FireDAC;VclSmp;dsnap;DBXInformixDriver;vcl;DataSnapConnectors;fmxase;DataSnapServerMidas;DBXMSSQLDriver;IndyIPCommon;IndyCore;dsnapcon;FireDACIBDriver;DBXFirebirdDriver;inet;IndyIPServer;DataSnapFireDAC;fmxobj;CloudService;FireDACDBXDriver;FireDACMySQLDriver;soapmidas;vclx;soapserver;inetdbxpress;CodeSiteExpressPkg;svn;DBXSybaseASADriver;dsnapxml;FireDACOracleDriver;FireDACInfxDriver;FireDACDb2Driver;RESTComponents;fmxdae;FireDACMSAccDriver;dbexpress;DataSnapIndy10ServerTransport;adortl;$(DCC_UsePackage) 1033 - - - IndyIPClient;FireDACASADriver;FireDACSqliteDriver;bindcompfmx;FireDACDSDriver;DBXSqliteDriver;FireDACPgDriver;FireDACODBCDriver;RESTBackendComponents;emsclientfiredac;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;FireDACCommon;bindcomp;inetdb;tethering;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapServer;DataSnapCommon;DBXOdbcDriver;vclFireDAC;DataSnapProviderClient;xmlrtl;DataSnapNativeClient;DBXSybaseASEDriver;DbxCommonDriver;vclimg;ibxpress;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;FireDACCommonDriver;MetropolisUILiveTile;bindengine;vclactnband;vcldb;bindcompdbx;soaprtl;vcldsnap;bindcompvcl;vclie;fmxFireDAC;FireDACADSDriver;vcltouch;DBXDb2Driver;emsclient;CustomIPTransport;DBXOracleDriver;vclribbon;VCLRESTComponents;FireDACMSSQLDriver;FireDAC;VclSmp;dsnap;DBXInformixDriver;vcl;DataSnapConnectors;fmxase;DataSnapServerMidas;DBXMSSQLDriver;IndyIPCommon;IndyCore;dsnapcon;FireDACIBDriver;DBXFirebirdDriver;inet;IndyIPServer;DataSnapFireDAC;fmxobj;CloudService;FireDACDBXDriver;FireDACMySQLDriver;soapmidas;vclx;soapserver;inetdbxpress;DBXSybaseASADriver;dsnapxml;FireDACOracleDriver;FireDACInfxDriver;FireDACDb2Driver;RESTComponents;fmxdae;FireDACMSAccDriver;dbexpress;DataSnapIndy10ServerTransport;adortl;$(DCC_UsePackage) + true + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png DEBUG;$(DCC_Define) @@ -72,6 +67,7 @@ false + Debug false @@ -148,174 +144,111 @@ Project1.dpr - - - - Project1.exe - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - + + + + + + + + + + + + + + 1 - .dylib - - - 0 - .bpl Contents\MacOS 1 - .dylib - - - 1 - .dylib - - - - - 1 - .dylib 0 - .dll;.bpl - - Contents\MacOS - 1 - .dylib - - + + + + classes 1 - .dylib - - + + + res\xml 1 - + + + + library\lib\armeabi-v7a 1 - - - Contents + + + library\lib\armeabi 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + library\lib\mips 1 - + - res\drawable-normal + library\lib\armeabi-v7a 1 - + - library\lib\x86 + res\drawable 1 - - + + + res\values 1 - + + + + res\values-v21 1 - - - ../ + + + res\drawable 1 - + - library\lib\armeabi-v7a + res\drawable-xxhdpi 1 - - + + + res\drawable-ldpi 1 - + + + + res\drawable-mdpi 1 - + - res\drawable-xlarge + res\drawable-hdpi 1 @@ -325,38 +258,36 @@ 1 - - - 1 - - + + + res\drawable-small 1 - + - res\drawable-xxhdpi + res\drawable-normal 1 - + - library\lib\mips + res\drawable-large 1 - + - res\drawable + res\drawable-xlarge 1 - - Contents\MacOS + 1 - + + Contents\MacOS 1 @@ -369,186 +300,333 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 - - - res\drawable-small + + 1 + .dylib - - - - ../ + 1 + .dylib + + + 1 + .dylib - - Contents\MacOS 1 + .dylib - + + Contents\MacOS 1 + .dylib - Contents\MacOS 0 + .dll;.bpl - - - classes + + 1 + .dylib - - - + 1 + .dylib 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + 0 + .bpl + + + + + 0 + + + 0 + + + 0 + + + 0 + + + Contents\Resources\StartUp\ + 0 + + + Contents\Resources\StartUp\ + 0 + + + 0 - + + 1 + + 1 1 - - - res\drawable + + 1 - - - - Contents\Resources + + 1 + + 1 - - + + + 1 + + + 1 + + 1 - + + 1 + + 1 1 - - + + 1 - - library\lib\armeabi-v7a + 1 - - 0 + + 1 - - Contents\MacOS + + + + 1 + + 1 1 - - - library\lib\armeabi + + + 1 + + + 1 + + 1 - + - res\drawable-large 1 - - - 0 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 - - 0 + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 - - 0 + + + + 1 - - Contents\MacOS - 0 + + 1 + + + + + ..\ + 1 + + + ..\ + 1 + + + + + 1 + + + 1 - 0 + 1 - - + + + 1 + + 1 1 - - - res\drawable-ldpi + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - res\values + + + ..\ + 1 + + + ..\ 1 - - + + + Contents 1 - + + Contents 1 - - - res\drawable-mdpi + + + Contents\Resources + 1 + + + Contents\Resources 1 - + - res\drawable-hdpi + library\lib\armeabi-v7a + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + Contents\MacOS + 1 + + + Contents\MacOS + 1 + + + 0 + + + + + 1 + + 1 - - + + + Assets + 1 + + + Assets 1 - - + + + Assets + 1 + + + Assets + 1 + + + + + + + + - True - False 12 diff --git a/tool/Unit2.dfm b/tool/Unit2.dfm index a4e46fe..845c1b4 100644 --- a/tool/Unit2.dfm +++ b/tool/Unit2.dfm @@ -17,8 +17,9 @@ object Form1: TForm1 object Label1: TLabel Left = 48 Top = 56 - Width = 3 + Width = 6 Height = 13 + Caption = '1' end object Button1: TButton Left = 296 @@ -53,6 +54,7 @@ object Form1: TForm1 Height = 21 ReadOnly = True TabOrder = 3 + Text = 'slide1.jpg' end object DBNavigator1: TDBNavigator Left = 224 @@ -86,7 +88,7 @@ object Form1: TForm1 end object FDConnection1: TFDConnection Params.Strings = ( - 'ConnectionDef=first_sql') + 'ConnectionDef=test_server') Connected = True Left = 144 Top = 64 @@ -126,8 +128,8 @@ object Form1: TForm1 object BindSourceDB1: TBindSourceDB DataSet = FDTable1 ScopeMappings = <> - Left = 312 - Top = 152 + Left = 176 + Top = 216 end object BindingsList1: TBindingsList Methods = <> diff --git a/tool/Unit2.pas b/tool/Unit2.pas index 856815a..c46e83b 100644 --- a/tool/Unit2.pas +++ b/tool/Unit2.pas @@ -74,7 +74,6 @@ begin t.Free; end; ApplyUpdates; - Reconcile; CommitUpdates; end; end; @@ -112,6 +111,7 @@ begin FDTable1.Close; FDTable1.CreateTable; FDTable1.Open; + FDTable1.Refresh; end; end; diff --git a/yourBBS.dproj b/yourBBS.dproj index 6bb5018..97199b8 100644 --- a/yourBBS.dproj +++ b/yourBBS.dproj @@ -1,13 +1,13 @@  {BA84953A-0D8C-4FD1-B739-3AE1EE5F9E4A} - 16.1 + 18.6 VCL yourBBS.dpr True Release Win32 - 3 + 1 Application @@ -18,11 +18,6 @@ Base true - - true - Base - true - true Base @@ -64,15 +59,10 @@ 1033 $(BDS)\bin\default_app.manifest Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - - - IndyIPClient;FireDACASADriver;FireDACSqliteDriver;bindcompfmx;FireDACDSDriver;DBXSqliteDriver;FireDACPgDriver;FireDACODBCDriver;RESTBackendComponents;emsclientfiredac;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;FireDACCommon;bindcomp;inetdb;tethering;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapServer;DataSnapCommon;DBXOdbcDriver;vclFireDAC;DataSnapProviderClient;xmlrtl;DataSnapNativeClient;DBXSybaseASEDriver;DbxCommonDriver;vclimg;ibxpress;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;FireDACCommonDriver;MetropolisUILiveTile;bindengine;vclactnband;vcldb;bindcompdbx;soaprtl;vcldsnap;bindcompvcl;vclie;fmxFireDAC;FireDACADSDriver;vcltouch;DBXDb2Driver;emsclient;CustomIPTransport;DBXOracleDriver;vclribbon;VCLRESTComponents;FireDACMSSQLDriver;FireDAC;VclSmp;dsnap;DBXInformixDriver;vcl;DataSnapConnectors;fmxase;DataSnapServerMidas;DBXMSSQLDriver;IndyIPCommon;IndyCore;dsnapcon;FireDACIBDriver;DBXFirebirdDriver;inet;IndyIPServer;DataSnapFireDAC;fmxobj;CloudService;FireDACDBXDriver;FireDACMySQLDriver;soapmidas;vclx;soapserver;inetdbxpress;DBXSybaseASADriver;dsnapxml;FireDACOracleDriver;FireDACInfxDriver;FireDACDb2Driver;RESTComponents;fmxdae;FireDACMSAccDriver;dbexpress;DataSnapIndy10ServerTransport;adortl;$(DCC_UsePackage) - true - 1033 - $(BDS)\bin\default_app.manifest - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) + true + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png DEBUG;$(DCC_Define) @@ -95,6 +85,7 @@ true exe 1033 + Debug @@ -136,119 +127,102 @@ Embarcadero C++Builder Office XP サーバー パッケージ - - - - yourBBS.exe - true - - - - - yourBBS.exe - true - - - - - yourBBS.exe - true - - - - - .\ - true - - - - - yourBBS.exe - true - - + + + - - + + + + + 1 - .dylib 0 - .bpl - + + + + classes 1 - .dylib - + + + + res\xml 1 - .dylib - - + + + library\lib\armeabi-v7a 1 - .dylib - - - 0 - .dll;.bpl - - + + + library\lib\armeabi 1 - + + + + library\lib\mips 1 - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + library\lib\armeabi-v7a 1 - + - res\drawable-normal + res\drawable 1 - + - library\lib\x86 + res\values 1 - - + + + res\values-v21 1 - + + + + res\drawable 1 - - + - library\lib\armeabi-v7a + res\drawable-xxhdpi 1 - - + + + res\drawable-ldpi 1 - + + + + res\drawable-mdpi 1 - + - res\drawable-xlarge + res\drawable-hdpi 1 @@ -258,37 +232,35 @@ 1 - - - 1 - - + + + res\drawable-small 1 - + - res\drawable-xxhdpi + res\drawable-normal 1 - + - library\lib\mips + res\drawable-large 1 - + - res\drawable + res\drawable-xlarge 1 - + 1 - + 1 @@ -300,164 +272,263 @@ 1 .framework + + 1 + .framework + 0 - - - res\drawable-small + + + 1 + .dylib + + 1 + .dylib + + + 0 + .dll;.bpl - - + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + 1 + .dylib + + + 1 + .dylib - Contents\MacOS 0 + .bpl - + - classes - 1 + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 - - + + 1 + + 1 1 - - - res\drawable + + + 1 + + + 1 + + 1 - - - Contents\Resources + + + 1 + + + 1 + + 1 - - + + 1 + + 1 1 - - + + 1 - - library\lib\armeabi-v7a + 1 - - 0 + + 1 - + + + + 1 + + 1 1 - - - library\lib\armeabi + + + 1 + + + 1 + + 1 - + - res\drawable-large 1 - - - 0 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 - - 0 + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 - - 0 + + + + + + + 1 - - 0 + + 1 - 0 + 1 - - + + + + + + Contents\Resources 1 - + + Contents\Resources 1 - + - res\drawable-ldpi + library\lib\armeabi-v7a 1 - - - - res\values + 1 - - - + 1 1 + + 1 + + + 1 + + + 1 + + + 0 + - - - res\drawable-mdpi + + + 1 + + 1 - - - res\drawable-hdpi + + + Assets + 1 + + + Assets 1 - - + + + Assets + 1 + + + Assets 1 - - + + + + + + - True - True 12