Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt CISQLite3.build.cs to changes since UE 4.16 #10

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
91b40e7
Adapt CISQLite3.build.cs to changes since UE 4.16
Squareys May 19, 2018
56dc9ab
Update sqlite
Squareys May 27, 2018
6eede71
Don't copy strings, use const FString& in parameters consistently.
Squareys May 27, 2018
2ffe119
Add a .gitignore
Squareys May 27, 2018
703be24
Remove trailing whitespaces
Squareys May 27, 2018
8024b74
Fix USQLiteDatabase::ExecSql
Squareys May 27, 2018
4143a70
Add USQLiteDatabase::CreateDatabase
Squareys May 27, 2018
4bcb3b4
Clean up some methods
Squareys May 27, 2018
e84ba40
Deprecated FPaths::GameContentDir() -> FPaths::ProjectContentDir()
Squareys May 27, 2018
59cdc0d
Make USQLiteDatabase::IsValidDatabase public
Squareys May 27, 2018
a15f06a
Add KeepOpen flag to RegisterDatabase()
Squareys Jun 3, 2018
0af7d24
Make RunQueryAndGetResults public
Squareys Jun 3, 2018
a2f3339
Allow unregistering a database (and closing potential KeepOpen DB)
Squareys Jun 3, 2018
8287c23
Disable warning 4668 to allow compilation with UE4.20
Squareys Aug 9, 2018
7e3c785
Update README to advertise UE 4.20 compatibility
Squareys Aug 9, 2018
e67e906
Ignore -Wundef for compilation with UE4.20 on Android
Squareys Aug 9, 2018
140ace0
Avoid a warning with newer UE4 versions
Squareys May 6, 2019
728c49f
Less verbose log output
Squareys May 6, 2019
9218ad7
Error when database creation fails
Squareys May 6, 2019
98bd176
Check if Database is registered before running sql statement
Squareys May 6, 2019
0d01c42
Check if database is registered before query
Squareys May 6, 2019
e045095
Add Serialize and Deserialize
Squareys May 9, 2019
1e2cba4
README: Update versions
Squareys May 9, 2019
701cfe4
Rename De-/Serialize functions to Dump/Restore
Squareys Jul 22, 2019
c1af8a1
Add copyrights
Squareys Sep 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Intermediate/
Binaries/

*.swp
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ The MIT License (MIT)

Copyright (c) 2015,2016 Jussi Saarivirta & KhArtNJava (SQLite3UE4)
Copyright (c) 2016 conflict.industries
Copyright (c) 2019 Jonathan Hale (Vhite Rabbit GbR)
Copyright (c) 2019 Rehub GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
21 changes: 17 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,25 @@ Please report any problems to the [issues tracker](https://github.com/cindustrie

SQLite3UE4 integrates sqlite3 as a ThirdParty module, which leads to a chain of complexity and also requires people to build the sqlite3 library before using it. On CISQLite3, we integrated the sqlite3 code directly into the module, and so it gets linked like the rest of the module on compile.

# Tested on ...
# Works On

**WARNING** The test is so far just compile test (this is all new, updates following regulary)
Compiled and basic functionality:

Windows x64 **WORKS**, Android **WORKS**
OS | Tested
---|-------
Windows x64 | ✓
Android | ✓

UE4 Version | Tested
---|-------
4.22.x | ✓
4.21.x | ✓
4.20.x | ✓
4.19.x | ✓

# Installation

Copy this plugin (like Download as ZIP) into the folder **Plugins/CISQLite3** on your project and a start of the project should compile the plugin automatically, if the project is C++. If you don't have a C++ project, then you can just make one for the sole purpose of compiling this plugin. Alternative you can install it as Engine Plugin in the Engine Plugins directory (like **Epic Games/4.12/Engine/Plugins/Runtime/CISQLite3**).
Copy this plugin (like Download as ZIP) into the folder **Plugins/CISQLite3** on your project and a start of the project should compile the plugin automatically, if the project is C++. If you don't have a C++ project, then you can just make one for the sole purpose of compiling this plugin. Alternative you can install it as Engine Plugin in the Engine Plugins directory (like **Epic Games/4.22/Engine/Plugins/Runtime/CISQLite3**).

# Usage

Expand Down Expand Up @@ -89,6 +99,9 @@ Copyright (c) 2015 Jussi Saarivirta & KhArtNJava (SQLite3UE4)

Copyright (c) 2016 conflict.industries

Copyright (c) 2019 Jonathan Hale (Vhite Rabbit GbR)
Copyright (c) 2019 Rehub GmbH

## SQLite3

The author disclaims copyright to this source code. In place of a legal notice, here is a blessing:
Expand Down
20 changes: 8 additions & 12 deletions Source/CISQLite3/CISQLite3.Build.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
// Copyright (c) 2015 Jussi Saarivirta 2016 conflict.industries MIT License (MIT)

using UnrealBuildTool;
using System.IO;

public class CISQLite3 : ModuleRules
{
public CISQLite3(TargetInfo Target)
public CISQLite3(ReadOnlyTargetRules Target) : base(Target)
{

PublicIncludePaths.AddRange(
new string[] {
"CISQLite3/Public"
}
);

PrivateIncludePaths.AddRange(
new string[] {
"CISQLite3/Private"
}
);
PublicIncludePaths.AddRange(new string[] { Path.Combine(ModuleDirectory, "Public") });
PrivateIncludePaths.AddRange(new string[] { Path.Combine(ModuleDirectory, "Private") });

PrivatePCHHeaderFile = "Private/CISQLite3PrivatePCH.h";

PublicDependencyModuleNames.AddRange(
new string[] {
Expand All @@ -27,6 +21,8 @@ public CISQLite3(TargetInfo Target)
}
);

PrivateDefinitions.Add("SQLITE_ENABLE_DESERIALIZE=1");

PrivateDependencyModuleNames.AddRange(
new string[] {}
);
Expand Down
2 changes: 1 addition & 1 deletion Source/CISQLite3/Private/CISQLite3PrivatePCH.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
#include "SQLiteBlueprintFunctionLibrary.h"
#include "SQLiteBlueprintNodes.h"

DECLARE_LOG_CATEGORY_EXTERN(LogDatabase, All, All);
DECLARE_LOG_CATEGORY_EXTERN(LogDatabase, Log, All);
4 changes: 2 additions & 2 deletions Source/CISQLite3/Private/SQLiteBlueprintFunctionLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ FSQLitePrimaryKey USQLiteBlueprintFunctionLibrary::SQLitePrimaryKey(const TArray
}

FSQLiteIndex USQLiteBlueprintFunctionLibrary::SQLiteIndexFunction(const TArray<FSQLiteTableField> Fields, FString idxName, bool Unique) {

FSQLiteIndex i;
i.IndexName = idxName;

Expand All @@ -196,4 +196,4 @@ FSQLiteIndex USQLiteBlueprintFunctionLibrary::SQLiteIndexFunction(const TArray<F

return i;

}
}
Loading