cleanup

Author: thbley

DuckDB.php

@@ -6,7 +6,7 @@ class DuckDB
     private FFI\CData $db;
     private FFI\CData $conn;
 
-    public function __construct(?string $databasePath, string $libraryPath, string $headersPath)
+    public function __construct(string $databasePath, string $libraryPath, string $headersPath)
     {
         $this->ffi = FFI::cdef(file_get_contents($headersPath), $libraryPath);
 

duckdb.h

@@ -10,14 +10,20 @@
 
 #pragma once
 
+#ifdef _WIN32
+#ifdef DUCKDB_BUILD_LIBRARY
+#define __declspec(dllexport)
+#else
+#define __declspec(dllimport)
+#endif
+#else
+#define DUCKDB_API
+#endif
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-#ifdef __cplusplus
-##extern "C" {
-#endif
-
 typedef uint64_t idx_t;
 
 typedef enum DUCKDB_TYPE {
@@ -36,8 +42,14 @@ typedef enum DUCKDB_TYPE {
 	DUCKDB_TYPE_FLOAT,
 	// double
 	DUCKDB_TYPE_DOUBLE,
-	// duckdb_timestamp
+	// duckdb_timestamp (us)
 	DUCKDB_TYPE_TIMESTAMP,
+	// duckdb_timestamp (s)
+	DUCKDB_TYPE_TIMESTAMP_S,
+	// duckdb_timestamp (ns)
+	DUCKDB_TYPE_TIMESTAMP_NS,
+	// duckdb_timestamp (ms)
+	DUCKDB_TYPE_TIMESTAMP_MS,
 	// duckdb_date
 	DUCKDB_TYPE_DATE,
 	// duckdb_time
@@ -47,7 +59,9 @@ typedef enum DUCKDB_TYPE {
 	// duckdb_hugeint
 	DUCKDB_TYPE_HUGEINT,
 	// const char*
-	DUCKDB_TYPE_VARCHAR
+	DUCKDB_TYPE_VARCHAR,
+	// duckdb_blob
+	DUCKDB_TYPE_BLOB
 } duckdb_type;
 
 typedef struct {
@@ -60,7 +74,7 @@ typedef struct {
 	int8_t hour;
 	int8_t min;
 	int8_t sec;
-	int16_t msec;
+	int16_t micros;
 } duckdb_time;
 
 typedef struct {
@@ -71,14 +85,19 @@ typedef struct {
 typedef struct {
 	int32_t months;
 	int32_t days;
-	int64_t msecs;
+	int64_t micros;
 } duckdb_interval;
 
 typedef struct {
 	uint64_t lower;
 	int64_t upper;
 } duckdb_hugeint;
 
+typedef struct {
+	void *data;
+	idx_t size;
+} duckdb_blob;
+
 typedef struct {
 	void *data;
 	bool *nullmask;
@@ -107,6 +126,7 @@ typedef struct {
 typedef void *duckdb_database;
 typedef void *duckdb_connection;
 typedef void *duckdb_prepared_statement;
+typedef void *duckdb_appender;
 
 typedef enum { DuckDBSuccess = 0, DuckDBError = 1 } duckdb_state;
 
@@ -144,18 +164,29 @@ int16_t duckdb_value_int16(duckdb_result *result, idx_t col, idx_t row);
 int32_t duckdb_value_int32(duckdb_result *result, idx_t col, idx_t row);
 //! Converts the specified value to an int64_t. Returns 0 on failure or NULL.
 int64_t duckdb_value_int64(duckdb_result *result, idx_t col, idx_t row);
+//! Converts the specified value to an uint8_t. Returns 0 on failure or NULL.
+uint8_t duckdb_value_uint8(duckdb_result *result, idx_t col, idx_t row);
+//! Converts the specified value to an uint16_t. Returns 0 on failure or NULL.
+uint16_t duckdb_value_uint16(duckdb_result *result, idx_t col, idx_t row);
+//! Converts the specified value to an uint64_t. Returns 0 on failure or NULL.
+uint32_t duckdb_value_uint32(duckdb_result *result, idx_t col, idx_t row);
+//! Converts the specified value to an uint64_t. Returns 0 on failure or NULL.
+uint64_t duckdb_value_uint64(duckdb_result *result, idx_t col, idx_t row);
 //! Converts the specified value to a float. Returns 0.0 on failure or NULL.
 float duckdb_value_float(duckdb_result *result, idx_t col, idx_t row);
 //! Converts the specified value to a double. Returns 0.0 on failure or NULL.
 double duckdb_value_double(duckdb_result *result, idx_t col, idx_t row);
 //! Converts the specified value to a string. Returns nullptr on failure or NULL. The result must be freed with free.
 char *duckdb_value_varchar(duckdb_result *result, idx_t col, idx_t row);
+//! Fetches a blob from a result set column. Returns a blob with blob.data set to nullptr on failure or NULL. The
+//! resulting "blob.data" must be freed with free.
+duckdb_blob duckdb_value_blob(duckdb_result *result, idx_t col, idx_t row);
 
 // Prepared Statements
 
 //! prepares the specified SQL query in the specified connection handle. [OUT: prepared statement descriptor]
 duckdb_state duckdb_prepare(duckdb_connection connection, const char *query,
-                            duckdb_prepared_statement *out_prepared_statement);
+                                       duckdb_prepared_statement *out_prepared_statement);
 
 duckdb_state duckdb_nparams(duckdb_prepared_statement prepared_statement, idx_t *nparams_out);
 
@@ -165,17 +196,54 @@ duckdb_state duckdb_bind_int8(duckdb_prepared_statement prepared_statement, idx_
 duckdb_state duckdb_bind_int16(duckdb_prepared_statement prepared_statement, idx_t param_idx, int16_t val);
 duckdb_state duckdb_bind_int32(duckdb_prepared_statement prepared_statement, idx_t param_idx, int32_t val);
 duckdb_state duckdb_bind_int64(duckdb_prepared_statement prepared_statement, idx_t param_idx, int64_t val);
+#duckdb_state duckdb_bind_uint8(duckdb_prepared_statement prepared_statement, idx_t param_idx, int8_t val);
+#duckdb_state duckdb_bind_uint16(duckdb_prepared_statement prepared_statement, idx_t param_idx, int16_t val);
+duckdb_state duckdb_bind_uint32(duckdb_prepared_statement prepared_statement, idx_t param_idx, uint32_t val);
+duckdb_state duckdb_bind_uint64(duckdb_prepared_statement prepared_statement, idx_t param_idx, uint64_t val);
 duckdb_state duckdb_bind_float(duckdb_prepared_statement prepared_statement, idx_t param_idx, float val);
 duckdb_state duckdb_bind_double(duckdb_prepared_statement prepared_statement, idx_t param_idx, double val);
-duckdb_state duckdb_bind_varchar(duckdb_prepared_statement prepared_statement, idx_t param_idx, const char *val);
+duckdb_state duckdb_bind_varchar(duckdb_prepared_statement prepared_statement, idx_t param_idx,
+                                            const char *val);
+duckdb_state duckdb_bind_varchar_length(duckdb_prepared_statement prepared_statement, idx_t param_idx,
+                                                   const char *val, idx_t length);
+duckdb_state duckdb_bind_blob(duckdb_prepared_statement prepared_statement, idx_t param_idx,
+                                         const void *data, idx_t length);
 duckdb_state duckdb_bind_null(duckdb_prepared_statement prepared_statement, idx_t param_idx);
 
 //! Executes the prepared statements with currently bound parameters
-duckdb_state duckdb_execute_prepared(duckdb_prepared_statement prepared_statement, duckdb_result *out_result);
+duckdb_state duckdb_execute_prepared(duckdb_prepared_statement prepared_statement,
+                                                duckdb_result *out_result);
 
 //! Destroys the specified prepared statement descriptor
 void duckdb_destroy_prepare(duckdb_prepared_statement *prepared_statement);
 
-#ifdef __cplusplus
-##}
-#endif
+duckdb_state duckdb_appender_create(duckdb_connection connection, const char *schema, const char *table,
+                                               duckdb_appender *out_appender);
+
+duckdb_state duckdb_appender_begin_row(duckdb_appender appender);
+duckdb_state duckdb_appender_end_row(duckdb_appender appender);
+
+duckdb_state duckdb_append_bool(duckdb_appender appender, bool value);
+
+duckdb_state duckdb_append_int8(duckdb_appender appender, int8_t value);
+duckdb_state duckdb_append_int16(duckdb_appender appender, int16_t value);
+duckdb_state duckdb_append_int32(duckdb_appender appender, int32_t value);
+duckdb_state duckdb_append_int64(duckdb_appender appender, int64_t value);
+
+duckdb_state duckdb_append_uint8(duckdb_appender appender, uint8_t value);
+duckdb_state duckdb_append_uint16(duckdb_appender appender, uint16_t value);
+duckdb_state duckdb_append_uint32(duckdb_appender appender, uint32_t value);
+duckdb_state duckdb_append_uint64(duckdb_appender appender, uint64_t value);
+
+duckdb_state duckdb_append_float(duckdb_appender appender, float value);
+duckdb_state duckdb_append_double(duckdb_appender appender, double value);
+
+duckdb_state duckdb_append_varchar(duckdb_appender appender, const char *val);
+duckdb_state duckdb_append_varchar_length(duckdb_appender appender, const char *val, idx_t length);
+duckdb_state duckdb_append_blob(duckdb_appender appender, const void *data, idx_t length);
+duckdb_state duckdb_append_null(duckdb_appender appender);
+
+duckdb_state duckdb_appender_flush(duckdb_appender appender);
+duckdb_state duckdb_appender_close(duckdb_appender appender);
+
+duckdb_state duckdb_appender_destroy(duckdb_appender *appender);

libduckdb.so

@@ -1,5 +1,7 @@
 <?php
 
+// php -dffi.enable=1 test.php
+
 error_reporting(E_ALL);
 
 require 'DuckDB.php';