Revert "Fix query explorer quoting for PostgreSQL"

This reverts commit 5adbd36.

Author: antarr

app/controllers/mysql_genius/queries_controller.rb

@@ -17,7 +17,6 @@ def index
       @ai_enabled = mysql_genius_config.ai_enabled?
       @framework_version_major = Rails::VERSION::MAJOR
       @framework_version_minor = Rails::VERSION::MINOR
-      @identifier_quote_char = identifier_quote_char
       render("mysql_genius/queries/dashboard")
     end
 
@@ -78,10 +77,6 @@ def slow_queries
 
     private
 
-    def identifier_quote_char
-      ActiveRecord::Base.connection.quote_table_name("mysql_genius_identifier_probe")[0]
-    end
-
     def queryable_tables
       ActiveRecord::Base.connection.tables - mysql_genius_config.blocked_tables
     end

gems/mysql_genius-core/lib/mysql_genius/core/sql_validator.rb

@@ -33,12 +33,9 @@ def validate(sql, blocked_tables:, connection:)
 
       def extract_table_references(sql, connection)
         tables = []
-        identifier = /(?:`([^`]+)`|"((?:""|[^"])+)"|(\w+))/
-        sql.scan(/\bFROM\s+((?:#{identifier.source}(?:\s*,\s*#{identifier.source})*)+)/i) do |match|
-          match[0].scan(identifier) { |parts| tables << unquote_identifier(parts) }
-        end
-        sql.scan(/\bJOIN\s+#{identifier.source}/i) { |parts| tables << unquote_identifier(parts) }
-        sql.scan(/\b(?:INTO|UPDATE)\s+#{identifier.source}/i) { |parts| tables << unquote_identifier(parts) }
+        sql.scan(/\bFROM\s+((?:`?\w+`?(?:\s*,\s*`?\w+`?)*)+)/i) { |m| m[0].scan(/`?(\w+)`?/) { |t| tables << t[0] } }
+        sql.scan(/\bJOIN\s+`?(\w+)`?/i) { |m| tables << m[0] }
+        sql.scan(/\b(?:INTO|UPDATE)\s+`?(\w+)`?/i) { |m| tables << m[0] }
         tables.uniq.map(&:downcase) & connection.tables
       end
 
@@ -57,10 +54,6 @@ def apply_row_limit(sql, limit)
       def masked_column?(column_name, patterns)
         patterns.any? { |pattern| column_name.downcase.include?(pattern) }
       end
-
-      def unquote_identifier(parts)
-        (parts.find { |part| part && !part.empty? } || "").gsub('""', '"')
-      end
     end
   end
 end

gems/mysql_genius-core/lib/mysql_genius/core/views/mysql_genius/queries/dashboard.html.erb

@@ -71,7 +71,6 @@
     query_detail: '/queries/'
   };
 
-  var IDENTIFIER_QUOTE = String.fromCharCode(<%= (@identifier_quote_char || "`").ord %>);
   var RAILS_MIGRATION_VERSION = '<%= @framework_version_major %>.<%= @framework_version_minor %>';
 
   var csrfMeta = document.querySelector('meta[name="csrf-token"]');
@@ -89,12 +88,6 @@
   function show(e) { e.classList.remove('mg-hidden'); }
   function hide(e) { e.classList.add('mg-hidden'); }
   function escHtml(s) { var d = document.createElement('div'); d.textContent = s; return d.innerHTML; }
-  function quoteIdentifier(name) {
-    var quote = IDENTIFIER_QUOTE || '`';
-    var identifier = String(name);
-    if (quote === '[') return '[' + identifier.split(']').join(']]') + ']';
-    return quote + identifier.split(quote).join(quote + quote) + quote;
-  }
 
   // --- Table Sorting ---
 
@@ -159,8 +152,8 @@
   'COUNT SUM AVG MIN MAX COALESCE IFNULL NULLIF CAST CONVERT CONCAT CONCAT_WS GROUP_CONCAT SUBSTRING SUBSTR REPLACE TRIM LTRIM RTRIM UPPER LOWER UCASE LCASE LENGTH CHAR_LENGTH NOW CURDATE CURTIME DATE_FORMAT DATE_ADD DATE_SUB DATEDIFF TIMESTAMPDIFF UNIX_TIMESTAMP FROM_UNIXTIME IF ELT FIELD FIND_IN_SET FORMAT HEX UNHEX MD5 SHA1 SHA2 AES_ENCRYPT AES_DECRYPT ROUND CEIL CEILING FLOOR ABS MOD POWER SQRT LOG LOG2 LOG10 RAND GREATEST LEAST JSON_EXTRACT JSON_UNQUOTE JSON_SET JSON_OBJECT JSON_ARRAY JSON_CONTAINS JSON_LENGTH ROW_NUMBER RANK DENSE_RANK LAG LEAD FIRST_VALUE LAST_VALUE NTH_VALUE'.split(' ').forEach(function(w) { SQL_FN_SET[w] = true; });
 
   // Single-pass tokenizer regex: matches tokens in order of priority
