pgb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 060fc2513c44822e85176d57cd22e8ce31c36b65b1103366048fef1a2aaba5d1
-  data.tar.gz: 2ae4bee33b32d211311629d680b78901a0794c7cd2898b44774795e3646c1c64
+  metadata.gz: 3c0c8b5ca1f08c57f115c1c42dca22b2bb73a3307f91e162fc2209410eea9851
+  data.tar.gz: 409321568093c7babb7ec83507c03cced5d2aa71a95e77b149d7e2b854a6ee48
 SHA512:
-  metadata.gz: b3a661d7941ea09a150a93d211c0b373296b4804158cb9afe34282d16d3a3ca0fecbbe3af7c1c2c7633d9db2ffbadec3adf78855159b706cca0e2ca917992fe4
-  data.tar.gz: e46d3993fafba112ef23040653373b9373c8e4ff864027011c63e91cd6f502af9de3c67c9ab33b7b99ea1092849086cbb4c43a502ea7d81c4505d83e0a6cb084
+  metadata.gz: 52372c0f53a9816695f933077ecc47b82d6523dfeeac68656548990255dfb5eb24565bb23ce145a54ece88b50ed0b2e8b31075db4e074341b50f65eadcd856cb
+  data.tar.gz: 01f9f30f469668d5da76dc80f1b159ec3e8dfdfcadf92967df2b16440365f7dd249bd1b95563c2c6291ac2f5f995c2c12d0c3b018fd78425e72ba6f80f0ae418

data/.rubocop.yml

@@ -15,7 +15,7 @@ Style/Documentation:
   Enabled: false
 
 Metrics/MethodLength:
-  Max: 20
+  Enabled: false
 
 Lint/MissingSuper:
   Enabled: false
@@ -64,3 +64,9 @@ Layout/MultilineAssignmentLayout:
 
 Style/CommentAnnotation:
   RequireColon: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Style/MissingElse:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.1.1] - 2022-12-12
+
+- Caller logging
+
 ## [0.1.0] - 2022-12-11
 
 - Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pgb (0.1.0)
+    pgb (0.1.1)
       pg (~> 1.4)
       zeitwerk (~> 2.6)
 

data/lib/pgb/model.rb

@@ -65,16 +65,53 @@ module PGB
 
       private
 
-      # TODO Types
       # TODO Column in schema, but not in result
       # TODO Column in result, but not in schema
       # TODO Enums
       # TODO Custom type read / write
       def parse(row)
         object = new
-        columns.each { |column| object.public_send("#{column}=", row.fetch(column)) }
+        columns.each { |column| object.public_send("#{column}=", to_ruby_type(row, column)) }
         object
       end
+
+      # TODO More types
+      # TODO Numeric types in old rubies?
+      # TODO Auto ? for booleans? (non-null only?)
+      # TODO Compare objects by schema, invalidate old ones?
+      # TODO Cut extract schema keys
+      def to_ruby_type(row, column)
+        value = row.fetch(column)
+        return unless value
+
+        type = schema.fetch(column).fetch('data_type')
+        case type
+        when 'bigint', 'integer', 'smallint'
+          Integer(value)
+        when 'character varying'
+          value
+        when 'boolean'
+          parse_boolean(value)
+        when 'jsonb'
+          JSON.parse(value)
+        when 'timestamp without time zone', 'date', 'USER-DEFINED'
+          # TODO USER-DEFINED = citext, enum, others
+          "#{value} ! TODO"
+        else
+          raise Error, "Unknown db type: #{type}"
+        end
+      end
+
+      def parse_boolean(value)
+        case value
+        when 't'
+          true
+        when 'f'
+          false
+        else
+          raise Error, "Unknown boolean db representation: #{value.inspect}"
+        end
+      end
     end
   end
 end

data/lib/pgb/user.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module PGB
+  # TODO Remove from git
+  class User < Model
+  end
+end

data/lib/pgb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PGB
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/pgb.rb

@@ -20,6 +20,8 @@
 # TODO CI
 # TODO Push gem
 # TODO Check code is compatible with ruby 2.7
+# TODO Performance
+# TODO Clean up changelog when somewhat stable
 
 require 'pg'
 require 'zeitwerk'
@@ -38,6 +40,9 @@ loader.setup
 PGB.loader = loader
 
 module PGB
+  SUPPORTED_PG_VERSIONS = (11..15).freeze
+  WORKING_DIR = File.expand_path(__dir__)
+
   class Error < StandardError
   end
 
@@ -57,9 +62,12 @@ module PGB
     # TODO Check postgres version on first call
     # TODO Look through everything
     # TODO Enable all rubocop cops
+    # TODO Coloring if supported
     def execute(query)
-      sql = query.is_a?(Query) || query.is_a?(Command) ? query.to_sql : query
-      puts sql
+      sql = query.is_a?(Query) || query.is_a?(Command) ? query.to_sql : query.strip.tr("\n", ' ')
+      # TODO Weird
+      connection
+      log(sql)
       connection.exec(sql).to_a
     end
 
@@ -67,16 +75,43 @@ module PGB
     def connection
       @connection ||= begin
         connection = PG.connect(dbname: 'hubstaff_development')
+        ensure_pg_version_supported(connection)
         connection
       end
     end
 
+    # TODO Different backtrace order in different versions?
+    # TODO Disable sql logging?
+    # TODO Disable caller logging?
+    def log(sql)
+      log_line = sql
+
+      frame = caller.find { !_1['/lib/ruby/gems/'] }
+      if frame
+        frame = frame.gsub("#{WORKING_DIR}/", '').strip
+        log_line += " -- #{frame}" unless frame.empty?
+      end
+
+      puts log_line
+    end
+
+    # TODO Check expected response format
+    def ensure_pg_version_supported(connection)
+      sql = 'SELECT version()'
+      log(sql)
+      version = Integer(connection.exec(sql).first.fetch('version').match(/PostgreSQL (\d+)\./)[1])
+      unless SUPPORTED_PG_VERSIONS.include?(version)
+        raise Error, "Unsupported Postgres version: #{version}, supported: #{SUPPORTED_PG_VERSIONS}"
+      end
+    end
+
     # TODO Extract
     # TODO Model is not a table name (e.g. query)?
     # TODO Do not select all columns
     # TODO Request as PGB query
     # TODO Support getting schema for all tables
     # TODO Remove line breaks for raw queries?
+    # TODO Check expected response format
     def schema(table_name)
       table_name = table_name.to_s
       @schema ||= begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dmitry Gubitskiy
@@ -73,6 +73,7 @@ files:
 - lib/pgb/shortcuts.rb
 - lib/pgb/sql_displayable.rb
 - lib/pgb/type_cast.rb
+- lib/pgb/user.rb
 - lib/pgb/version.rb
 homepage: https://github.com/enthrops/pgb
 licenses:
@@ -91,6 +92,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="