* Merging revisions 42789,42790,42791,42792,42793 from trunk:

------------------------------------------------------------------------ r42789 | michael | 2019-08-24 11:53:00 +0200 (Sat, 24 Aug 2019) | 1 line * Write version option in help ------------------------------------------------------------------------ r42790 | michael | 2019-08-24 11:53:23 +0200 (Sat, 24 Aug 2019) | 1 line * V2 is default ------------------------------------------------------------------------ r42791 | michael | 2019-08-24 11:53:43 +0200 (Sat, 24 Aug 2019) | 1 line * Add src to path ------------------------------------------------------------------------ r42792 | michael | 2019-08-24 11:54:52 +0200 (Sat, 24 Aug 2019) | 1 line * TSQLConnector GetNextValueSQL must call proxy implementation ------------------------------------------------------------------------ r42793 | michael | 2019-08-24 11:55:28 +0200 (Sat, 24 Aug 2019) | 1 line * Dependencies no longer needed ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42846 -
2025-09-05 20:30:53 +02:00 · 2019-08-27 07:00:37 +00:00 · 2019-08-27 07:00:37 +00:00 · 5e6081f217
commit 5e6081f217
parent 63ac2d6b54
5 changed files with 25 additions and 31 deletions
--- a/packages/fcl-db/src/sqldb/sqldb.pp
+++ b/packages/fcl-db/src/sqldb/sqldb.pp
@ -756,7 +756,7 @@ type
    function LoadField(cursor : TSQLCursor; FieldDef : TFieldDef; buffer : pointer; out CreateBlob : boolean) : boolean; override;
    procedure LoadBlobIntoBuffer(FieldDef: TFieldDef;ABlobBuf: PBufBlobField; cursor: TSQLCursor; ATransaction : TSQLTransaction); override;
    procedure FreeFldBuffers(cursor : TSQLCursor); override;
-
+    function GetNextValueSQL(const SequenceName: string; IncrementBy: Integer): string; override;
    function GetTransactionHandle(trans : TSQLHandle): pointer; override;
    function Commit(trans : TSQLHandle) : boolean; override;
    function RollBack(trans : TSQLHandle) : boolean; override;
@ -3635,6 +3635,11 @@ begin
  FProxy.FreeFldBuffers(cursor);
 end;

+function TSQLConnector.GetNextValueSQL(const SequenceName: string; IncrementBy: Integer): string;
+begin
+  Result:=Proxy.GetNextValueSQL(SequenceName, IncrementBy);
+end;
+
 function TSQLConnector.LoadField(cursor: TSQLCursor; FieldDef: TFieldDef;
  buffer: pointer; out CreateBlob: boolean): boolean;
 begin
--- a/packages/fcl-web/examples/jsonrpc/extdirect/extdemo.lpi
+++ b/packages/fcl-web/examples/jsonrpc/extdirect/extdemo.lpi
@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="12"/>
    <General>
      <Flags>
        <SaveOnlyProjectUnits Value="True"/>
        <MainUnitHasCreateFormStatements Value="False"/>
        <Runnable Value="False"/>
+        <CompatibilityMode Value="True"/>
      </Flags>
      <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
      <Title Value="Ext.Direct demo application"/>
      <ResourceType Value="res"/>
      <UseXPManifest Value="True"/>
@ -17,67 +17,53 @@
    <VersionInfo>
      <Language Value=""/>
      <CharSet Value=""/>
-      <StringTable ProductVersion=""/>
    </VersionInfo>
    <BuildModes Count="1">
      <Item1 Name="default" Default="True"/>
    </BuildModes>
    <PublishOptions>
      <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
    </PublishOptions>
    <RunParams>
      <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
    </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="1">
      <Item1>
-        <PackageName Value="lazwebextra"/>
-        <MinVersion Valid="True"/>
-      </Item1>
-      <Item2>
-        <PackageName Value="WebLaz"/>
-      </Item2>
-      <Item3>
-        <PackageName Value="LCL"/>
-      </Item3>
-      <Item4>
        <PackageName Value="FCL"/>
-      </Item4>
+      </Item1>
    </RequiredPackages>
    <Units Count="2">
      <Unit0>
        <Filename Value="extdemo.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="extdemo"/>
      </Unit0>
      <Unit1>
        <Filename Value="wmext.pp"/>
        <IsPartOfProject Value="True"/>
        <ComponentName Value="DemoClass"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="DataModule"/>
-        <UnitName Value="wmext"/>
      </Unit1>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
    <Target>
      <Filename Value="extdemo.cgi"/>
    </Target>
    <SearchPaths>
      <IncludeFiles Value="$(ProjOutDir)"/>
    </SearchPaths>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
    <Exceptions Count="3">
--- a/packages/webidl/examples/parsewebidl.lpi
+++ b/packages/webidl/examples/parsewebidl.lpi
@ -49,6 +49,7 @@
    </Target>
    <SearchPaths>
      <IncludeFiles Value="$(ProjOutDir)"/>
+      <OtherUnitFiles Value="../src"/>
      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
    </SearchPaths>
  </CompilerOptions>
--- a/packages/webidl/examples/parsewebidl.pas
+++ b/packages/webidl/examples/parsewebidl.pas
@ -44,6 +44,7 @@ begin
  try
    S:=TWebIDLScanner.Create(F);
    P:=TWebIDLParser.Create(FContext,S);
+    P.Version:=v2;
    P.Parse;
    Writeln('// Contents of '+AFileName);
    For I:=0 to FConText.Definitions.Count-1 do
--- a/utils/pas2js/webidl2pas.pp
+++ b/utils/pas2js/webidl2pas.pp
@ -197,6 +197,7 @@ begin
  Writeln(StdErr,'                           use @filename to load the aliases from file.');
  Writeln(StdErr,'-u  --unitname=Name        name for unit. Defaults to input file without extension.');
  Writeln(StdErr,'-v  --verbose              Output some diagnostic information');
+  Writeln(StdErr,'-w  --webidlversion=V      Set web IDL version. Allowed values: v1 or v2');
  Writeln(StdErr,'-x  --extra=units          Extra units to put in uses clause (comma separated list)');
  ExitCode:=Ord(Msg<>'');
  {AllowWriteln-}