Merge pull request #1121 from tildeio/sql-server-support

zvkemp · web-flow · commit c5acafae0e64 · 2024-06-12T09:22:54.000-04:00
Sql server support
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,18 +1,26 @@
+## 6.1.0.beta (June 11, 2024)
+
+- [IMPROVEMENT] Initial support for parsing queries from activerecord-sqlserver-adapter
+
 ## 6.0.4 (February 23, 2024)
+
 - [IMPROVEMENT] Set "turbo-frame" in the request segment when making a Turbo-Frame request
 
 ## 6.0.3 (January 18, 2024)
+
 - [IMPROVEMENT] Remove an outdated "abbrev" requirement
 
 ## 6.0.2 (January 9, 2024)
 
 - [IMPROVEMENT] When using certain versions of Rubygems (< 3.4.9), some users experienced a Rubygems bug in which the wrong version of Psych native extensions were loaded during Skylight's native extension building. We have inlined the data needed to download libskylight, so YAML is no longer required during installation. Note that for existing versions of Skylight, this issue may also be corrected by updating Rubygems to at least 3.4.9.
 
 ## 6.0.1 (September 12, 2023)
+
 - [BUGFIX] Fix a logger message that could raise an error when I18n is misconfigured or unconfigured.
 - [BUGFIX] Fix an issue with proxy config in skylightd.
 
 ## 6.0.0 (September 11, 2023)
+
 - [BREAKING] End support for Ruby 2.6
 - The following libraries are no longer tested and are not guaranteed to work with Skylight 6:
   - Sinatra 1.x
@@ -30,6 +38,7 @@
 - [IMPROVEMENT] Better support for GraphQL versions >= 2.0.18.
 
 ## 5.3.5 (January 18, 2024)
+
 - [IMPROVEMENT] Remove an outdated "abbrev" requirement
 
 ## 5.3.4 (October 17, 2022)
diff --git a/ext/extconf.rb b/ext/extconf.rb
@@ -12,16 +12,16 @@
 GLIBC_V4_MIN = 2.15
 
 LIBSKYLIGHT_INFO = {
-  "version" => "5.2.0-744615f",
+  "version" => "5.2.1-0a9bfee",
   "checksums" => {
-    "x86-linux" => "5c6c92d8b5c0f1509ae2229e756566a7be8e0722cb8de8b9d520372b6180a57b",
-    "x86_64-linux" => "116149b5e23d9f939811d94ba599f99657510a6130ecf5426de952428e6b3702",
-    "x86_64-linux-musl" => "52f6b9ea8724aded9261e09f840dc99c7819fc97eba9dcc26353cbad9b17c833",
-    "x86_64-darwin" => "65455b2e0206367f4798b89a11750cbe48c3523cc4f05be43e6135ecf88a6ddc",
-    "x86_64-freebsd" => "f41f3941eb112fb7900c7c106f7369e5a469ff8254cb752498b9a8e7362dc61a",
-    "aarch64-linux" => "3a0fc9a9bdd52ef608c52070f5ac6f2c7c9c3e06e80ee6b04a253259144642d6",
-    "aarch64-linux-musl" => "1611f7b6533dfb3e6b8adde0627c6d6906cf8afadc6c29d811856c8a0b580f70",
-    "aarch64-darwin" => "f2e98e29d150515cfaf4037ba528b7951e87983b55527b2269062fcfa6b3f8da"
+    "x86-linux" => "af118eee2d41a0b989ec7620c7ee090cd1b75d5bb515cf09213fb977b9018fc7",
+    "x86_64-linux" => "26e752796a4b6c6e22668903a056958743b234d1c43973bc427c41280b2da0ec",
+    "x86_64-linux-musl" => "d082c465b48b8ac8c4149ecd052588bd7c65d8c9593de61c86996aa5a4cbc060",
+    "x86_64-darwin" => "bc0eb0f5aa45ab0dd1a85f446fa4533977ba5b9607c77c81fc81b1a4763a1888",
+    "x86_64-freebsd" => "a4328e817928650b50f1e011c048c45dcecbcad094e3bc63f2a06ad24ad8868b",
+    "aarch64-linux" => "d365c375d3de478d27d08c947bedee9377127bc8bd311e220372cfc0fe8e2ad4",
+    "aarch64-linux-musl" => "de66e234540e6af734d678bec49b0c1fdb23bc925b9e051e605e559e0a97e981",
+    "aarch64-darwin" => "f747dd6a934869a4a5865a3051b1ade9588ef3a73026376c043ac114876c0b12"
   }.freeze
 }.freeze
 
