hive_sql 1.0.1 → 1.0.3

data/lib/hive_sql/models/account.rb

@@ -29,6 +29,11 @@ module HiveSQL
     has_many :subscriptions, foreign_key: :subscriber, class_name: 'HiveSQL::CommunitySubscriber', primary_key: :name
     has_many :subscribed_communities, through: :subscriptions, source: :community_record
     
+    has_many :proposals, foreign_key: :creator, class_name: 'HiveSQL::Proposal', primary_key: :name
+    
+    has_many :proposal_votes, foreign_key: :voter, class_name: 'HiveSQL::ProposalApproval', primary_key: :name
+    has_many :approved_proposals, through: :proposal_votes, source: :proposal
+    
     scope :before, lambda { |before, field = 'created'| where("#{field} < ?", before) }
     scope :after, lambda { |after, field = 'created'| where("#{field} > ?", after) }
     scope :today, -> { after(1.day.ago) }

data/lib/hive_sql/models/block.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module HiveSQL
   class Block < HiveSQL::SqlBase
 
@@ -5,7 +7,17 @@ module HiveSQL
     self.primary_key = :block_num
     
     has_many :transactions, foreign_key: :block_num
-
+    
+    # You have the actual trx_id that the blockchain knows about and you would
+    # like to get this corresponding block.  Well, HiveSQL doesn't store that,
+    # so we have to do an RPC lookup.
+    scope :trx_id, lambda { |trx_id|
+      block_num = JSON[open("http://anyx.io/v1/account_history_api/get_transaction?id=#{trx_id}").read].tap do |tx|
+        tx['block_num']
+      end
+      
+      where(block_num: block_num)
+    }
   end
 end
 

data/lib/hive_sql/models/comment.rb

@@ -25,8 +25,11 @@ module HiveSQL
     
     scope :normalized_json, -> { where("json_metadata LIKE '{%}' AND ISJSON(json_metadata) > 0") }
     
