Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mariuz/flamerobin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.9.6
Choose a base ref
...
head repository: mariuz/flamerobin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 28,986 additions and 4,170 deletions.
  1. +3 −2 .github/workflows/ccpp.yml
  2. +6 −5 .github/workflows/codeql-analysis.yml
  3. +80 −0 .github/workflows/windows-build.yml
  4. +4 −1 .gitignore
  5. +68 −56 CMakeLists.txt
  6. +111 −83 GNUmakefile
  7. +136 −109 Makefile.in
  8. +106 −91 Makefile.suncc
  9. +3 −0 README.md
  10. +2 −14 autoconf_inc.m4
  11. +6 −0 conf-defs/db_settings.confdef
  12. +18 −32 conf-defs/fr_settings.confdef
  13. +37 −0 docs/fr_whatsnew.html
  14. +179 −116 flamerobin.bkl
  15. +43 −122 flamerobin.sln
  16. +957 −837 flamerobin.xcodeproj/project.pbxproj
  17. +148 −48 flamerobin_flamerobin.dsp
  18. +149 −49 flamerobin_flamerobin.vcproj
  19. +87 −76 flamerobin_flamerobin.vcxproj
  20. +223 −165 flamerobin_flamerobin.vcxproj.filters
  21. +102 −2 flamerobin_ibpp.dsp
  22. +103 −3 flamerobin_ibpp.vcproj
  23. +17 −17 flamerobin_ibpp.vcxproj
  24. +21 −0 html-templates/COLLATION.html
  25. +53 −0 html-templates/COLLATIONprivileges.html
  26. +1 −1 html-templates/EXCEPTION.html
  27. +4 −2 html-templates/TABLEtriggers.html
  28. +4 −2 html-templates/VIEWtriggers.html
  29. +6 −5 install/win32/FlameRobinSetup.iss
  30. +123 −95 makefile.bcc
  31. +0 −513 makefile.dms
  32. +122 −88 makefile.gcc
  33. +123 −81 makefile.mgw
  34. +120 −100 makefile.vc
  35. +112 −76 makefile.wat
  36. +25 −0 res/characterset.xpm
  37. +25 −0 res/charactersets.xpm
  38. +25 −0 res/collation.xpm
  39. +25 −0 res/collations.xpm
  40. +4 −0 src/config/Config.cpp
  41. +1 −1 src/config/Config.h
  42. +12 −0 src/core/ArtProvider.cpp
  43. +4 −0 src/core/ArtProvider.h
  44. +50 −14 src/core/FRDecimal.cpp
  45. +2 −2 src/core/FRDecimal.h
  46. +34 −3 src/core/FRInt128.cpp
  47. +1 −1 src/core/FRInt128.h
  48. +36 −1 src/core/StringUtils.cpp
  49. +5 −0 src/core/StringUtils.h
  50. +19,830 −0 src/firebird/include/firebird/IdlFbInterfaces.h
  51. +441 −0 src/firebird/include/firebird/Interface.h
  52. +555 −0 src/firebird/include/firebird/Message.h
  53. +642 −0 src/firebird/include/firebird/TimeZones.h
  54. +452 −0 src/firebird/include/firebird/UdrCppEngine.h
  55. +24 −1 src/frutils.cpp
  56. +4 −0 src/frutils.h
  57. +1 −1 src/frversion.h
  58. +1 −1 src/gui/AboutBox.cpp
  59. +3 −3 src/gui/CommandIds.h
  60. +36 −0 src/gui/ContextMenuMetadataItemVisitor.cpp
  61. +6 −0 src/gui/ContextMenuMetadataItemVisitor.h
  62. +2 −2 src/gui/DataGeneratorFrame.cpp
  63. +3 −1 src/gui/DatabaseRegistrationDialog.cpp
  64. +176 −69 src/gui/ExecuteSqlFrame.cpp
  65. +9 −3 src/gui/ExecuteSqlFrame.h
  66. +1 −1 src/gui/FRLayoutConfig.h
  67. +1 −302 src/gui/FRStyle.cpp
  68. +0 −47 src/gui/FRStyle.h
  69. +404 −0 src/gui/FRStyleManager.cpp
  70. +97 −0 src/gui/FRStyleManager.h
  71. +10 −3 src/gui/FieldPropertiesDialog.cpp
  72. +8 −0 src/gui/HtmlHeaderMetadataItemVisitor.cpp
  73. +1 −0 src/gui/HtmlHeaderMetadataItemVisitor.h
  74. +14 −33 src/gui/InsertParametersDialog.cpp
  75. +35 −6 src/gui/MainFrame.cpp
  76. +2 −0 src/gui/MainFrame.h
  77. +48 −3 src/gui/PreferencesDialog.cpp
  78. +25 −0 src/gui/PreferencesDialog.h
  79. +19 −549 src/gui/PreferencesDialogSettings.cpp
  80. +613 −0 src/gui/PreferencesDialogStyle.cpp
  81. +116 −0 src/gui/PreferencesDialogStyle.h
  82. +2 −0 src/gui/RestoreFrame.cpp
  83. +2 −2 src/gui/RestoreFrame.h
  84. +3 −1 src/gui/ServiceBaseFrame.cpp
  85. +37 −1 src/gui/controls/DBHTreeControl.cpp
  86. +24 −57 src/gui/controls/DataGrid.cpp
  87. +1 −2 src/gui/controls/DataGrid.h
  88. +29 −0 src/gui/controls/DataGridRowBuffer.cpp
  89. +2 −0 src/gui/controls/DataGridRowBuffer.h
  90. +81 −21 src/gui/controls/DataGridRows.cpp
  91. +1 −1 src/gui/controls/DataGridTable.h
  92. +1 −0 src/gui/controls/PrintableHtmlWindow.h
  93. +44 −35 src/ibpp/_ibpp.cpp
  94. +34 −4 src/ibpp/_ibpp.h
  95. +4 −0 src/ibpp/_rb.cpp
  96. +4 −0 src/ibpp/database.cpp
  97. +73 −0 src/ibpp/fbinterfaces.cpp
  98. +19 −7 src/ibpp/ibpp.h
  99. +12 −0 src/ibpp/row.cpp
  100. +3 −3 src/ibpp/service.cpp
  101. +12 −2 src/ibpp/statement.cpp
  102. +41 −16 src/ibpp/time.cpp
  103. +4 −0 src/main.cpp
  104. +328 −0 src/metadata/CharacterSet.cpp
  105. +94 −0 src/metadata/CharacterSet.h
  106. +271 −0 src/metadata/Collation.cpp
  107. +107 −0 src/metadata/Collation.h
  108. +27 −1 src/metadata/CreateDDLVisitor.cpp
  109. +4 −0 src/metadata/CreateDDLVisitor.h
  110. +21 −9 src/metadata/MetadataClasses.h
  111. +34 −0 src/metadata/MetadataItemCreateStatementVisitor.cpp
  112. +4 −0 src/metadata/MetadataItemCreateStatementVisitor.h
  113. +32 −0 src/metadata/MetadataItemDescriptionVisitor.cpp
  114. +4 −0 src/metadata/MetadataItemDescriptionVisitor.h
  115. +34 −8 src/metadata/MetadataItemVisitor.cpp
  116. +5 −0 src/metadata/MetadataItemVisitor.h
  117. +17 −8 src/metadata/MetadataTemplateCmdHandler.cpp
  118. +18 −1 src/metadata/collection.h
  119. +138 −56 src/metadata/database.cpp
  120. +16 −3 src/metadata/database.h
  121. +44 −10 src/metadata/domain.cpp
  122. +1 −1 src/metadata/domain.h
  123. +5 −3 src/metadata/exception.cpp
  124. +1 −1 src/metadata/exception.h
  125. +6 −4 src/metadata/function.cpp
  126. +1 −1 src/metadata/function.h
  127. +5 −3 src/metadata/generator.cpp
  128. +1 −1 src/metadata/generator.h
  129. +38 −18 src/metadata/metadataitem.cpp
  130. +27 −12 src/metadata/metadataitem.h
  131. +5 −3 src/metadata/package.cpp
  132. +1 −1 src/metadata/package.h
  133. +4 −1 src/metadata/privilege.cpp
  134. +13 −6 src/metadata/procedure.cpp
  135. +1 −1 src/metadata/procedure.h
  136. +5 −3 src/metadata/relation.cpp
  137. +1 −1 src/metadata/relation.h
  138. +5 −3 src/metadata/role.cpp
  139. +1 −1 src/metadata/role.h
  140. +4 −4 src/metadata/server.cpp
  141. +108 −5 src/sql/SqlStatement.cpp
  142. +7 −1 src/sql/SqlStatement.h
  143. +3 −3 src/sql/SqlTokenizer.h
  144. +1 −1 src/sql/StatementBuilder.cpp
  145. +1 −1 src/sql/keywordtokens.hpp
  146. +5 −5 xml-styles/stylers.xml
