quill-sql 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd0fbadace7b0e612933cadd0a2a27e0a2579f44b2de6d604d6cc50b481d10b
-  data.tar.gz: f93961c1903a18b498105e99ac17fc36f4c77ded0db2a2076cd0d15973d30d9e
+  metadata.gz: 76485b20728b04f2100bcf4d6a35b4308fd7c14be60f9ffb992a012e97b083c2
+  data.tar.gz: 3fb5e7d7acda9a4011c7e23f9a778eb65d4dc020418b9d13259ca0cfaef69cb6
 SHA512:
-  metadata.gz: 4d5fb6dff9e6f7b062ced96950e56073e23f51314e0d7c3c6a855ce2a1f3f159436306b14cb2b6989f869dc1b474d602d0235fe9eed449068fc73589c1c07559
-  data.tar.gz: 6d3242c396458360bea230008cf71aedc05c50aaf4354b6c53b41a723643607edf1a6da4c6ef12169df4aa11b1023fde312d756ed3a508d18982789174419ef7
+  metadata.gz: e92f9001384b9c4313c6d21f0b41a2a37f14b30542775d994c591c05196b49cdf57f219370e6d58d72bbb3959442c3e7715b89c297b09073b1c58c68ebeecf53
+  data.tar.gz: b7cea1082503f99ecb4f5ae2144b66d9706fa2994fd33e6bf442a67145c748bcc9866c67cd8b698405bf1d1539affd0e51ecdafcfabea7705c921d696488ed3d

data/lib/db/clickhouse.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'json'
 require 'click_house'
+require 'active_support/inflector'
 
 module ClickHouseHelper
   # Constants
@@ -242,7 +243,7 @@ module ClickHouseHelper
     end
 
     def get_foreign_keys_clickhouse(client, schema_name, table_name, primary_key)
-      depluralized_table_name = depluralize(table_name)
+      depluralized_table_name = table_name.singularize
       
       sql = <<~SQL
         SELECT column_name 
@@ -251,7 +252,7 @@ module ClickHouseHelper
         AND table_name != '#{table_name}' 
         AND (column_name = '#{primary_key}' 
           OR column_name = '#{depluralized_table_name}_#{primary_key}' 
-          OR column_name = '#{depluralized_table_name}#{capitalize(primary_key)}')
+          OR column_name = '#{depluralized_table_name}#{primary_key.capitalize}')
       SQL
 
       results = run_query_clickhouse(sql, client)
@@ -270,7 +271,7 @@ module ClickHouseHelper
             OR column_name LIKE '%\_id' 
             OR column_name LIKE '%Id' 
             OR column_name LIKE '%\_#{primary_key}' 
-            OR column_name LIKE '%#{capitalize(primary_key)}')
+            OR column_name LIKE '%#{primary_key.capitalize}')
         SQL
 
         results = run_query_clickhouse(sql, client)
@@ -317,17 +318,5 @@ module ClickHouseHelper
         password: parsed.password || ''
       }
     end
-
-    private
-
-    def capitalize(str)
-      str.capitalize
-    end
-
-    def depluralize(str)
-      # Simple depluralization - you might want to use a proper library like ActiveSupport
-      return str[0..-2] if str.end_with?('s')
-      str
-    end
   end
 end

data/lib/db/db_helper.rb

@@ -1,9 +1,10 @@
 require 'json'
 require 'uri'
 require_relative 'clickhouse'
+require_relative 'postgres'
 
 module DatabaseHelper
-  SUPPORTED_DATABASES = ['clickhouse'].freeze  # Add others as they're implemented
+  SUPPORTED_DATABASES = ['clickhouse', 'postgresql'].freeze
 
   class QuillQueryResults
     attr_reader :fields, :rows
@@ -20,6 +21,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.format_clickhouse_config(connection_string)
+    when 'postgresql'
+      PostgresHelper.format_postgres_config(connection_string)
     else
       raise DatabaseError, "Invalid database type: #{database_type}"
     end
@@ -29,6 +32,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.connect_to_clickhouse(config)
+    when 'postgresql'
+      PostgresHelper.connect_to_postgres(config)
     else
       raise DatabaseError, "Invalid database type: #{database_type}"
     end
@@ -50,6 +55,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.run_query_clickhouse(sql, connection)
+    when 'postgresql'
+      PostgresHelper.run_query_postgres(sql, connection)
     else
       raise DatabaseError, "Invalid database type: #{database_type}"
     end
@@ -65,6 +72,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.disconnect_from_clickhouse(database)
+    when 'postgresql'
+      PostgresHelper.disconnect_from_postgres(database)
     end
   end
 
@@ -72,6 +81,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.get_schemas_clickhouse(connection)
+    when 'postgresql'
+      PostgresHelper.get_schemas_postgres(connection)
     else
       raise DatabaseError, "Invalid database type: #{database_type}"
     end
@@ -81,6 +92,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.get_tables_by_schema_clickhouse(connection, schema_name)
+    when 'postgresql'
+      PostgresHelper.get_tables_by_schema_postgres(connection, schema_name)
     else
       raise DatabaseError, "Invalid database type: #{database_type}"
     end
