Merge remote-tracking branch 'origin/1.1.0'

yumemi-inc · Feb 15, 2025 · f650eee · f650eee
2 parents e5654f0 + 261f5a7
commit f650eee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -14,6 +14,7 @@ jobs:
       matrix:
         sea:
           - { sea-orm: "1.0", sea-query: "0.31" }
+          - { sea-orm: "1.1", sea-query: "0.32" }
         use-sea-orm:
           - true
           - false
@@ -24,6 +25,8 @@ jobs:
           - sea: { sea-orm: "1.0", sea-query: "0.31" }
             use-sea-orm: true
             sqlx: "0.8"
+          - sea: { sea-orm: "1.1", sea-query: "0.32" }
+            sqlx: "0.7"
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust stable toolchain

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sea-query-common-like"
-version = "1.0.1"
+version = "1.1.0"
 authors = ["mpyw <[email protected]>"]
 edition = "2021"
 rust-version = "1.80.0"
@@ -12,15 +12,15 @@ keywords = ["sea-orm", "sea-query", "sql", "LIKE", "search"]
 categories = ["database", "web-programming"]
 
 [dependencies]
-fancy-regex = { version = "0.13", default-features = false }
+fancy-regex = { version = ">=0.13, <0.15", default-features = false }
 regex = { version = "1", default-features = false, features = ["unicode-gencat"] }
-sea-orm = { version = ">=1.0, <1.1", default-features = false, optional = true }
-sea-query = { version = ">=0.31, <0.32", default-features = false }
+sea-orm = { version = ">=1.0, <1.2", default-features = false, optional = true }
+sea-query = { version = ">=0.31, <0.33", default-features = false }
 
 [dev-dependencies]
-sea-orm = { version = ">=1.0, <1.1", features = ["macros"] }
-sea-query = ">=0.31, <0.32"
-sqlformat = "0.2.4"
+sea-orm = { version = ">=1.0, <1.2", features = ["macros"] }
+sea-query = ">=0.31, <0.33"
+sqlformat = "0.3.5"
 sqlx = ">=0.7, <0.9"
 sqlx-postgres = ">=0.7, <0.9"
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -85,7 +85,7 @@ static SEPARATOR_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\p{Zs}++
 ///             .to_string(PostgresQueryBuilder)
 ///             .as_str(),
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 ///     format(
 ///         r#"
@@ -100,7 +100,7 @@ static SEPARATOR_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\p{Zs}++
 ///                 AND "deleted_at" IS NULL
 ///         "#,
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 /// );
 /// ```
@@ -153,7 +153,7 @@ pub fn prefix(text: impl Into<String>) -> Keyword {
 ///             .to_string(PostgresQueryBuilder)
 ///             .as_str(),
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 ///     format(
 ///         r#"
@@ -168,7 +168,7 @@ pub fn prefix(text: impl Into<String>) -> Keyword {
 ///                 AND "deleted_at" IS NULL
 ///         "#,
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 /// );
 /// ```
@@ -223,7 +223,7 @@ pub fn suffix(text: impl Into<String>) -> Keyword {
 ///             .to_string(PostgresQueryBuilder)
 ///             .as_str(),
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 ///     format(
 ///         r#"
@@ -238,7 +238,7 @@ pub fn suffix(text: impl Into<String>) -> Keyword {
 ///                 AND "deleted_at" IS NULL
 ///         "#,
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 /// );
 /// ```
@@ -293,7 +293,7 @@ pub fn fuzzy(text: impl Into<String>) -> Keyword {
 ///             .to_string(PostgresQueryBuilder)
 ///             .as_str(),
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 ///     format(
 ///         r#"
@@ -319,7 +319,7 @@ pub fn fuzzy(text: impl Into<String>) -> Keyword {
 ///                 AND "deleted_at" IS NULL
 ///         "#,
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 /// );
 /// ```
@@ -369,7 +369,7 @@ pub fn fuzzy(text: impl Into<String>) -> Keyword {
 ///             .to_string()
 ///             .as_str(),
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 ///     format(
 ///         r#"
@@ -396,7 +396,7 @@ pub fn fuzzy(text: impl Into<String>) -> Keyword {
 ///                 AND "books"."deleted_at" IS NULL
 ///         "#,
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 /// );
 /// ```
@@ -450,7 +450,7 @@ pub fn fuzzy_separated(text: impl Into<String>) -> Keywords {
 ///             .to_string(PostgresQueryBuilder)
 ///             .as_str(),
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 ///     format(
 ///         r#"
@@ -472,7 +472,7 @@ pub fn fuzzy_separated(text: impl Into<String>) -> Keywords {
 ///                 AND "deleted_at" IS NULL
 ///         "#,
 ///         &QueryParams::default(),
-///         FormatOptions::default(),
+///         &FormatOptions::default(),
 ///     ),
 /// );
 /// ```