5 changes: 3 additions & 2 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
@@ -9,10 +9,11 @@ on:
jobs:
build:

runs-on: ubuntu-latest
#runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: wxWidgets 3.2
run: sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
- name: add repository
11 changes: 6 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,8 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
#runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
actions: read
contents: read
@@ -39,11 +40,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +69,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3


# ℹ️ Command-line programs to run using the OS shell.
@@ -83,4 +84,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
80 changes: 80 additions & 0 deletions .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: Build Flamerobin for Windows

env:
wx-tag-version: v3.2.2.1

on:
push:
branches: [ "**" ]
pull_request:
branches: [ "**" ]

jobs:
build:
runs-on: windows-latest
steps:

- uses: actions/checkout@v4

- name: wxWidget cache
id: cache-wxwidget
uses: actions/cache@v4
with:
path: |
wxWidgets
key: ${{ runner.os }}-wxwidgets-${{env.wx-tag-version}}
restore-keys: ${{ runner.os }}-wxwidgets-${{env.wx-tag-version}}

- if: ${{ steps.cache-wxwidget.outputs.cache-hit != 'true' }}
name: clone wxWidgets
run: git clone --recursive --branch ${{env.wx-tag-version}} --depth 1 https://github.com/wxWidgets/wxWidgets.git

- if: ${{ steps.cache-wxwidget.outputs.cache-hit != 'true' }}
name: replace /MD for /MT
run:
$xmls = (Get-ChildItem -Path "wxWidgets\build\msw" -Recurse -Filter *.vcxproj).FullName ;
foreach ($xml in $xmls) {
echo $xml;
(Get-Content $xml).replace("MultiThreadedDebugDLL", "MultiThreadedDebug") | Set-Content $xml ;
(Get-Content $xml).replace("MultiThreadedDLL", "MultiThreaded") | Set-Content $xml
}