@@ -90,6 +103,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.get_columns_by_table_clickhouse(connection, schema_name, table_name)
+    when 'postgresql'
+      PostgresHelper.get_columns_by_table_postgres(connection, schema_name, table_name)
     else
       raise DatabaseError, "Invalid database type: #{database_type}"
     end
@@ -99,6 +114,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.get_foreign_keys_clickhouse(connection, schema_name, table_name, primary_key)
+    when 'postgresql'
+      PostgresHelper.get_foreign_keys_postgres(connection, schema_name, table_name, primary_key)
     else
       raise DatabaseError, "Invalid database type: #{database_type}"
     end
@@ -108,6 +125,8 @@ module DatabaseHelper
     case database_type.downcase
     when 'clickhouse'
       ClickHouseHelper.get_schema_column_info_clickhouse(connection, schema_name, tables)
+    when 'postgresql'
+      PostgresHelper.get_schema_column_info_postgres(connection, schema_name, tables)
     else
       raise DatabaseError, "Invalid database type: #{database_type}"
     end

data/lib/db/postgres.rb

@@ -0,0 +1,177 @@
+require 'pg'
+require 'json'
+require 'uri'
+require 'active_support/inflector'
+
+module PostgresHelper
+  class << self
+    def connect_to_postgres(config)
+      conn = PG.connect(
+        host: config[:host],
+        port: config[:port],
+        dbname: config[:database],
+        user: config[:username],
+        password: config[:password],
+        sslmode: config[:sslmode] || 'prefer',
+        gssencmode: 'disable',  # Disable GSSAPI encryption
+        krbsrvname: nil,        # Disable Kerberos service name
+        target_session_attrs: 'read-write'
+      )
+      conn
+    end
+
+    def disconnect_from_postgres(client)
+      client.close if client.respond_to?(:close)
+    end
+
+    def run_query_postgres(sql, client)
+      result = client.exec(sql)
+      
+      fields = result.fields.map do |field|
+        {
+          name: field,
+          dataTypeID: result.ftype(result.fields.index(field))
+        }
+      end
+
+      {
+        fields: fields,
+        rows: result.values.map { |row| result.fields.zip(row).to_h }
+      }
+    end
+
+    def get_schemas_postgres(client)
+      sql = <<~SQL
+        SELECT schema_name 
+        FROM information_schema.schemata 
+        WHERE schema_name NOT LIKE 'pg_%' 
+        AND schema_name != 'information_schema'
+      SQL
+      
+      results = run_query_postgres(sql, client)
+      results[:rows].map { |row| row['schema_name'] }
+    end
+
+    def get_tables_by_schema_postgres(client, schema_names)
+      all_tables = schema_names.flat_map do |schema|
+        sql = <<~SQL
+          SELECT table_name, table_schema 
+          FROM information_schema.tables 
+          WHERE table_schema = '#{schema}'
+          AND table_type = 'BASE TABLE'
+        SQL
+        
+        results = run_query_postgres(sql, client)
+        results[:rows].map do |row|
+          {
+            tableName: row['table_name'],
+            schemaName: row['table_schema']
+          }
+        end
+      end
+
+      all_tables
+    end
+
+    def get_columns_by_table_postgres(client, schema_name, table_name)
+      sql = <<~SQL
+        SELECT column_name 
+        FROM information_schema.columns 
+        WHERE table_schema = '#{schema_name}' 
+        AND table_name = '#{table_name}'
+        ORDER BY ordinal_position
+      SQL
+      
+      results = run_query_postgres(sql, client)
+      results[:rows].map { |row| row['column_name'] }
+    end
+
+    def get_foreign_keys_postgres(client, schema_name, table_name, primary_key)
+      depluralized_table_name = table_name.singularize
+      
+      sql = <<~SQL
+        SELECT column_name 
+        FROM information_schema.columns 
+        WHERE table_schema = '#{schema_name}' 
+        AND table_name != '#{table_name}' 
+        AND (column_name = '#{primary_key}' 
+          OR column_name = '#{depluralized_table_name}_#{primary_key}' 
+          OR column_name = '#{depluralized_table_name}#{primary_key.capitalize}')
+      SQL
+
+      results = run_query_postgres(sql, client)
+      foreign_keys = results[:rows].map { |key| key['column_name'] }
+      
+      foreign_keys = foreign_keys.reject { |key| ['id', '_id_'].include?(key) }
+      foreign_keys = foreign_keys.uniq
+
+      if foreign_keys.empty?
+        sql = <<~SQL
+          SELECT column_name 
+          FROM information_schema.columns 
+          WHERE table_schema = '#{schema_name}' 
+          AND table_name != '#{table_name}' 
+          AND (column_name LIKE '#{table_name}%' 
+            OR column_name LIKE '%\\_id' 
+            OR column_name LIKE '%Id' 
+            OR column_name LIKE '%\\_#{primary_key}' 
+            OR column_name LIKE '%#{primary_key.capitalize}')
+        SQL
+
+        results = run_query_postgres(sql, client)
+        foreign_keys = results[:rows].map { |key| key['column_name'] }.uniq
+      end
+
+      foreign_keys
+    end
+
+    def get_schema_column_info_postgres(client, schema_name, table_names)
+      table_names.map do |table_name|
+        query = <<~SQL
+          SELECT 
+            column_name,
+            udt_name as field_type,
+            ordinal_position as sort_number
+          FROM information_schema.columns
+          WHERE table_schema = '#{table_name[:schemaName]}'
+          AND table_name = '#{table_name[:tableName]}'
+          ORDER BY sort_number
+        SQL
+
+        results = run_query_postgres(query, client)
+        {
+          tableName: "#{table_name[:schemaName]}.#{table_name[:tableName]}",
+          displayName: "#{table_name[:schemaName]}.#{table_name[:tableName]}",
+          columns: results[:rows].map do |row|
+            {
+              columnName: row['column_name'],
+              displayName: row['column_name'],
+              dataTypeID: get_pg_type_oid(row['field_type']),
+              fieldType: row['field_type']
+            }
+          end
+        }
+      end
+    end
+
+    def format_postgres_config(connection_string)
+      parsed = URI.parse(connection_string)
+      
+      {
+        host: parsed.host,
+        port: parsed.port || 5432,
+        database: parsed.path[1..-1],
+        username: parsed.user || 'postgres',
+        password: parsed.password || '',
+        sslmode: parsed.query&.split('&')&.find { |param| param.start_with?('sslmode=') }&.split('=')&.last || 'prefer'
+      }
+    end
+
+    private
+
+    def get_pg_type_oid(type_name)
+      type = PG_TYPES.find { |t| t[:typname] == type_name }&.dig(:oid)
+      type || 1043  # Default to varchar if type not found
+    end
+  end
+end 

