fix: pgsql windows

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "cmake.configureOnOpen": true
+}

appveyor.yml

@@ -9,7 +9,7 @@ platform:
 environment:
   vspath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community'
   winflexbison: https://github.com/lexxmark/winflexbison/releases/download/v2.5.22/win_flex_bison-2.5.22.zip
-  PATH: '%PATH%;C:\WinFlexBison'
+  PATH: '%PATH%;C:\WinFlexBison;C:\Program Files (x86)\PostgreSQL\9.6;C:\Program Files\PostgreSQL\9.6'
 
 configuration:
   - Release
@@ -20,14 +20,20 @@ skip_commits:
     - '.github/**'
 
 install:
-  - ps: Invoke-WebRequest -O winflexbison.zip $env:winflexbison
-  - ps: Expand-Archive winflexbison.zip -Destination /WinFlexBison
-  - ps: Copy-Item -Path /WinFlexBison/win_bison.exe /WinFlexBison/bison.exe
-  - ps: Copy-Item -Path /WinFlexBison/win_flex.exe /WinFlexBison/flex.exe
+  - ps: |
+      Invoke-WebRequest -O winflexbison.zip $env:winflexbison
+      Expand-Archive winflexbison.zip -Destination /WinFlexBison
+      Copy-Item -Path /WinFlexBison/win_bison.exe /WinFlexBison/bison.exe
+      Copy-Item -Path /WinFlexBison/win_flex.exe /WinFlexBison/flex.exe
+  - ps: |
+      if ($env:PLATFORM -eq "Win32") {
+        Invoke-WebRequest -Uri "https://get.enterprisedb.com/postgresql/postgresql-9.6.22-1-windows-binaries.zip" -Outfile /pgsql.zip
+        Expand-Archive -Path /pgsql.zip -DestinationPath /
+        New-Item -ItemType directory -Path "C:\Program Files (x86)\PostgreSQL"
+        Move-Item -Path /pgsql -Destination "C:\Program Files (x86)\PostgreSQL\9.6"
+      }
 
 before_build:
-  - git clone --depth=1 https://github.com/calyptia/fluent-bit-ci.git ci
-  - ps: Copy-Item -Path .\ci\scripts\run-unit-tests.ps1 .\ci\do-ut.ps1
   - if %PLATFORM%==Win32 call "%vspath%\VC\Auxiliary\Build\vcvars32.bat"
   - if %PLATFORM%==x64   call "%vspatH%\VC\Auxiliary\Build\vcvars64.bat"
 

ci/do-ut.ps1

@@ -0,0 +1,41 @@
+cd build
+
+if ( "x64" -eq $env:PLATFORM ) {
+    $OPENSSL_DIR = "C:\OpenSSL-v111-Win64"
+    $POSTGRESQL_ROOT = "C:\Program Files\PostgreSQL\9.6\bin"
+}
+else {
+    $OPENSSL_DIR = "C:\OpenSSL-v111-Win32"
+    $POSTGRESQL_ROOT = "C:\Program Files (x86)\PostgreSQL\9.6\bin"
+}
+
+
+# CACHE GENERATION
+cmake -G "NMake Makefiles" `
+                     -D PostgreSQL_ROOT=$POSTGRESQL_ROOT `
+                     -D FLB_TESTS_INTERNAL=On `
+                     -D OPENSSL_ROOT_DIR=$OPENSSL_DIR `
+                     -D FLB_WITHOUT_flb-rt-out_elasticsearch=On `
+                     -D FLB_WITHOUT_flb-rt-out_td=On `
+                     -D FLB_WITHOUT_flb-rt-out_forward=On `
+                     -D FLB_WITHOUT_flb-rt-in_disk=On `
+                     -D FLB_WITHOUT_flb-rt-in_proc=On `
+                     -D FLB_WITHOUT_flb-it-parser=On `
+                     -D FLB_WITHOUT_flb-it-unit_sizes=On `
+                     -D FLB_WITHOUT_flb-it-network=On `
+                     -D FLB_WITHOUT_flb-it-pack=On `
+                     -D FLB_WITHOUT_flb-it-signv4=On `
+                     -D FLB_WITHOUT_flb-it-aws_credentials=On `
+                     -D FLB_WITHOUT_flb-it-aws_credentials_ec2=On `
+                     -D FLB_WITHOUT_flb-it-aws_credentials_http=On `
+                     -D FLB_WITHOUT_flb-it-aws_credentials_profile=On `
+                     -D FLB_WITHOUT_flb-it-aws_credentials_sts=On `
+                     -D FLB_WITHOUT_flb-it-aws_util=On `
+                     -D FLB_WITHOUT_flb-it-input_chunk=On `
+                     ../
+
+# COMPILE
+cmake --build .
+
+# RUNNING TESTS
+ctest --build-run-dir $PWD --output-on-failure

cmake/windows-setup.cmake

@@ -57,6 +57,7 @@ set(FLB_OUT_GELF              Yes)
 set(FLB_OUT_HTTP              Yes)
 set(FLB_OUT_INFLUXDB          Yes)
 set(FLB_OUT_NATS               No)
+set(FLB_OUT_PGSQL             Yes)
 set(FLB_OUT_PLOT               No)
 set(FLB_OUT_FILE              Yes)
 set(FLB_OUT_TD                 No)

lib/cmetrics/include/cmetrics/cmt_version.h

@@ -0,0 +1,36 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/*  Chunk I/O
+ *  =========
+ *  Copyright 2018 Eduardo Silva <[email protected]>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef CMT_VERSION_H
+#define CMT_VERSION_H
+
+/* Helpers to convert/format version string */
+#define STR_HELPER(s)      #s
+#define STR(s)             STR_HELPER(s)
+
+/* Chunk I/O Version */
+#define CMT_VERSION_MAJOR   0
+#define CMT_VERSION_MINOR   2
+#define CMT_VERSION_PATCH   1
+#define CMT_VERSION         (CMT_VERSION_MAJOR * 10000 \
+                             CMT_VERSION_MINOR * 100   \
+                             CMT_VERSION_PATCH)
+#define CMT_VERSION_STR     "0.2.1"
+
+#endif

plugins/out_pgsql/CMakeLists.txt

@@ -3,6 +3,14 @@ set(src
   pgsql_connections.c
   )
 
-FLB_PLUGIN(out_pgsql "${src}" "")
-target_include_directories(flb-plugin-out_pgsql PRIVATE ${PostgreSQL_INCLUDE_DIRS})
-target_link_libraries(flb-plugin-out_pgsql -lpq)
+find_package(PostgreSQL REQUIRED)
+if (PostgreSQL_FOUND)
+    FLB_PLUGIN(out_pgsql "${src}" "")
+    target_include_directories(flb-plugin-out_pgsql PRIVATE ${PostgreSQL_INCLUDE_DIRS})
+    if (FLB_SYSTEM_WINDOWS)
+        target_link_directories(flb-plugin-out_pgsql PRIVATE ${PG_LIB})
+        target_link_libraries(flb-plugin-out_pgsql ${PostgreSQL_LIBRARY_DIRS}/libpq.lib)
+    else ()
+        target_link_libraries(flb-plugin-out_pgsql -lpq)
+    endif()
+endif()