- if: ${{ steps.cache-wxwidget.outputs.cache-hit != 'true' }}
name: Build wxWidgets x86
shell: cmd
run: |
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" && msbuild.exe wxWidgets\build\msw\wx_vc17.sln /t:Build /p:Configuration=Release /p:Platform=Win32
- if: ${{ steps.cache-wxwidget.outputs.cache-hit != 'true' }}
name: Build wxWidgets x64
shell: cmd
run: |
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" && msbuild.exe wxWidgets\build\msw\wx_vc17.sln /t:Build /p:Configuration=Release /p:Platform=x64
- name: Generate CMake x86 project
run: cmake -S .\ -B .\Build32 -A Win32 -DWXDIR=wxWidgets

- name: Generate CMake x64 project
run: cmake -S .\ -B .\Build64 -A x64 -DWXDIR=wxWidgets

- name: Build Flamerobin x86
run: >
cmake --build .\Build32 --config Release -j 8
- name: Build Flamerobin x64
run: >
cmake --build .\Build64 --config Release -j 8
- name: Innosetup
run: >
ISCC.exe install\win32\FlameRobinSetup.iss
- name: Innosetup64
run: >
ISCC.exe install\win32\FlameRobinSetup64.iss
- name: Upload installer
uses: actions/upload-artifact@main
with:
name: flamerobin-instaler
path: install/win32/output/flamerobin-*.exe
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -29,4 +29,7 @@ build*/
*.db
# Visual Studio 2015 cache/options directory
.vs/

#XCode
.DS_Store
xcuserdata
project.xcworkspace
Loading