Skip to content

Commit 51d369c

Browse files
authored
Merge branch 'litedb-org:master' into master
2 parents 02d713f + de528a6 commit 51d369c

File tree

5 files changed

+219
-1
lines changed

5 files changed

+219
-1
lines changed

CODE_OF_CONDUCT.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[Discord](https://discord.gg/u8seFBH9Zu).
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

LiteDB.Tests/Expressions/Expressions_Exec_Tests.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,19 @@ BsonValue S(string s, params BsonValue[] args)
104104
return BsonExpression.Create(s, args).ExecuteScalar(doc);
105105
}
106106

107+
// Arithmetic operators
108+
doc = new BsonDocument();
109+
// Int
110+
S("6 + 3").ExpectValue(9);
111+
S("6 * 3").ExpectValue(18);
112+
S("6 % 3").ExpectValue(0);
113+
S("6 / 3").ExpectValue(2);
114+
// Double
115+
S("6.0 + 3.0").ExpectValue(9);
116+
S("6.0 * 3.0").ExpectValue(18);
117+
S("6.0 % 3.0").ExpectValue(0);
118+
S("6.0 / 3.0").ExpectValue(2);
119+
107120
// Operators order
108121
doc = J("{ a: 1, b: 2, c: 3 }");
109122

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
using FluentAssertions;
2+
using Xunit;
3+
4+
namespace LiteDB.Tests.Issues;
5+
6+
public class Issue2570_Tests
7+
{
8+
public class Person
9+
{
10+
public int Id { get; set; }
11+
12+
public (string FirstName, string LastName) Name { get; set; }
13+
}
14+
15+
[Fact]
16+
public void Issue2570_Tuples()
17+
{
18+
using (var db = new LiteDatabase(":memory:"))
19+
{
20+
var col = db.GetCollection<Person>("Person");
21+
22+
col.Insert(new Person { Name = ("John", "Doe") });
23+
col.Insert(new Person { Name = ("Joana", "Doe") });
24+
25+
var result = col.FindOne(x => x.Name.FirstName == "John");
26+
27+
result.Should().NotBeNull();
28+
result.Name.FirstName.Should().Be("John");
29+
result.Name.LastName.Should().Be("Doe");
30+
}
31+
}
32+
33+
public struct PersonData
34+
{
35+
public string FirstName;
36+
public string LastName;
37+
}
38+
39+
public class PersonWithStruct
40+
{
41+
public int Id { get; set; }
42+
43+
public PersonData Name { get; set; }
44+
}
45+
46+
[Fact]
47+
public void Issue2570_Structs()
48+
{
49+
using (var db = new LiteDatabase(":memory:"))
50+
{
51+
var col = db.GetCollection<PersonWithStruct>("Person");
52+
53+
col.Insert(new PersonWithStruct { Name = new PersonData { FirstName = "John", LastName = "Doe" } });
54+
col.Insert(new PersonWithStruct { Name = new PersonData { FirstName = "Joana", LastName = "Doe" } });
55+
56+
var result = col.FindOne(x => x.Name.FirstName == "John");
57+
58+
result.Should().NotBeNull();
59+
result.Name.FirstName.Should().Be("John");
60+
result.Name.LastName.Should().Be("Doe");
61+
}
62+
}
63+
}

LiteDB/Client/Mapper/BsonMapper.GetEntityMapper.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,10 @@ protected virtual IEnumerable<MemberInfo> GetTypeMembers(Type type)
169169
.Where(x => x.CanRead && x.GetIndexParameters().Length == 0)
170170
.Select(x => x as MemberInfo));
171171

172-
if (this.IncludeFields)
172+
var shouldIncludeFields = members.Count == 0
173+
&& type.GetTypeInfo().IsValueType;
174+
175+
if (shouldIncludeFields || this.IncludeFields)
173176
{
174177
members.AddRange(type.GetFields(flags).Where(x => !x.Name.EndsWith("k__BackingField") && x.IsStatic == false)
175178
.Select(x => x as MemberInfo));

LiteDB/Document/BsonValue.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,17 @@ public static implicit operator BsonValue(DateTime value)
500500
return left.AsDouble / right.AsDouble;
501501
}
502502

503+
// %
504+
public static BsonValue operator %(BsonValue left, BsonValue right)
505+
{
506+
if (!left.IsNumber || !right.IsNumber) return BsonValue.Null;
507+
if (left.IsInt32 && right.IsInt32) return left.AsInt32 % right.AsInt32;
508+
if (left.IsInt64 && right.IsInt64) return left.AsInt64 % right.AsInt64;
509+
if (left.IsDecimal && right.IsDecimal) return left.AsDecimal % right.AsDecimal;
510+
511+
return left.AsDouble % right.AsDouble;
512+
}
513+
503514
public override string ToString()
504515
{
505516
return JsonSerializer.Serialize(this);

0 commit comments

Comments
 (0)