diff --git a/gemfiles/ams-0.10.x/Gemfile b/gemfiles/ams-0.10.x/Gemfile
@@ -4,7 +4,7 @@ gemspec path: "../.."
 
 # TODO: Check if we need Rails
 gem "rails", "~> 7.1.0"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "active_model_serializers", "~> 0.10.12"
 
diff --git a/gemfiles/ams-0.8.x/Gemfile b/gemfiles/ams-0.8.x/Gemfile
@@ -4,6 +4,6 @@ gemspec path: "../.."
 
 # TODO: Check if we need Rails
 gem "rails", "~> 5.2.0"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "active_model_serializers", "~> 0.8.3"
diff --git a/gemfiles/ams-0.9.x/Gemfile b/gemfiles/ams-0.9.x/Gemfile
@@ -4,6 +4,6 @@ gemspec path: "../.."
 
 # TODO: Check if we need Rails
 gem "rails", "~> 5.2.0"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "active_model_serializers", "~> 0.9.5"
diff --git a/gemfiles/elasticsearch/Gemfile b/gemfiles/elasticsearch/Gemfile
@@ -4,7 +4,7 @@ gemspec path: "../.."
 
 # TODO: Check if we need Rails
 gem "rails", "~> 6.1.0"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "elasticsearch"
 
diff --git a/gemfiles/graphql-1.9.x/Gemfile b/gemfiles/graphql-1.9.x/Gemfile
@@ -4,6 +4,6 @@ gemspec path: "../.."
 
 # TODO: Check if we need Rails
 gem "rails", "~> 5.2.0"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "graphql", "~> 1.9.0"
diff --git a/gemfiles/graphql-2.0.17/Gemfile b/gemfiles/graphql-2.0.17/Gemfile
@@ -3,6 +3,6 @@ source "https://rubygems.org"
 gemspec path: "../.."
 
 gem "rails", "~> 6.1"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "graphql", "2.0.17.2"
diff --git a/gemfiles/mongoid-6.x/Gemfile b/gemfiles/mongoid-6.x/Gemfile
@@ -4,7 +4,7 @@ gemspec path: "../.."
 
 # TODO: Check if we need Rails
 gem "rails", "~> 5.2.0"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "mongo"
 gem "mongoid", "~> 6"
diff --git a/gemfiles/mongoid-7.x/Gemfile b/gemfiles/mongoid-7.x/Gemfile
@@ -4,7 +4,7 @@ gemspec path: "../.."
 
 # TODO: Check if we need Rails
 gem "rails", "~> 5.2.0"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "mongo"
 gem "mongoid", "~> 7"
diff --git a/gemfiles/rails-6.0.x/Gemfile b/gemfiles/rails-6.0.x/Gemfile
@@ -3,6 +3,6 @@ source "https://rubygems.org"
 gemspec path: "../.."
 
 gem "rails", "~> 6.0.3"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "net-smtp", require: "false" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1")
diff --git a/gemfiles/rails-edge/Gemfile b/gemfiles/rails-edge/Gemfile
@@ -3,4 +3,4 @@ source "https://rubygems.org"
 gemspec path: "../.."
 
 gem "rails", git: "https://github.com/rails/rails", branch: "main"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
diff --git a/gemfiles/sequel-4/Gemfile b/gemfiles/sequel-4/Gemfile
@@ -4,6 +4,6 @@ gemspec path: "../.."
 
 gem "haml"
 gem "sinatra", "~> 3"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "sequel", "4.41.0" # There was an incompatibility with ruby 3 in versions 4.42 - 5.29.
diff --git a/gemfiles/sequel-5/Gemfile b/gemfiles/sequel-5/Gemfile
@@ -4,6 +4,6 @@ gemspec path: "../.."
 
 gem "haml"
 gem "sinatra", "~> 3"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gem "sequel", "~> 5.0"
diff --git a/gemfiles/sidekiq-5.x/Gemfile b/gemfiles/sidekiq-5.x/Gemfile
@@ -5,4 +5,4 @@ gemspec path: "../.."
 # TODO: Check if we need Rails
 gem "rails", "~> 6.1.0"
 gem "sidekiq", "~> 5"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
diff --git a/lib/skylight/version.rb b/lib/skylight/version.rb
@@ -3,5 +3,5 @@ module Skylight
   # for compatibility with semver when it is parsed by the rust agent.
   # This string will be transformed in the gemspec to "5.0.0.alpha"
   # to conform with rubygems.
-  VERSION = "6.0.4".freeze
+  VERSION = "6.1.0-beta".freeze
 end
diff --git a/provision.sh b/provision.sh
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,6 +2,7 @@
 
 require "rubygems"
 require "bundler/setup"
+require "ostruct"
 
 # Do this at the start
 coverage = false