-    scope :app, lambda { |app|
-      normalized_json.where("JSON_VALUE(json_metadata, '$.app') LIKE ?", "#{app}/%")
+    scope :app, lambda { |app, forward = true|
+      r = normalized_json.where("JSON_VALUE(json_metadata, '$.app') LIKE ?", "#{app}/%")
+      r = where.not(id: r.select(:id)) unless forward
+      
+      r
     }
     
     scope :app_version, lambda { |version|
@@ -37,12 +40,15 @@ module HiveSQL
     scope :author, lambda {|author| joins(:author_record).where(author: author)}
     
     scope :tagged, lambda { |tag, options = {exclude_category: false}|
+      tag = [tag].flatten
       exclude_category = !!options[:exclude_category]
+      tagged_posts = HiveSQL::Tag.where(tag: tag).select(:comment_ID)
+      tagged_posts = tagged_posts.where("comment_ID > ?", minimum(:ID))
       
       if exclude_category
-        where(id: HiveSQL::Tag.where(tag: tag).select(:comment_ID))
+        where(id: tagged_posts.select(:comment_ID))
       else
-        where("ID IN(?) OR category = ?", HiveSQL::Tag.where(tag: tag).select(:comment_ID), tag)
+        where("ID IN(?) OR category = ?", tagged_posts.select(:comment_ID), tag.first)
       end
     }
     
@@ -66,6 +72,32 @@ module HiveSQL
       where("JSON_VALUE(beneficiaries, '$.account') IN(?)", [account].flatten)
     }
     
+    scope :query, lambda { |query, forward = true|
+      query = [query].flatten.map{|q| "%#{q}%"}
+      condition = []
+      sub_conditions = []
+      
+      sub_conditions << "LOWER(author) LIKE ?"
+      sub_conditions << "LOWER(permlink) LIKE ?"
+      sub_conditions << "LOWER(category) LIKE ?"
+      sub_conditions << "LOWER(parent_author) LIKE ?"
+      sub_conditions << "LOWER(parent_permlink) LIKE ?"
+      sub_conditions << "LOWER(title) LIKE ?"
+      sub_conditions << "LOWER(body) LIKE ?"
+      sub_conditions << "LOWER(json_metadata) LIKE ?"
+      sub_conditions << "LOWER(beneficiaries) LIKE ?"
+      sub_conditions << "LOWER(root_title) LIKE ?"
+      
+      query.each do |q|
+        condition += sub_conditions
+      end
+      
+      r = where(condition.join(' OR '), *(query * sub_conditions.size))
+      r = where.not(id: r.select(:id)) unless forward
+      
+      r
+    }
+    
     def self.find_by_author(author)
       where(author: author).first
     end
@@ -85,6 +117,10 @@ module HiveSQL
     def tag_names
       tags.pluck(:tag)
     end
+    
+    def hydrated_json_metadata
+      JSON[json_metadata] rescue {}
+    end
   end
 end
 

data/lib/hive_sql/models/delegation.rb

@@ -0,0 +1,24 @@
+module HiveSQL
+  class Delegation < HiveSQL::SqlBase
+
+    self.table_name = :Delegations
+    
+    belongs_to :delegator_account, foreign_key: :delegator, primary_key: 'name', class_name: 'HiveSQL::Account'
+    belongs_to :delegatee_account, foreign_key: :delegatee, primary_key: 'name', class_name: 'HiveSQL::Account'
+    
+    scope :delegator, lambda {|delegator| where(delegator: delegator)}
+    scope :delegatee, lambda {|delegatee| where(delegatee: delegatee)}
+    
+    def mvests
+      vests / 1e6
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Delegation(
+#   delegator: varchar,
+#   delegatee: varchar,
+#   vests: money
+# )

data/lib/hive_sql/models/dynamic_global_properties.rb

@@ -18,17 +18,23 @@ end
 #   num_pow_witnesses: integer,
 #   virtual_supply: money,
 #   current_supply: money,
+#   current_supply_symbol: varchar,
 #   confidential_supply: money,
+#   confidential_supply_symbol: varchar,
 #   current_hbd_supply: money,
+#   current_hbd_supply_symbol: varchar,
 #   confidential_hbd_supply: money,
 #   total_vesting_fund_hive: money,
 #   total_vesting_fund_hive_symbol: varchar,
 #   total_vesting_shares: money,
 #   total_vesting_shares_symbol: varchar,
 #   total_reward_fund_hive: money,
+#   total_reward_fund_hive_symbol: varchar,
 #   total_reward_shares2: varchar,
 #   pending_rewarded_vesting_shares: varchar,
+#   pending_rewarded_vesting_shares_symbol: varchar,
 #   pending_rewarded_vesting_hive: varchar,
+#   pending_rewarded_vesting_hive_symbol: varchar,
 #   hbd_interest_rate: integer,
 #   hbd_print_rate: integer,
 #   average_block_size: integer,
@@ -41,5 +47,24 @@ end
 #   vote_power_reserve_rate: integer,
 #   current_reserve_ratio: integer,
 #   vote_regeneration_per_day: integer,
-#   hive_per_vest: money
+#   hive_per_vest: money,
+#   required_actions_partition_percent: integer,
+#   target_votes_per_period: integer,
+#   delegation_return_period: integer,
+#   reverse_auction_seconds: integer,
+#   available_account_subsidies: integer,
+#   hbd_stop_percent: integer,
+#   hbd_start_percent: integer,
+#   next_maintenance_time: timestamp,
+#   last_budget_time: timestamp,
+#   content_reward_percent: integer,
+#   vesting_reward_percent: integer,
+#   sps_fund_percent: integer,
+#   sps_interval_ledger: integer,
+#   sps_interval_ledger_symbol: varchar,
+#   downvote_pool_percent: integer,
+#   smt_creation_fee: money,
+#   smt_creation_fee_symbol: varchar,
+#   price_hive_usd: money,
+#   price_hbd_usd: money
 # )

data/lib/hive_sql/models/proposal.rb

@@ -0,0 +1,26 @@
+module HiveSQL
+  class Proposal < HiveSQL::SqlBase
+    self.table_name = :Proposals
+    
+    belongs_to :creator_record, foreign_key: :creator, class_name: 'HiveSQL::Account', primary_key: :name
+    belongs_to :receiver_record, foreign_key: :receiver, class_name: 'HiveSQL::Account', primary_key: :name
+    has_many :approvals, foreign_key: :proposal_id, class_name: 'HiveSQL::ProposalApproval', primary_key: :id
+    has_many :voters, through: :approvals, source: :voter
+  end
+end
+
+# Structure
+#
+# HiveSQL::Follower(
+#   id integer,
+#   creator varchar,
+#   receiver varchar,
+#   start_date timestamp,
+#   end_date timestamp,
+#   daily_pay money,
+#   daily_pay_symbol varchar(3),
+#   subject varchar,
+#   permlink varchar,
+#   total_votes integer,
+#   deleted boolean
+# )

data/lib/hive_sql/models/proposal_approval.rb

@@ -0,0 +1,15 @@
+module HiveSQL
+  class ProposalApproval < HiveSQL::SqlBase
+    self.table_name = :ProposalsApprovals
+    
+    belongs_to :proposal, foreign_key: :proposal_id, class_name: 'Proposal', primary_key: :id
+    belongs_to :voter_record, foreign_key: :voter, class_name: 'Account', primary_key: :name
+  end
+end
+
+# Structure
+#
+# HiveSQL::Follower(
+#   proposal_id integer,
+#   voter varchar
+# )

data/lib/hive_sql/models/reblog.rb

@@ -3,8 +3,8 @@ module HiveSQL
 
     self.table_name = :Reblogs
     
-    belongs_to :account, foreign_key: :account, class_name: 'Account', primary_key: :name
-    belongs_to :author_account, foreign_key: :author, class_name: 'Account', primary_key: :name
+    belongs_to :account_record, foreign_key: :account, class_name: 'Account', primary_key: :name
+    belongs_to :author_record, foreign_key: :author, class_name: 'Account', primary_key: :name
     
     def comment; Comment::find_by(author: author, permlink: permlink); end
   end

data/lib/hive_sql/models/transaction.rb

@@ -14,6 +14,20 @@ module HiveSQL
     
     scope :type, lambda { |type| where(type: type) }
     
+    scope :by, lambda {|account_name|
+      account_name = [account_name].flatten
+      sub_selects = []
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountCreates WHERE creator IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountRecovers WHERE recovery_account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountUpdates WHERE account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountWitnessProxies WHERE account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountWitnessVotes WHERE account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxClaimRewardBalances WHERE account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxComments WHERE author IN (?))'
+      
+      where(sub_selects.join(' OR '), *([account_name] * sub_selects.size))
+    }
+    
     # So you have a Transaction#tx_id and you want to know what the operation was
     # that lead to it.  Well, that's tricky because all of the ops are in their
     # own tables.  This method will (slowly) try to find the appropriate table.

data/lib/hive_sql/models/tx/account_witness_proxy.rb

@@ -10,7 +10,7 @@ module HiveSQL
         
         ids = active.map do |p|
           p.id unless AccountWitnessProxy.where(account: p.account).
-            where.not(proxy: p.Proxy).
+            where.not(proxy: p.proxy).
             where('timestamp > ?', p.timestamp).exists?
         end
         
@@ -26,6 +26,6 @@ end
 #   ID: integer,
 #   tx_id: integer,
 #   account: varchar,
-#   Proxy: varchar,
+#   proxy: varchar,
 #   timestamp: datetime
 # )

data/lib/hive_sql/models/tx/custom.rb

@@ -10,6 +10,7 @@ module HiveSQL
       scope :any_required_posting_auths, lambda { |required_posting_auth|
         where("? IN(JSON_VALUE(required_posting_auths, '$'))", required_posting_auth)
       }
+      scope :normalized_json, -> { where("ISJSON(json_metadata) > 0") }
     end
   end
 end

data/lib/hive_sql/models/tx/proposal_create.rb

@@ -0,0 +1,35 @@
+module HiveSQL
+  module Tx
+    class ProposalCreate < HiveSQL::SqlBase
+      belongs_to :voter_record, foreign_key: :account, primary_key: :voter, class_name: 'HiveSQL::Account'
+
+      self.table_name = :TxProposalCreates
+      
+      scope :proposal, lambda { |id, invert = false|
+        if !!invert
+          where("? NOT IN (SELECT value FROM OPENJSON(proposal_ids,'$'))", id)
+        else
+          where("? IN (SELECT value FROM OPENJSON(proposal_ids,'$'))", id)
+        end
+      }
+      
+      scope :approve, lambda {|approve = true| where(approve: approve)}
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Tx::ProposalCreate(
+#   ID: integer,
+#   tx_id: integer,
+#   creator: varchar,
+#   receiver: varchar,
+#   start_date: datetime
+#   end_date: datetime
+#   daily_pay: money,
+#   daily_pay_symbol: boolean,
+#   subject: varchar,
+#   permlink: varchar,
+#   timestamp: datetime
+# )

data/lib/hive_sql/models/tx/{update_proposal_vote.rb → proposal_vote_update.rb}

@@ -1,9 +1,9 @@
 module HiveSQL
   module Tx
-    class UpdateProposalVote < HiveSQL::SqlBase
+    class ProposalVoteUpdate < HiveSQL::SqlBase
       belongs_to :voter_record, foreign_key: :account, primary_key: :voter, class_name: 'HiveSQL::Account'
 
-      self.table_name = :TxUpdateProposalVotes
+      self.table_name = :TxProposalVoteUpdates
       
       scope :proposal, lambda { |id, invert = false|
         if !!invert
@@ -20,7 +20,7 @@ end
 
 # Structure
 #
-# HiveSQL::Tx::Vote(
+# HiveSQL::Tx::ProposalVoteUpdate(
 #   ID: integer,
 #   tx_id: integer,
 #   voter: varchar,

data/lib/hive_sql/models/vo/account_created.rb

@@ -0,0 +1,23 @@
+module HiveSQL
+  module Vo
+    class AccountCreated < HiveSQL::SqlBase
+
+      self.table_name = :VOAccountCreateds
+
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Vo::AccountCreated(
+#   ID: integer,
+#   block_num: integer,
+#   timestamp: datetime,
+#   new_account_name: varchar,
+#   creator: varchar,
+#   initial_vesting_shares: money,
+#   initial_vesting_shares_symbol: varchar,
+#   initial_delegation: money,
+#   initial_delegation_symbol: varchar
+# )

data/lib/hive_sql/models/vo/changed_recovery_account.rb

@@ -0,0 +1,20 @@
+module HiveSQL
+  module Vo
+    class ChangedRecoveryAccount < HiveSQL::SqlBase
+
+      self.table_name = :VOChangedRecoveryAccounts
+
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Vo::ChangedRecoveryAccount(
+#   ID: integer,
+#   block_num: integer,
+#   timestamp: datetime,
+#   account: varchar,
+#   old_recovery_account: varchar,
+#   new_recovery_account: varchar
+# )

data/lib/hive_sql/models/vo/clear_null_account_balance.rb

@@ -0,0 +1,21 @@
+module HiveSQL
+  module Vo
+    class ClearNullAccountBalance < HiveSQL::SqlBase
+
+      self.table_name = :VOClearNullAccountBalances
+      
+      def hydrated_total_cleared
+        JSON[total_cleared]
+      end
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Vo::ClearNullAccountBalance(
+#   ID: integer,
+#   block_num: integer,
+#   timestamp: datetime,
+#   total_cleared: json
+# )

data/lib/hive_sql/models/vo/comments_vote.rb

@@ -0,0 +1,25 @@
+module HiveSQL
+  module Vo
+    class CommentsVote < HiveSQL::SqlBase
+
+      self.table_name = :VOCommentsVotes
+
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Vo::CommentsVote(
+#   ID: integer,
+#   block_num: integer,
+#   timestamp: datetime,
+#   voter: varchar,
+#   author: varchar,
+#   permlink: varchar
+#   weight: integer,
+#   rshares: integer,
+#   total_vote_weight: integer,
+#   pending_payout: money
+#   pending_payout_symbol: varchar
+# )

data/lib/hive_sql/models/vo/sps_fund.rb

@@ -14,5 +14,7 @@ end
 #   ID: integer,
 #   block_num: integer,
 #   timestamp: datetime,
-#   additional_funds: money
+#   receiver: varchar
+#   payment: money
+#   payment_symbol: varchar
 # )

data/lib/hive_sql/version.rb

@@ -1,3 +1,3 @@
 module HiveSQL
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end

data/lib/hive_sql.rb

@@ -11,8 +11,11 @@ require "hive_sql/models/connection"
 require "hive_sql/models/community"
 require "hive_sql/models/community_subscriber"
 require "hive_sql/models/community_role"
+require "hive_sql/models/delegation"
 require "hive_sql/models/dynamic_global_properties"
 require "hive_sql/models/follower"
+require "hive_sql/models/proposal"
+require "hive_sql/models/proposal_approval"
 require "hive_sql/models/reblog"
 require "hive_sql/models/tag"
 require "hive_sql/models/token"
@@ -40,7 +43,8 @@ require "hive_sql/models/tx/feed"
 require "hive_sql/models/tx/limit_order"
 require "hive_sql/models/tx/pow"
 require "hive_sql/models/tx/transfer"
-require "hive_sql/models/tx/update_proposal_vote"
+require "hive_sql/models/tx/proposal_create"
+require "hive_sql/models/tx/proposal_vote_update"
 require "hive_sql/models/tx/vote"
 require "hive_sql/models/tx/withdraw"
 require "hive_sql/models/tx/withdraw_vesting_route"
@@ -51,10 +55,14 @@ require "hive_sql/models/tx/custom/witness"
 require "hive_sql/models/tx/custom/reblog"
 require "hive_sql/models/tx/custom/community"
 
+require "hive_sql/models/vo/account_created"
 require "hive_sql/models/vo/author_reward"
+require "hive_sql/models/vo/changed_recovery_account"
+require "hive_sql/models/vo/clear_null_account_balance"
 require "hive_sql/models/vo/comment_benefactor_reward"
 require "hive_sql/models/vo/comment_payout_update"
 require "hive_sql/models/vo/comment_reward"
+require "hive_sql/models/vo/comments_vote"
 require "hive_sql/models/vo/curation_reward"
 require "hive_sql/models/vo/fill_convert_request"
 require "hive_sql/models/vo/fill_order"