-  // 1) single-quoted strings  2) quoted identifiers  3) numbers  4) words  5) operators  6) punctuation  7) ? placeholder  8) * star  9) whitespace  10) anything else
-  var SQL_TOKEN_RE = /'[^']*'|`[^`]*`|"(?:""|[^"])*"|\b\d+(?:\.\d+)?\b|[A-Za-z_]\w*|\?|>=|<=|<>|!=|[><=]|[(),;*]|\s+|./g;
+  // 1) single-quoted strings  2) backtick identifiers  3) numbers  4) words  5) operators  6) punctuation  7) ? placeholder  8) * star  9) whitespace  10) anything else
+  var SQL_TOKEN_RE = /'[^']*'|`[^`]*`|\b\d+(?:\.\d+)?\b|[A-Za-z_]\w*|\?\|>=|<=|<>|!=|[><=]|[(),;*]|\s+|./g;
 
   function highlightSql(sql) {
     if (!sql) return '';
@@ -174,8 +167,8 @@
       if (ch === "'") {
         // String literal
         result.push('<span class="mg-sql-str">' + escHtml(tok) + '</span>');
-      } else if (ch === '`' || ch === '"') {
-        // Quoted identifier
+      } else if (ch === '`') {
+        // Backtick-quoted identifier
         result.push('<span class="mg-sql-tbl">' + escHtml(tok) + '</span>');
       } else if (/^\d/.test(tok)) {
         // Number
@@ -665,9 +658,9 @@
     var table = el('vb-table').value;
     if (!table) return '';
     var cols = [];
-    qsa('.vb-col-check:checked').forEach(function(c) { cols.push(quoteIdentifier(c.value)); });
+    qsa('.vb-col-check:checked').forEach(function(c) { cols.push('`' + c.value + '`'); });
     if (!cols.length) cols = ['*'];
-    var sql = 'SELECT ' + cols.join(', ') + ' FROM ' + quoteIdentifier(table);
+    var sql = 'SELECT ' + cols.join(', ') + ' FROM `' + table + '`';
     var wheres = [];
     qsa('.vb-filter-row').forEach(function(row) {
       var col = qs('.vb-filter-col', row).value;
@@ -676,23 +669,23 @@
       var val = valEl ? valEl.value : '';
       if (!col) return;
       if (op === 'IS NULL' || op === 'IS NOT NULL') {
-        wheres.push(quoteIdentifier(col) + ' ' + op);
+        wheres.push('`' + col + '` ' + op);
       } else if (op === 'BETWEEN') {
         var endEl = qs('.vb-filter-val-end', row);
         var endVal = endEl ? endEl.value : '';
-        wheres.push(quoteIdentifier(col) + " BETWEEN '" + val.replace(/'/g, "''") + "' AND '" + endVal.replace(/'/g, "''") + "'");
+        wheres.push("`" + col + "` BETWEEN '" + val.replace(/'/g, "''") + "' AND '" + endVal.replace(/'/g, "''") + "'");
       } else if (op === 'LIKE') {
-        wheres.push(quoteIdentifier(col) + " LIKE '" + val.replace(/'/g, "''") + "'");
+        wheres.push("`" + col + "` LIKE '" + val.replace(/'/g, "''") + "'");
       } else {
-        wheres.push(quoteIdentifier(col) + " " + op + " '" + val.replace(/'/g, "''") + "'");
+        wheres.push("`" + col + "` " + op + " '" + val.replace(/'/g, "''") + "'");
       }
     });
     if (wheres.length) sql += ' WHERE ' + wheres.join(' AND ');
     var orders = [];
     qsa('.vb-order-row').forEach(function(row) {
       var col = qs('.vb-order-col', row).value;
       var dir = qs('.vb-order-dir', row).value;
-      if (col) orders.push(quoteIdentifier(col) + ' ' + dir);
+      if (col) orders.push('`' + col + '` ' + dir);
     });
     if (orders.length) sql += ' ORDER BY ' + orders.join(', ');
     return sql;

gems/mysql_genius-core/spec/mysql_genius/core/sql_validator_spec.rb

@@ -77,16 +77,6 @@ def validate(sql)
       tables = described_class.extract_table_references("SELECT * FROM `users`", connection)
       expect(tables).to(include("users"))
     end
-
-    it "handles double-quoted table names" do
-      tables = described_class.extract_table_references('SELECT * FROM "users" JOIN "posts" ON "users"."id" = "posts"."user_id"', connection)
-      expect(tables).to(include("users", "posts"))
-    end
-
-    it "rejects blocked double-quoted table names" do
-      result = validate('SELECT * FROM "sessions"')
-      expect(result).to(include("sessions"))
-    end
   end
 
   describe ".apply_row_limit" do

gems/mysql_genius-desktop/lib/mysql_genius/desktop/app.rb

@@ -74,9 +74,6 @@ def capability?(name)
         @ai_enabled              = settings.mysql_genius_config.ai.enabled?
         @framework_version_major = MysqlGenius::Core::VERSION.split(".")[0]
         @framework_version_minor = MysqlGenius::Core::VERSION.split(".")[1]
-        @identifier_quote_char   = settings.active_session.checkout do |adapter|
-          adapter.quote_table_name("mysql_genius_identifier_probe")[0]
-        end
 
         render_dashboard
       end

spec/requests/mysql_genius/index_spec.rb

@@ -18,14 +18,6 @@
     expect(last_response.body).to(include("mg-tab"))
   end
 
-  it "renders the connection-specific identifier quote character" do
-    allow(ActiveRecord::Base.connection).to(receive(:quote_table_name).and_return('"mysql_genius_identifier_probe"'))
-
-    get "/mysql_genius/"
-
-    expect(last_response.body).to(include("var IDENTIFIER_QUOTE = String.fromCharCode(34);"))
-  end
-
   it "respects blocked_tables when building the table lists" do
     MysqlGenius.configure { |c| c.blocked_tables = ["orders"] }
     get "/mysql_genius/"