data/lib/quill-sql.rb

@@ -84,12 +84,11 @@ class Quill
       # If the task requires flags to be synthesized from tenants
       if FLAG_TASKS.include?(metadata[:task]) &&
          tenants&.first != ALL_TENANTS &&
-         tenants&.first != SINGLE_TENANT &&
-         (metadata[:task] != 'filter-options' ||
-          !metadata[:reportId])
+         tenants&.first != SINGLE_TENANT
          
         response = post_quill('tenant-mapped-flags', {
           reportId: metadata[:reportId] || metadata[:dashboardItemId],
+          clientId: metadata[:clientId],
           dashboardName: metadata[:name],
           tenants: tenants.map { |tenant| TenantUtils.deep_camelize_keys(tenant) },
           flags: flags&.map { |flag| TenantUtils.deep_camelize_keys(flag) }
@@ -140,14 +139,18 @@ class Quill
         }
       end
 
-      response = post_quill(metadata[:task], {
+      sdk_filters = filters&.map { |filter| FilterUtils.convert_custom_filter(filter) }
+      
+      payload = {
         **metadata,
-        sdkFilters: filters&.map { |filter| FilterUtils.convert_custom_filter(filter) },
         **pre_query_results,
         tenants: tenants.map { |tenant| TenantUtils.deep_camelize_keys(tenant) },
         flags: tenant_flags&.map { |flag| TenantUtils.deep_camelize_keys(flag) },
         viewQuery: metadata[:preQueries]&.first
-      })
+      }
+      payload[:sdkFilters] = sdk_filters if sdk_filters # So it's undefined instead of nil
+      
+      response = post_quill(metadata[:task], payload)
 
       return {
         status: "error",

data/lib/utils/tenants.rb

@@ -2,8 +2,8 @@ module TenantUtils
   def self.extract_tenant_ids(tenants)
     if tenants[0].is_a?(String) || tenants[0].is_a?(Numeric)
       tenants
-    elsif tenants[0].is_a?(Hash) && tenants[0].key?('tenant_ids')
-      tenants[0]['tenant_ids']
+    elsif tenants[0].is_a?(Hash) && (tenants[0].key?('tenantIds') || tenants[0].key?(:tenantIds))
+      tenants[0]['tenantIds'] || tenants[0][:tenantIds]
     else
       raise 'Invalid format for tenants'
     end
@@ -12,8 +12,8 @@ module TenantUtils
   def self.extract_tenant_field(tenants, dashboard_owner)
     if tenants[0].is_a?(String) || tenants[0].is_a?(Numeric)
       dashboard_owner
-    elsif tenants[0].is_a?(Hash) && tenants[0].key?('tenant_field')
-      tenants[0]['tenant_field']
+    elsif tenants[0].is_a?(Hash) && (tenants[0].key?('tenantField') || tenants[0].key?(:tenantField))
+      tenants[0]['tenantField'] || tenants[0][:tenantField]
     else
       raise 'Invalid format for tenants'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quill-sql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Shawn Magee, Albert Yan
 - Sam Bishop
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 6.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 6.1.7
 - !ruby/object:Gem::Dependency
   name: click_house
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - lib/db/cached_connection.rb
 - lib/db/clickhouse.rb
 - lib/db/db_helper.rb
+- lib/db/postgres.rb
 - lib/models/filters.rb
 - lib/quill-sql.rb
 - lib/utils/run_query_processes.rb