diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 4248bae2..a0acb75f 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -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 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f3dfd0f3..ca1317ec 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 5e7ec44f..41445d7b 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -14,11 +14,11 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: wxWidget cache id: cache-wxwidget - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | wxWidgets diff --git a/src/frversion.h b/src/frversion.h index 84ae3959..78e4b47b 100644 --- a/src/frversion.h +++ b/src/frversion.h @@ -1,6 +1,6 @@ #define FR_VERSION_MAJOR 0 #define FR_VERSION_MINOR 9 -#define FR_VERSION_RLS 11 +#define FR_VERSION_RLS 12 // if this file can't be found you need to run the update-revision-info script #include "revisioninfo.h" diff --git a/src/metadata/metadataitem.cpp b/src/metadata/metadataitem.cpp index b0bae40c..30dfbb2a 100644 --- a/src/metadata/metadataitem.cpp +++ b/src/metadata/metadataitem.cpp @@ -151,6 +151,8 @@ NodeType getTypeByName(const wxString& name) return ntGenerator; else if (name == "FUNCTIONSQL") return ntFunctionSQL; + else if (name == "FUNCTION") + return ntFunctionSQL; else if (name == "UDF") return ntUDF; else if (name == "DOMAIN") @@ -329,7 +331,7 @@ void MetadataItem::getDependencies(std::vector& list, NodeType dep_types[] = { ntTable, ntView, ntTrigger, ntUnknown, ntUnknown, ntProcedure,ntUnknown, ntException,ntUnknown, ntUnknown, ntUnknown, ntUnknown, ntUnknown, ntUnknown, ntGenerator, - ntFunction, ntUnknown, ntUnknown, ntUnknown, ntPackage + ntFunctionSQL, ntUnknown, ntUnknown, ntUnknown, ntPackage }; const int type_count = sizeof(dep_types)/sizeof(NodeType); for (int i = 0; i < type_count; i++)